Skip to content

Commit deaa645

Browse files
jshleejshlee
committed
added back edm::Log category strings
1 parent d89b13e commit deaa645

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

‎EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,10 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
173173
else
174174
msData |= 1UL << (chMap.chNum - 64);
175175

176-
LogDebug("") << " fed: " << fedId << " amc:" << int(amcNum) << " geb:" << int(gebId)
177-
<< " vfat:" << vfat_dc.localPhi << ",type: " << vfat_dc.vfatType << " id:" << gemId
178-
<< " ch:" << chMap.chNum << " st:" << digi.strip() << " bx:" << digi.bx();
176+
LogDebug("GEMDigiToRawModule")
177+
<< " fed: " << fedId << " amc:" << int(amcNum) << " geb:" << int(gebId)
178+
<< " vfat:" << vfat_dc.localPhi << ",type: " << vfat_dc.vfatType << " id:" << gemId
179+
<< " ch:" << chMap.chNum << " st:" << digi.strip() << " bx:" << digi.bx();
179180
}
180181

181182
if (!hasDigi)
@@ -266,7 +267,7 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
266267
for (const auto& word : words) {
267268
*(w++) = word;
268269
}
269-
LogDebug("") << " words " << words.size();
270+
LogDebug("GEMDigiToRawModule") << " words " << words.size();
270271
}
271272

272273
iEvent.put(std::move(fedRawDataCol));

‎EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
115115
const FEDRawData& fedData = fed_buffers->FEDData(fedId);
116116

117117
int nWords = fedData.size() / sizeof(uint64_t);
118-
LogDebug("") << "fedId:" << fedId << " words: " << nWords;
118+
LogDebug("GEMRawToDigiModule") << "fedId:" << fedId << " words: " << nWords;
119119

120120
if (nWords < 5)
121121
continue;
@@ -133,7 +133,7 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
133133
auto amc13Event = gemRawToDigi_->convertWordToAMC13Event(word);
134134

135135
if (amc13Event == nullptr) {
136-
LogDebug("") << "AMC13Event FAILED to be produced";
136+
LogDebug("GEMRawToDigiModule") << "AMC13Event FAILED to be produced";
137137
continue;
138138
}
139139

@@ -142,14 +142,15 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
142142
if ((amc13Event->fragmentLength() != trailer.fragmentLength()) || (amc13Event->crc() != trailer.crc()))
143143
failTrailerMatch = true;
144144

145-
LogDebug("") << "Event bx:" << iEvent.bunchCrossing() << " lv1Id:" << iEvent.id().event()
146-
<< " orbitNumber:" << iEvent.orbitNumber();
147-
LogDebug("") << "AMC13 bx:" << amc13Event->bxId() << " lv1Id:" << int(amc13Event->lv1Id())
148-
<< " orbitNumber:" << amc13Event->orbitNumber();
145+
LogDebug("GEMRawToDigiModule") << "Event bx:" << iEvent.bunchCrossing() << " lv1Id:" << iEvent.id().event()
146+
<< " orbitNumber:" << iEvent.orbitNumber();
147+
LogDebug("GEMRawToDigiModule") << "AMC13 bx:" << amc13Event->bxId() << " lv1Id:" << int(amc13Event->lv1Id())
148+
<< " orbitNumber:" << amc13Event->orbitNumber();
149149

150150
if (failTrailerCheck || failTrailerMatch) {
151151
// best to skip these events since FED is most likely corrupt
152-
edm::LogWarning("") << "FED trailer: fail check? " << failTrailerCheck << " fail match? " << failTrailerMatch;
152+
edm::LogWarning("GEMRawToDigiModule")
153+
<< "FED trailer: fail check? " << failTrailerCheck << " fail match? " << failTrailerMatch;
153154
continue;
154155
}
155156

@@ -159,8 +160,8 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
159160
for (auto amcData : *(amc13Event->getAMCpayloads())) {
160161
uint16_t amcBx = amcData.bx();
161162
uint8_t amcNum = amcData.amcNum();
162-
LogDebug("") << "AMC no.:" << int(amcData.amcNum()) << " bx:" << int(amcData.bx())
163-
<< " lv1Id:" << int(amcData.l1A()) << " orbitNumber:" << int(amcData.orbitNum());
163+
LogDebug("GEMRawToDigiModule") << "AMC no.:" << int(amcData.amcNum()) << " bx:" << int(amcData.bx())
164+
<< " lv1Id:" << int(amcData.l1A()) << " orbitNumber:" << int(amcData.orbitNum());
164165

165166
// Read GEB data
166167
for (auto gebData : *amcData.gebs()) {
@@ -170,7 +171,7 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
170171
// check if Chamber exists.
171172
if (!gemROMap->isValidChamber(geb_ec)) {
172173
unknownChamber = true;
173-
LogDebug("") << "InValid: amcNum " << int(amcNum) << " gebId " << int(gebId);
174+
LogDebug("GEMRawToDigiModule") << "InValid: amcNum " << int(amcNum) << " gebId " << int(gebId);
174175
continue;
175176
}
176177

@@ -186,18 +187,19 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
186187
// check if ChipID exists.
187188
if (!gemROMap->isValidChipID(vfat_ec)) {
188189
unknownVFat = true;
189-
LogDebug("") << "InValid: amcNum " << int(amcNum) << " gebId " << int(gebId) << " vfatId " << int(vfatId)
190-
<< " vfat Pos " << int(vfatData.position());
190+
LogDebug("GEMRawToDigiModule") << "InValid: amcNum " << int(amcNum) << " gebId " << int(gebId) << " vfatId "
191+
<< int(vfatId) << " vfat Pos " << int(vfatData.position());
191192
continue;
192193
}
193194

194195
// check vfat data
195196
if (vfatData.quality()) {
196197
badVfat = true;
197-
LogDebug("") << "Quality " << int(vfatData.quality()) << " b1010 " << int(vfatData.b1010()) << " b1100 "
198-
<< int(vfatData.b1100()) << " b1110 " << int(vfatData.b1110());
198+
LogDebug("GEMRawToDigiModule")
199+
<< "Quality " << int(vfatData.quality()) << " b1010 " << int(vfatData.b1010()) << " b1100 "
200+
<< int(vfatData.b1100()) << " b1110 " << int(vfatData.b1110());
199201
if (vfatData.crc() != vfatData.checkCRC()) {
200-
LogDebug("") << "DIFFERENT CRC :" << vfatData.crc() << " " << vfatData.checkCRC();
202+
LogDebug("GEMRawToDigiModule") << "DIFFERENT CRC :" << vfatData.crc() << " " << vfatData.checkCRC();
201203
}
202204
}
203205

@@ -225,9 +227,10 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
225227

226228
GEMDigi digi(stripId, bx);
227229

228-
LogDebug("") << " fed: " << fedId << " amc:" << int(amcNum) << " geb:" << int(gebId)
229-
<< " vfat:" << vfat_dc.localPhi << ",type: " << vfat_dc.vfatType << " id:" << gemId
230-
<< " ch:" << chMap.chNum << " st:" << digi.strip() << " bx:" << digi.bx();
230+
LogDebug("GEMRawToDigiModule")
231+
<< " fed: " << fedId << " amc:" << int(amcNum) << " geb:" << int(gebId) << " vfat:" << vfat_dc.localPhi
232+
<< ",type: " << vfat_dc.vfatType << " id:" << gemId << " ch:" << chMap.chNum << " st:" << digi.strip()
233+
<< " bx:" << digi.bx();
231234

232235
outGEMDigis.get()->insertDigi(gemId, digi);
233236

@@ -259,8 +262,8 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
259262
}
260263

261264
if (unknownChamber || unknownVFat || badVfat) {
262-
edm::LogWarning("") << "unpacking error: unknown Chamber " << unknownChamber << " unknown VFat " << unknownVFat
263-
<< " bad VFat " << badVfat;
265+
edm::LogWarning("GEMRawToDigiModule") << "unpacking error: unknown Chamber " << unknownChamber << " unknown VFat "
266+
<< unknownVFat << " bad VFat " << badVfat;
264267
}
265268

266269
} // end of amc13Event

0 commit comments

Comments
 (0)