From ba4a6852d2453f616cdeb2c89793487713453241 Mon Sep 17 00:00:00 2001 From: Anders Date: Fri, 22 Oct 2021 23:18:39 +0200 Subject: [PATCH] Ran scram build code-format --- .../interface/MemoryBase.h | 2 +- .../TrackFindingTracklet/interface/Util.h | 3 +-- .../TrackFindingTracklet/src/MatchEngine.cc | 18 +++++++++--------- .../src/MatchEngineUnit.cc | 8 ++++---- .../TrackFindingTracklet/src/MatchProcessor.cc | 10 ++++------ .../TrackFindingTracklet/src/MemoryBase.cc | 4 +--- .../src/StubPairsMemory.cc | 4 ++-- .../TrackFindingTracklet/src/TrackFitMemory.cc | 2 +- .../TrackFindingTracklet/src/TrackletLUT.cc | 6 +++--- .../TrackFindingTracklet/src/VMRouterCM.cc | 2 +- 10 files changed, 27 insertions(+), 32 deletions(-) diff --git a/L1Trigger/TrackFindingTracklet/interface/MemoryBase.h b/L1Trigger/TrackFindingTracklet/interface/MemoryBase.h index 83080acd31e19..9c806137f85ef 100644 --- a/L1Trigger/TrackFindingTracklet/interface/MemoryBase.h +++ b/L1Trigger/TrackFindingTracklet/interface/MemoryBase.h @@ -41,7 +41,7 @@ namespace trklet { //Format index position in hex static std::string hexstr(unsigned int index); - + protected: std::string name_; unsigned int iSector_; diff --git a/L1Trigger/TrackFindingTracklet/interface/Util.h b/L1Trigger/TrackFindingTracklet/interface/Util.h index 511a1af4650c5..deaf18936d052 100644 --- a/L1Trigger/TrackFindingTracklet/interface/Util.h +++ b/L1Trigger/TrackFindingTracklet/interface/Util.h @@ -47,8 +47,7 @@ namespace trklet { } inline double rinv(double phi1, double phi2, double r1, double r2) { - - assert(r1 maxdeltaphicut); - + unsigned int index = (projrinv << nbits) + vmstub.bend().value(); if (!barrel_ && isPSmodule) { index += (1 << (nrinv_ + N_BENDBITS_2S)); diff --git a/L1Trigger/TrackFindingTracklet/src/MatchEngineUnit.cc b/L1Trigger/TrackFindingTracklet/src/MatchEngineUnit.cc index ad84258a2a229..028e9317ad0b2 100644 --- a/L1Trigger/TrackFindingTracklet/src/MatchEngineUnit.cc +++ b/L1Trigger/TrackFindingTracklet/src/MatchEngineUnit.cc @@ -60,7 +60,7 @@ void MatchEngineUnit::init(VMStubsMEMemory* vmstubsmemory, //This should be fixed to be done more cleanly - but require synchronizaton //with the HLS code if (goodpair_) { - if (print) + if (print) std::cout << "Init have pair" << std::endl; candmatches_.store(tmppair_); } @@ -69,11 +69,11 @@ void MatchEngineUnit::init(VMStubsMEMemory* vmstubsmemory, goodpair_ = false; } -void MatchEngineUnit::step(bool print ) { +void MatchEngineUnit::step(bool print) { bool almostfull = candmatches_.nearfull(); if (goodpair_) { - if (print) + if (print) std::cout << "Step have pair" << std::endl; assert(havepair_); candmatches_.store(tmppair_); @@ -176,7 +176,7 @@ int MatchEngineUnit::TCID() const { return peek().first->TCID(); } - if (idle_ && !havepair_ ) { + if (idle_ && !havepair_) { return 16383; } diff --git a/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc b/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc index 09c6e6baefd27..b4d53b560d0db 100644 --- a/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc +++ b/L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc @@ -343,10 +343,9 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) { (proj->proj(layerdisk_).fpgarzproj().nbits() - nrbits_)) & ((1 << nrbits_) - 1); - int phiprojder = proj->proj(layerdisk_).fpgaphiprojder().value(); - - int phiderindex = (phiprojder >> - (proj->proj(layerdisk_).fpgaphiprojder().nbits() - nphiderbits_)) & + int phiprojder = proj->proj(layerdisk_).fpgaphiprojder().value(); + + int phiderindex = (phiprojder >> (proj->proj(layerdisk_).fpgaphiprojder().nbits() - nphiderbits_)) & ((1 << nphiderbits_) - 1); int signindex = proj->proj(layerdisk_).fpgarzprojder().value() < 0; @@ -431,7 +430,7 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) { } } -bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, bool print , unsigned int istep) { +bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, bool print, unsigned int istep) { const L1TStub* stub = fpgastub->l1tstub(); if (layerdisk_ < N_LAYER) { @@ -510,7 +509,6 @@ bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, b bool imatch = (std::abs(ideltaphi) <= phimatchcuttable_.lookup(seedindex)) && (std::abs(ideltaz << dzshift_) <= zmatchcuttable_.lookup(seedindex)); - if (settings_.debugTracklet()) { edm::LogVerbatim("Tracklet") << getName() << " imatch = " << imatch << " ideltaphi cut " << ideltaphi << " " << phimatchcuttable_.lookup(seedindex) << " ideltaz<stubindex().str(); string stub2index = stubs_[j].second.stub()->stubindex().str(); - out_ << hexstr(j) << " " << stub1index << "|" << stub2index << " " - << trklet::hexFormat(stub1index + stub2index) << endl; + out_ << hexstr(j) << " " << stub1index << "|" << stub2index << " " << trklet::hexFormat(stub1index + stub2index) + << endl; } out_.close(); diff --git a/L1Trigger/TrackFindingTracklet/src/TrackFitMemory.cc b/L1Trigger/TrackFindingTracklet/src/TrackFitMemory.cc index 9446edcb9c3d2..85eb0775a5353 100644 --- a/L1Trigger/TrackFindingTracklet/src/TrackFitMemory.cc +++ b/L1Trigger/TrackFindingTracklet/src/TrackFitMemory.cc @@ -26,7 +26,7 @@ void TrackFitMemory::writeTF(bool first, unsigned int iSector) { out_ << "BX = " << (bitset<3>)bx_ << " Event : " << event_ << endl; for (unsigned int j = 0; j < tracks_.size(); j++) { - out_ << hexstr(j) << " " <trackfitstr() << " " << trklet::hexFormat(tracks_[j]->trackfitstr()); + out_ << hexstr(j) << " " << tracks_[j]->trackfitstr() << " " << trklet::hexFormat(tracks_[j]->trackfitstr()); out_ << "\n"; } out_.close(); diff --git a/L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc b/L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc index b1a3552f10415..817e72abe0be3 100644 --- a/L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc +++ b/L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc @@ -91,7 +91,7 @@ void TrackletLUT::initTPlut(bool fillInner, } int nbinsfinephidiff = (1 << nbitsfinephidiff); - + for (int iphibin = 0; iphibin < nbinsfinephidiff; iphibin++) { int iphidiff = iphibin; if (iphibin >= nbinsfinephidiff / 2) { @@ -124,7 +124,7 @@ void TrackletLUT::initTPlut(bool fillInner, } else { rinner = settings_.rmean(layerdisk1); } - double rinv1 = (rinnernStubs(); i++) {