Merge pull request #234 from gem-sw/CSC-Trigger-Upgrade-GEM-RPC-forSL…

…HC14 Csc trigger upgrade gem rpc for slhc14
gem-sw · Jun 10, 2014 · dde48d5 · dde48d5
2 parents 2b0172b + c879489
commit dde48d5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigisPostLS3_cfi.py b/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigisPostLS3_cfi.py
@@ -437,7 +437,8 @@
 
         ## matching to pads in case LowQ CLCT
         maxDeltaBXPad = cms.int32(1),
-        maxDeltaPadPad = cms.int32(2),
+        maxDeltaPadPadOdd = cms.int32(3),
+        maxDeltaPadPadEven = cms.int32(2),
         maxDeltaWg = cms.int32(1),
 
         ## matching to pads in case absent CLCT
@@ -496,7 +497,8 @@
 
         ## matching to digis in case LowQ CLCT
         maxDeltaBXRPC = cms.int32(0),
-        maxDeltaStripRPC = cms.int32(3),
+        maxDeltaStripRPCOdd = cms.int32(5),
+        maxDeltaStripRPCEven = cms.int32(4),
         maxDeltaWg = cms.int32(1),
 
         ## efficiency recovery switches

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME21GEM.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME21GEM.cc
@@ -124,7 +124,8 @@ CSCMotherboardME21GEM::CSCMotherboardME21GEM(unsigned endcap, unsigned station,
 
   //  deltas used to match to GEM pads
   maxDeltaBXPad_ = me21tmbParams.getParameter<int>("maxDeltaBXPad");
-  maxDeltaPadPad_ = me21tmbParams.getParameter<int>("maxDeltaPadPad");
+  maxDeltaPadPadOdd_ = me21tmbParams.getParameter<int>("maxDeltaPadPadOdd");
+  maxDeltaPadPadEven_ = me21tmbParams.getParameter<int>("maxDeltaPadPadEven");
   maxDeltaWg_ = me21tmbParams.getParameter<int>("maxDeltaWg");
 
   //  deltas used to match to GEM coincidence pads
@@ -296,6 +297,8 @@ CSCMotherboardME21GEM::run(const CSCWireDigiCollection* wiredc,
       }
     }
 
+    //select correct scenario, even or odd
+    maxDeltaPadPad_ = (isEven ? maxDeltaPadPadEven_ : maxDeltaPadPadOdd_);
     // build coincidence pads
     std::auto_ptr<GEMCSCPadDigiCollection> pCoPads(new GEMCSCPadDigiCollection());
     buildCoincidencePads(gemPads, *pCoPads);

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME21GEM.h b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME21GEM.h
@@ -172,6 +172,8 @@ class CSCMotherboardME21GEM : public CSCMotherboard
   //  deltas used to match to GEM pads
   int maxDeltaBXPad_;
   int maxDeltaPadPad_;
+  int maxDeltaPadPadEven_;
+  int maxDeltaPadPadOdd_;
   int maxDeltaWg_;
 
   //  deltas used to match to GEM coincidence pads

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME3141RPC.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME3141RPC.cc
@@ -152,7 +152,8 @@ CSCMotherboardME3141RPC::CSCMotherboardME3141RPC(unsigned endcap, unsigned stati
 
   // deltas used to match to RPC digis
   maxDeltaBXRPC_ = me3141tmbParams.getParameter<int>("maxDeltaBXRPC");
-  maxDeltaStripRPC_ = me3141tmbParams.getParameter<int>("maxDeltaStripRPC");
+  maxDeltaStripRPCOdd_ = me3141tmbParams.getParameter<int>("maxDeltaStripRPCOdd");
+  maxDeltaStripRPCEven_ = me3141tmbParams.getParameter<int>("maxDeltaStripRPCEven");
   maxDeltaWg_ = me3141tmbParams.getParameter<int>("maxDeltaWg");
 
   // use "old" or "new" dataformat for integrated LCTs?
@@ -327,6 +328,9 @@ CSCMotherboardME3141RPC::run(const CSCWireDigiCollection* wiredc,
         std::cout << "RPC Strip "<< p.first << " CSC HS: " << p.second << std::endl;
       }
     }
+    //select correct scenarios, even or odd
+     maxDeltaStripRPC_ = (isEven ?  maxDeltaStripRPCEven_ :  maxDeltaStripRPCOdd_);
+
     rpcDigis_.clear();
     retrieveRPCDigis(rpcDigis, rpc_id.rawId());
   }

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME3141RPC.h b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME3141RPC.h
@@ -154,6 +154,8 @@ class CSCMotherboardME3141RPC : public CSCMotherboard
   //  deltas used to match to RPC digis
   int maxDeltaBXRPC_;
   int maxDeltaStripRPC_;
+  int maxDeltaStripRPCOdd_;
+  int maxDeltaStripRPCEven_;
   int maxDeltaWg_;
 
   bool useOldLCTDataFormatCLCTRPC_;