Merge pull request #29830 from dildick/from-CMSSW_11_1_X_2020-05-13-1…

…100-CCLUT-debugging Improve Simtrack to GEM/CSC digi and stub matching
cms-sw · May 27, 2020 · ca1e6cb · ca1e6cb
2 parents 49d2de2 + d5a9b13
commit ca1e6cb
Show file tree

Hide file tree

Showing 15 changed files with 137 additions and 390 deletions.
diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCComparatorDigiFitter.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCComparatorDigiFitter.h
diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.cc
@@ -905,7 +905,7 @@ bool CSCCathodeLCTProcessor::patternFinding(
                 hit_layer[this_layer] = true;
                 layers_hit++;  // determines number of layers hit
                 // add this strip in this layer to the pattern we are currently considering
-                hits_single_pattern[this_layer][strip_num] = this_strip;
+                hits_single_pattern[this_layer][strip_num] = this_strip - stagger[this_layer];
               }
 
               // find at what bx did pulse on this halsfstrip & layer have started

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCComparatorDigiFitter.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCComparatorDigiFitter.cc
diff --git a/Validation/MuonCSCDigis/interface/CSCDigiMatcher.h b/Validation/MuonCSCDigis/interface/CSCDigiMatcher.h
@@ -88,6 +88,8 @@ class CSCDigiMatcher {
   void matchStripsToSimTrack(const CSCStripDigiCollection& strips);
   void matchWiresToSimTrack(const CSCWireDigiCollection& wires);
 
+  void clear();
+
   template <class T>
   std::set<unsigned int> selectDetIds(const T& digis, int csc_type) const;
 

diff --git a/Validation/MuonCSCDigis/interface/CSCStubMatcher.h b/Validation/MuonCSCDigis/interface/CSCStubMatcher.h
@@ -90,6 +90,8 @@ class CSCStubMatcher {
   void matchLCTsToSimTrack(const CSCCorrelatedLCTDigiCollection&);
   void matchMPLCTsToSimTrack(const CSCCorrelatedLCTDigiCollection&);
 
+  void clear();
+
   edm::EDGetTokenT<CSCCLCTDigiCollection> clctToken_;
   edm::EDGetTokenT<CSCALCTDigiCollection> alctToken_;
   edm::EDGetTokenT<CSCCorrelatedLCTDigiCollection> lctToken_;