Skip to content

Commit 0654bca

Browse files
committed
apply static code format checks
1 parent a1bb2ad commit 0654bca

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

CondFormats/HGCalObjects/src/HGCalMappingModuleIndexer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void HGCalMappingModuleIndexer::finalize() {
9494
fedit.moduleLUT_[i] = nconn;
9595
nconn++;
9696

97-
uniqueCB.insert( modFedIndexer_.unpackDenseIndex(i)[0] );
97+
uniqueCB.insert(modFedIndexer_.unpackDenseIndex(i)[0]);
9898
}
9999
fedit.totalECONs_ = nconn;
100100
fedit.totalCBs_ = uniqueCB.size();

EventFilter/HGCalRawToDigi/src/HGCalUnpacker.cc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
8484
auto slink_header = *(ptr + 1);
8585
if (((slink_header >> (BACKEND_FRAME::SLINK_BOE_POS + 32)) & BACKEND_FRAME::SLINK_BOE_MASK) !=
8686
fedConfig.slinkHeaderMarker) {
87-
uint32_t ECONDdenseIdx = moduleIndexer.getIndexForModule(fedId, 0);
87+
uint32_t ECONDdenseIdx = moduleIndexer.getIndexForModule(fedId, 0);
8888
econdPacketInfo.view()[ECONDdenseIdx].exception() = 1;
8989
econdPacketInfo.view()[ECONDdenseIdx].location() = 0;
9090
edm::LogWarning("[HGCalUnpacker]") << "Expected a S-Link header (BOE: 0x" << std::hex << fedConfig.slinkHeaderMarker
@@ -117,7 +117,7 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
117117
fedConfig.cbHeaderMarker) {
118118
//if word is a 0x0 it probably means that it's a 64b padding word: check that we are ending
119119
//the s-link may have less capture blocks than the maxCBperFED_ so for now this is considered normal
120-
uint32_t ECONDdenseIdx = moduleIndexer.getIndexForModule(fedId, 0);
120+
uint32_t ECONDdenseIdx = moduleIndexer.getIndexForModule(fedId, 0);
121121
econdPacketInfo.view()[ECONDdenseIdx].location() = (uint32_t)(ptr - header);
122122
if (cb_header == 0x0) {
123123
auto nToEnd = (fed_data.size() / 8 - 2) - std::distance(header, ptr);
@@ -159,11 +159,10 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
159159
// always increment the global ECON-D index (unless inactive/unconnected)
160160
globalECONDIdx++;
161161

162-
//stop if we have all the ECON-Ds expected
163-
if(globalECONDIdx >= fedReadoutSequence.totalECONs_) {
164-
return (0x1 << hgcaldigi::FEDUnpackingFlags::GenericUnpackWarning);
165-
}
166-
162+
//stop if we have all the ECON-Ds expected
163+
if (globalECONDIdx >= fedReadoutSequence.totalECONs_) {
164+
return (0x1 << hgcaldigi::FEDUnpackingFlags::GenericUnpackWarning);
165+
}
167166
}
168167
LogDebug("[HGCalUnpacker]") << "fedId = " << fedId << ", captureblockIdx = " << captureblockIdx
169168
<< ", econdIdx = " << econdIdx << ", globalECONDIdx = " << (int)globalECONDIdx

Geometry/HGCalMapping/test/HGCalMappingESSourceTester.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ void HGCalMappingESSourceTester::analyze(const edm::Event& iEvent, const edm::Ev
150150

151151
assert(frs.readoutTypes_.size() == frs.totalECONs_);
152152
size_t nmods = frs.totalECONs_;
153-
if(nmods==0) continue;
153+
if (nmods == 0)
154+
continue;
154155
totalmods += nmods;
155156
printf("\t[FED %d] packs data from %ld ECON-Ds - readout types -> (offsets)\n", frs.id, nmods);
156157
printf("\tTotal capture blocks: %ld Total ECON-Ds %ld\n", frs.totalCBs_, frs.totalECONs_);
@@ -291,7 +292,8 @@ void HGCalMappingESSourceTester::analyze(const edm::Event& iEvent, const edm::Ev
291292
elapsed = stop - start;
292293
printf("\tTime: %f seconds\n", elapsed.count());
293294
eid = HGCalElectronicsId(elecid);
294-
assert(eid.localFEDId() == (modules.view()[modidx].fedid() & HGCalElectronicsId::HGCalElectronicsIdMask::kLocalFEDIDMask));
295+
assert(eid.localFEDId() ==
296+
(modules.view()[modidx].fedid() & HGCalElectronicsId::HGCalElectronicsIdMask::kLocalFEDIDMask));
295297
assert((uint32_t)eid.captureBlock() == modules.view()[modidx].captureblockidx());
296298
assert((uint32_t)eid.econdIdx() == modules.view()[modidx].econdidx());
297299
assert((uint32_t)eid.halfrocChannel() == cells.view()[cellidx].seq());

0 commit comments

Comments
 (0)