Merge pull request cms-sw#135 from gem-sw/CSC-Trigger-Upgrade-GEM-RPC…

…-SLHC11 adjust LCT pattern and quality
tahuang1991 · Apr 21, 2014 · 5f3640a · 5f3640a
2 parents 36f24ee + 349206b
commit 5f3640a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc
@@ -92,8 +92,8 @@ CSCMotherboard::CSCMotherboard(unsigned endcap, unsigned station,
   // Motherboard parameters:
   edm::ParameterSet tmbParams  =  conf.getParameter<edm::ParameterSet>("tmbParam");
 
-  if (isSLHC && theStation == 1 &&
-      CSCTriggerNumbering::ringFromTriggerLabels(theStation, theTrigChamber) == 1 ) {
+  // run upgrade TMBs for all MEX/1 stations
+  if (isSLHC && CSCTriggerNumbering::ringFromTriggerLabels(theStation, theTrigChamber) == 1 ) {
     alctParams = conf.getParameter<edm::ParameterSet>("alctSLHC");
     clctParams = conf.getParameter<edm::ParameterSet>("clctSLHC");
     tmbParams  =  conf.getParameter<edm::ParameterSet>("tmbSLHC");

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.cc
@@ -2026,10 +2026,12 @@ CSCCorrelatedLCTDigi CSCMotherboardME11::constructLCTsGEM(const CSCALCTDigi& alc
   auto mymap(ME==ME1A ? gemPadToCscHsME1a_ : gemPadToCscHsME1b_);
   auto wgvshs(ME==ME1A ? lut_wg_vs_hs_me1a : lut_wg_vs_hs_me1b);
   if (oldDataFormat){
-    // CLCT pattern number - set it to a reasonably high value
-    unsigned int pattern = promoteALCTGEMpattern_ ? 4 : 0;
+    // CLCT pattern number - set it to a highest value
+    // hack to get LCTs in the CSCTF
+    unsigned int pattern = promoteALCTGEMpattern_ ? 10 : 0;
 
-    // LCT quality number - set it to a reasonably high value
+    // LCT quality number - set it to a very high value 
+    // hack to get LCTs in the CSCTF
     unsigned int quality = promoteALCTGEMquality_ ? 14 : 11;
 
     // Bunch crossing

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME21.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME21.cc
@@ -171,6 +171,11 @@ CSCMotherboardME21::~CSCMotherboardME21()
 void CSCMotherboardME21::clear()
 {
   CSCMotherboard::clear();
+
+  for (int bx = 0; bx < MAX_LCT_BINS; bx++)
+    for (unsigned int mbx = 0; mbx < match_trig_window_size; mbx++)
+      for (int i=0;i<2;i++)
+        allLCTs[bx][mbx][i].clear();
 
   gemRollToEtaLimitsShort_.clear();
   gemRollToEtaLimitsLong_.clear();
@@ -747,12 +752,14 @@ CSCCorrelatedLCTDigi CSCMotherboardME21::constructLCTsGEM(const CSCALCTDigi& alc
                                                           bool oldDataFormat) 
 {    
   if (oldDataFormat){
-    // CLCT pattern number - set it to a reasonably high value
-    unsigned int pattern = promoteALCTGEMpattern_ ? 4 : 0;
+    // CLCT pattern number - set it to a highest value
+    // hack to get LCTs in the CSCTF
+    unsigned int pattern = promoteALCTGEMpattern_ ? 10 : 0;
 
-    // LCT quality number - set it to a reasonably high value
+    // LCT quality number - set it to a very high value 
+    // hack to get LCTs in the CSCTF
     unsigned int quality = promoteALCTGEMquality_ ? 14 : 11;
-    
+
     // Bunch crossing
     int bx = alct.getBX();
 

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME3141.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME3141.cc
@@ -118,6 +118,11 @@ void CSCMotherboardME3141::clear()
 {
   CSCMotherboard::clear();
 
+  for (int bx = 0; bx < MAX_LCT_BINS; bx++)
+    for (unsigned int mbx = 0; mbx < match_trig_window_size; mbx++)
+      for (int i=0;i<2;i++)
+        allLCTs[bx][mbx][i].clear();
+
   rpcRollToEtaLimits_.clear();
   cscWgToRpcRoll_.clear();
   rpcStripToCscHs_.clear();