Ran scram build code-format

cms-L1TK · Oct 22, 2021 · ba4a685 · ba4a685
1 parent bc3edf7
commit ba4a685
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 32 deletions.
diff --git 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
@@ -47,8 +47,7 @@ namespace trklet {
   }
 
   inline double rinv(double phi1, double phi2, double r1, double r2) {
-
-    assert(r1<r2); //Can not form tracklet should not call function with r2<=r1
+    assert(r1 < r2);  //Can not form tracklet should not call function with r2<=r1
 
     double dphi = phi2 - phi1;
     double dr = r2 - r1;

diff --git a/L1Trigger/TrackFindingTracklet/src/MatchEngine.cc b/L1Trigger/TrackFindingTracklet/src/MatchEngine.cc
@@ -224,18 +224,18 @@ void MatchEngine::execute(unsigned int iSector) {
 
       int stubfinerz = vmstub.finerz().value();
 
-      bool isPSmodule=false;
+      bool isPSmodule = false;
 
       if (barrel_) {
-	isPSmodule = layerdisk_ < N_PSLAYER;
+        isPSmodule = layerdisk_ < N_PSLAYER;
       } else {
-	if (layerdisk_<N_LAYER+2) {
-	  isPSmodule = ((rzbin&7)<3) || ((rzbin&7)==3 && stubfinerz<=3);
-	} else {
-	  isPSmodule = ((rzbin&7)<3) || ((rzbin&7)==3 && stubfinerz<=2);
-	}
+        if (layerdisk_ < N_LAYER + 2) {
+          isPSmodule = ((rzbin & 7) < 3) || ((rzbin & 7) == 3 && stubfinerz <= 3);
+        } else {
+          isPSmodule = ((rzbin & 7) < 3) || ((rzbin & 7) == 3 && stubfinerz <= 2);
+        }
       }
-      
+
       assert(isPSmodule == vmstub.isPSmodule());
 
       int nbits = isPSmodule ? N_BENDBITS_PS : N_BENDBITS_2S;
@@ -245,7 +245,7 @@ void MatchEngine::execute(unsigned int iSector) {
       constexpr int mindeltaphicut = 3;
       constexpr int maxdeltaphicut = 5;
       bool passphi = (std::abs(deltaphi) < mindeltaphicut) || (std::abs(deltaphi) > 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
@@ -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
@@ -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<<dzshift cut "

diff --git a/L1Trigger/TrackFindingTracklet/src/MemoryBase.cc b/L1Trigger/TrackFindingTracklet/src/MemoryBase.cc
@@ -108,10 +108,8 @@ size_t MemoryBase::find_nth(const string& haystack, size_t pos, const string& ne
   return find_nth(haystack, found_pos + 1, needle, nth - 1);
 }
 
-std::string MemoryBase::hexstr(unsigned int index){
-
+std::string MemoryBase::hexstr(unsigned int index) {
   std::ostringstream oss;
   oss << "0x" << std::setfill('0') << std::setw(2) << hex << index << dec;
   return oss.str();
-
 }
diff --git a/L1Trigger/TrackFindingTracklet/src/StubPairsMemory.cc b/L1Trigger/TrackFindingTracklet/src/StubPairsMemory.cc
@@ -23,8 +23,8 @@ void StubPairsMemory::writeSP(bool first, unsigned int iSector) {
   for (unsigned int j = 0; j < stubs_.size(); j++) {
     string stub1index = stubs_[j].first.stub()->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
@@ -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) << " " <<tracks_[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
@@ -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 = (rinner<router[i3]) ? rinv(0.0, -dphi[i2], rinner, router[i3]) : 20.0;
+          double rinv1 = (rinner < router[i3]) ? rinv(0.0, -dphi[i2], rinner, router[i3]) : 20.0;
           double pitchinner = (rinner < settings_.rcrit()) ? settings_.stripPitch(true) : settings_.stripPitch(false);
           double pitchouter =
               (router[i3] < settings_.rcrit()) ? settings_.stripPitch(true) : settings_.stripPitch(false);
@@ -312,7 +312,7 @@ void TrackletLUT::initteptlut(bool fillInner,
               } else {
                 rinner = settings_.rmean(layerdisk1);
               }
-	      double rinv1 = (rinner<router[i3]) ? -rinv(phiinner[i1], phiouter[i2], rinner, router[i3]) : -20.0;
+              double rinv1 = (rinner < router[i3]) ? -rinv(phiinner[i1], phiouter[i2], rinner, router[i3]) : -20.0;
               double pitchinner =
                   (rinner < settings_.rcrit()) ? settings_.stripPitch(true) : settings_.stripPitch(false);
               double pitchouter =

diff --git a/L1Trigger/TrackFindingTracklet/src/VMRouterCM.cc b/L1Trigger/TrackFindingTracklet/src/VMRouterCM.cc
@@ -126,7 +126,7 @@ void VMRouterCM::execute(unsigned int iSector) {
 
   //bool print = getName() == "VMR_D1PHIB" && iSector == 3;
   //print = false;
-  
+
   //Loop over the input stubs
   for (auto& stubinput : stubinputs_) {
     for (unsigned int i = 0; i < stubinput->nStubs(); i++) {