Merge pull request cms-sw#190 from tahuang1991/CSC_Upgrade_Trigger_SL…

…CH16 swith on phaseII upgrade for ME31,ME41 positive endcap
tahuang1991 · Sep 12, 2014 · d4faaca · d4faaca
2 parents c872065 + 457037c
commit d4faaca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc
@@ -120,7 +120,7 @@ CSCMotherboard::CSCMotherboard(unsigned endcap, unsigned station,
       alctParams = conf.getParameter<edm::ParameterSet>("alctSLHCME21");
       clctParams = conf.getParameter<edm::ParameterSet>("clctSLHCME21");
     }
-    else if ((theStation == 3 or theStation == 4) and theEndcap==2 and runME3141ILT) {
+    else if ((theStation == 3 or theStation == 4) and runME3141ILT) {
       tmbParams = me3141tmbRpcParams;
       alctParams = conf.getParameter<edm::ParameterSet>("alctSLHCME3141");
       clctParams = conf.getParameter<edm::ParameterSet>("clctSLHCME3141");

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.cc
@@ -98,7 +98,7 @@ CSCTriggerPrimitivesBuilder::CSCTriggerPrimitivesBuilder(const edm::ParameterSet
               tmb_[endc-1][stat-1][sect-1][subs-1][cham-1] = new CSCMotherboardME11GEM(endc, stat, sect, subs, cham, conf);
             else if (stat==2 && ring==1 && runME21ILT_)
               tmb_[endc-1][stat-1][sect-1][subs-1][cham-1] = new CSCMotherboardME21GEM(endc, stat, sect, subs, cham, conf);
-            else if ((stat==3 || stat==4) && ring==1 && runME3141ILT_ and endc==2)
+            else if ((stat==3 || stat==4) && ring==1 && runME3141ILT_)
               tmb_[endc-1][stat-1][sect-1][subs-1][cham-1] = new CSCMotherboardME3141RPC(endc, stat, sect, subs, cham, conf);
             else
               tmb_[endc-1][stat-1][sect-1][subs-1][cham-1] = new CSCMotherboard(endc, stat, sect, subs, cham, conf);
@@ -538,7 +538,7 @@ void CSCTriggerPrimitivesBuilder::build(const CSCBadChambers* badChambers,
             }
 
             // running upgraded ME3/1-ME4/1 TMBs
-            else if ((stat==3 or stat==4) && ring==1 && runME3141ILT_  and endc==2)
+            else if ((stat==3 or stat==4) && ring==1 && runME3141ILT_)
             {
               CSCMotherboardME3141RPC* tmb3141RPC = static_cast<CSCMotherboardME3141RPC*>(tmb);
               tmb3141RPC->setCSCGeometry(csc_g);