Skip to content

Commit 2e62b50

Browse files
smorovicsmorovic
committed
code-format
1 parent f213343 commit 2e62b50

File tree

5 files changed

+54
-45
lines changed

5 files changed

+54
-45
lines changed

‎EventFilter/Utilities/interface/DAQSourceModelsFRD.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ class DataModeFRD : public DataMode {
9999
std::unordered_set<unsigned short> fedIdSet_;
100100
unsigned int expectedFedsInEvent_ = 0;
101101
bool verifyFEDs_ = true;
102-
103102
};
104103

105104
/*

‎EventFilter/Utilities/plugins/DaqFakeReader.cc‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,26 @@ DaqFakeReader::DaqFakeReader(const edm::ParameterSet& pset)
4343
modulo_error_events(injected_errors_per_million_events ? 1000000 / injected_errors_per_million_events
4444
: 0xffffffff),
4545
subsystems_(pset.getUntrackedParameter<std::vector<std::string>>("subsystems")) {
46-
4746
for (auto const& subsystem : subsystems_) {
48-
if (subsystem == "TCDS") haveTCDS_ = true;
49-
else if (subsystem == "SiPixel") haveSiPixel_ = true;
50-
else if (subsystem == "SiStrip") haveSiStrip_ = true;
51-
else if (subsystem == "ECAL") haveECAL_ = true;
52-
else if (subsystem == "HCAL") haveHCAL_ = true;
53-
else if (subsystem == "DT") haveDT_ = true;
54-
else if (subsystem == "CSC") haveCSC_ = true;
55-
else if (subsystem == "RPC") haveRPC_ = true;
47+
if (subsystem == "TCDS")
48+
haveTCDS_ = true;
49+
else if (subsystem == "SiPixel")
50+
haveSiPixel_ = true;
51+
else if (subsystem == "SiStrip")
52+
haveSiStrip_ = true;
53+
else if (subsystem == "ECAL")
54+
haveECAL_ = true;
55+
else if (subsystem == "HCAL")
56+
haveHCAL_ = true;
57+
else if (subsystem == "DT")
58+
haveDT_ = true;
59+
else if (subsystem == "CSC")
60+
haveCSC_ = true;
61+
else if (subsystem == "RPC")
62+
haveRPC_ = true;
5663
}
5764
// mean = pset.getParameter<float>("mean");
58-
if ( haveTCDS_ && tcdsFEDID_ < FEDNumbering::MINTCDSuTCAFEDID)
65+
if (haveTCDS_ && tcdsFEDID_ < FEDNumbering::MINTCDSuTCAFEDID)
5966
throw cms::Exception("DaqFakeReader::DaqFakeReader")
6067
<< " TCDS FED ID lower than " << FEDNumbering::MINTCDSuTCAFEDID;
6168
if (fillRandom_) {
@@ -215,6 +222,8 @@ void DaqFakeReader::fillDescriptions(edm::ConfigurationDescriptions& description
215222
desc.addUntracked<unsigned int>("width", 1024);
216223
desc.addUntracked<unsigned int>("injectErrPpm", 1024);
217224
desc.addUntracked<unsigned int>("tcdsFEDID", 1024);
218-
desc.addUntracked<std::vector<std::string>>("subsystems", std::initializer_list<std::string>({"TCDS", "SiPixel", "SiStrip", "ECAL", "HCAL", "DT", "CSC", "RPC"}));
225+
desc.addUntracked<std::vector<std::string>>(
226+
"subsystems",
227+
std::initializer_list<std::string>({"TCDS", "SiPixel", "SiStrip", "ECAL", "HCAL", "DT", "CSC", "RPC"}));
219228
descriptions.add("DaqFakeReader", desc);
220229
}

‎EventFilter/Utilities/src/DAQSourceModelsFRD.cc‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ edm::Timestamp DataModeFRD::fillFEDRawDataCollection(FEDRawDataCollection& rawDa
115115
if (verifyFEDs_ || !expectedFedsInEvent_) {
116116
if (fedIdSet_.find(fedId) == fedIdSet_.end()) {
117117
if (expectedFedsInEvent_)
118-
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection") << "FED Id: " << fedId << " was not found in previous events";
118+
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
119+
<< "FED Id: " << fedId << " was not found in previous events";
119120
else
120121
fedIdSet_.insert(fedId);
121122
}
@@ -125,16 +126,16 @@ edm::Timestamp DataModeFRD::fillFEDRawDataCollection(FEDRawDataCollection& rawDa
125126

126127
if (!fedsInEvent)
127128
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
128-
<< "Event " << event_->event() << " does not contain any FEDs";
129+
<< "Event " << event_->event() << " does not contain any FEDs";
129130
else if (!expectedFedsInEvent_) {
130131
expectedFedsInEvent_ = fedsInEvent;
131132
if (fedIdSet_.size() != fedsInEvent)
132133
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
133-
<< "First received event: " << event_->event() << " contains duplicate FEDs";
134-
}
135-
else if (fedsInEvent != expectedFedsInEvent_)
134+
<< "First received event: " << event_->event() << " contains duplicate FEDs";
135+
} else if (fedsInEvent != expectedFedsInEvent_)
136136
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
137-
<< "Event " << event_->event() << " does not contain same number of FEDs as previous: " << fedsInEvent << "/" << expectedFedsInEvent_;
137+
<< "Event " << event_->event() << " does not contain same number of FEDs as previous: " << fedsInEvent << "/"
138+
<< expectedFedsInEvent_;
138139

139140
return tstamp;
140141
}
@@ -189,7 +190,9 @@ std::string DataModeFRD::getChecksumError() const {
189190
* FRD preRead
190191
*/
191192

192-
void DataModeFRDPreUnpack::unpackEvent(edm::streamer::FRDEventMsgView* eview, UnpackedRawEventWrapper* ec, unsigned int ls) {
193+
void DataModeFRDPreUnpack::unpackEvent(edm::streamer::FRDEventMsgView* eview,
194+
UnpackedRawEventWrapper* ec,
195+
unsigned int ls) {
193196
//TODO: also walk the file and build checksum
194197
FEDRawDataCollection* rawData = new FEDRawDataCollection;
195198
bool tcdsInRange;
@@ -315,8 +318,7 @@ edm::Timestamp DataModeFRDPreUnpack::fillFEDRawDataCollection(edm::streamer::FRD
315318
const FEDHeader fedHeader(event + eventSize);
316319
const uint16_t fedId = fedHeader.sourceID();
317320
if (fedId > FEDNumbering::MAXFEDID)
318-
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
319-
<< "Out of range FED ID : " << fedId;
321+
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection") << "Out of range FED ID : " << fedId;
320322
else if (fedId >= MINTCDSuTCAFEDID_ && fedId <= MAXTCDSuTCAFEDID_) {
321323
if (!selectedTCDSFed) {
322324
selectedTCDSFed = fedId;
@@ -326,7 +328,7 @@ edm::Timestamp DataModeFRDPreUnpack::fillFEDRawDataCollection(edm::streamer::FRD
326328
}
327329
} else
328330
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
329-
<< "Second TCDS FED ID " << fedId << " found. First ID: " << selectedTCDSFed;
331+
<< "Second TCDS FED ID " << fedId << " found. First ID: " << selectedTCDSFed;
330332
}
331333
//take event ID from GTPE FED
332334
FEDRawData& fedData = rawData.FEDData(fedId);
@@ -337,7 +339,8 @@ edm::Timestamp DataModeFRDPreUnpack::fillFEDRawDataCollection(edm::streamer::FRD
337339
if (verifyFEDs_ || !expectedFedsInEvent_) {
338340
if (fedIdSet_.find(fedId) == fedIdSet_.end()) {
339341
if (expectedFedsInEvent_)
340-
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection") << "FEDID " << fedId << " was not found in previous events";
342+
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
343+
<< "FEDID " << fedId << " was not found in previous events";
341344
else
342345
fedIdSet_.insert(fedId);
343346
}
@@ -347,18 +350,18 @@ edm::Timestamp DataModeFRDPreUnpack::fillFEDRawDataCollection(edm::streamer::FRD
347350

348351
if (!fedsInEvent)
349352
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
350-
<< "Event " << event_->event() << " does not contain any FEDs";
353+
<< "Event " << event_->event() << " does not contain any FEDs";
351354
else if (!expectedFedsInEvent_) {
352355
expectedFedsInEvent_ = fedsInEvent;
353356
if (fedIdSet_.size() != fedsInEvent)
354357
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
355-
<< "First received event: " << event_->event() << " contains duplicate FEDs";
356-
}
357-
else if (fedsInEvent != expectedFedsInEvent_)
358+
<< "First received event: " << event_->event() << " contains duplicate FEDs";
359+
} else if (fedsInEvent != expectedFedsInEvent_)
358360
throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
359-
<< "Event " << event_->event() << " does not contain same number of FEDs as previous: " << fedsInEvent << "/" << expectedFedsInEvent_;
361+
<< "Event " << event_->event() << " does not contain same number of FEDs as previous: " << fedsInEvent << "/"
362+
<< expectedFedsInEvent_;
360363

361-
} catch (cms::Exception &e) {
364+
} catch (cms::Exception& e) {
362365
err = true;
363366
errmsg = e.what();
364367
}
@@ -509,7 +512,8 @@ edm::Timestamp DataModeFRDStriped::fillFRDCollection(FEDRawDataCollection& rawDa
509512
if (fedIdSet_.find(fedId) == fedIdSet_.end()) {
510513
if (expectedFedsInEvent_)
511514
throw cms::Exception("DataModeFRDStriped:::fillFRDCollection")
512-
<< "FEDID " << fedId << " from the file at index " << (uint64_t)index << " was not found in previous events";
515+
<< "FEDID " << fedId << " from the file at index " << (uint64_t)index
516+
<< " was not found in previous events";
513517
else
514518
fedIdSet_.insert(fedId);
515519
}
@@ -525,13 +529,12 @@ edm::Timestamp DataModeFRDStriped::fillFRDCollection(FEDRawDataCollection& rawDa
525529
expectedFedsInEvent_ = fedsInEvent;
526530
if (fedIdSet_.size() != fedsInEvent) {
527531
throw cms::Exception("DataModeFRDStriped:::fillFRDCollection")
528-
<< "First received event: " << events_.at(0)->event() << " contains duplicate FEDs";
529-
}
530-
}
531-
else if (fedsInEvent != expectedFedsInEvent_)
532+
<< "First received event: " << events_.at(0)->event() << " contains duplicate FEDs";
533+
}
534+
} else if (fedsInEvent != expectedFedsInEvent_)
532535
throw cms::Exception("DataModeFRDStriped:::fillFRDCollection")
533-
<< "Event " << events_.at(0)->event() << " does not contain same number of FEDs as previous: "
534-
<< fedsInEvent << "/" << expectedFedsInEvent_;
536+
<< "Event " << events_.at(0)->event() << " does not contain same number of FEDs as previous: " << fedsInEvent
537+
<< "/" << expectedFedsInEvent_;
535538

536539
return tstamp;
537540
}
@@ -643,9 +646,10 @@ bool DataModeFRDStriped::makeEvents() {
643646

644647
if (testEvtId == 0)
645648
testEvtId = events_[i]->event();
646-
else if (testEvtId != events_[i]->event())
649+
else if (testEvtId != events_[i]->event())
647650
throw cms::Exception("DAQSource::getNextEvent")
648-
<< " event id mismatch:" << events_[i]->event() << " while in previously parsed RDEventMsgView (other file):" << testEvtId;
651+
<< " event id mismatch:" << events_[i]->event()
652+
<< " while in previously parsed RDEventMsgView (other file):" << testEvtId;
649653

650654
if (dataBlockAddrs_[i] + events_[i]->size() > dataBlockMaxAddrs_[i])
651655
throw cms::Exception("DAQSource::getNextEvent")

‎EventFilter/Utilities/src/EvFDaqDirector.cc‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,11 +2033,8 @@ namespace evf {
20332033
std::filesystem::create_directory(bu_run_dir_ + fileprefix);
20342034
}
20352035
std::filesystem::path p = name;
2036-
auto nextFileRawTmp = fmt::format("{}{}{}{}",
2037-
bu_run_dir_,
2038-
fileprefix,
2039-
p.stem().string(),
2040-
p.extension().string());
2036+
auto nextFileRawTmp =
2037+
fmt::format("{}{}{}{}", bu_run_dir_, fileprefix, p.stem().string(), p.extension().string());
20412038
try {
20422039
//grab file if possible
20432040
std::filesystem::rename(rawpath, nextFileRawTmp);

‎EventFilter/Utilities/src/FedRawDataInputSource.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@ edm::Timestamp FedRawDataInputSource::fillFEDRawDataCollection(FEDRawDataCollect
706706

707707
if (fedsInEvent != expectedFedsInEvent_ && expectedFedsInEvent_)
708708
edm::LogWarning("DataModeFRDStriped:::fillFRDCollection")
709-
<< "Event " << event_->event() << " does not contain same number of FEDs as previous: "
710-
<< fedsInEvent << "/" << expectedFedsInEvent_;
709+
<< "Event " << event_->event() << " does not contain same number of FEDs as previous: " << fedsInEvent << "/"
710+
<< expectedFedsInEvent_;
711711

712712
return tstamp;
713713
}

0 commit comments

Comments
 (0)