merge with Thomas commit

cms-L1TK · May 13, 2022 · b396b39 · b396b39
1 parent cf2bf6e
commit b396b39
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h b/L1Trigger/TrackFindingTracklet/interface/ChannelAssignment.h
@@ -52,8 +52,6 @@ namespace trklet {
     int channelId(int seedType, int layerId) const;
     // max number of seeding layers
     int numSeedingLayers() const { return numSeedingLayers_; }
-    // max number of projection layers
-    int numProjectionLayers() const { return numProjectionLayers_; }
 
   private:
     // helper class to store configurations
@@ -82,8 +80,6 @@ namespace trklet {
     std::vector<int> offsetsStubs_;
     // max number of seeding layers
     int numSeedingLayers_;
-    // max number of projection layers
-    int numProjectionLayers_;
   };
 
 }  // namespace trklet

diff --git a/L1Trigger/TrackFindingTracklet/src/ChannelAssignment.cc b/L1Trigger/TrackFindingTracklet/src/ChannelAssignment.cc
@@ -30,10 +30,6 @@ namespace trklet {
       seedTypesSeedLayers_.emplace_back(pSetSeedTypesSeedLayers.getParameter<vector<int>>(s));
       seedTypesProjectionLayers_.emplace_back(pSetSeedTypesProjectionLayers.getParameter<vector<int>>(s));
     }
-    maxNumProjectionLayers_ = 0;
-    for (const auto& v : seedTypesProjectionLayers_) {
-      maxNumProjectionLayers_ = max(maxNumProjectionLayers_, (int) v.size());
-    }
     auto acc = [](int& sum, vector<int> ints) { return sum += (int)ints.size(); };
     numChannelsStub_ = accumulate(seedTypesProjectionLayers_.begin(), seedTypesProjectionLayers_.end(), 0, acc);
     offsetsStubs_.reserve(numSeedTypes_);
@@ -114,7 +110,7 @@ namespace trklet {
     }
     auto bigger = [](const vector<int>& lhs, const vector<int>& rhs) { return lhs.size() < rhs.size(); };
     numSeedingLayers_ = max_element(seedTypesSeedLayers_.begin(), seedTypesSeedLayers_.end(), bigger)->size();
-    numProjectionLayers_ =
+    maxNumProjectionLayers_ =
         max_element(seedTypesProjectionLayers_.begin(), seedTypesProjectionLayers_.end(), bigger)->size();
   }