From 457037cd34e5e57a570d071647152131a144a750 Mon Sep 17 00:00:00 2001 From: tahuang1991 Date: Fri, 12 Sep 2014 11:59:07 -0500 Subject: [PATCH] swith on phaseII upgrade for ME31,ME41 positive endcap if runME31ME41ILT_=True --- L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc | 2 +- .../CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc index f886a77cba1de..138dd4d8fb3a9 100644 --- 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("alctSLHCME21"); clctParams = conf.getParameter("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("alctSLHCME3141"); clctParams = conf.getParameter("clctSLHCME3141"); diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.cc index 5f18e32c2aebb..7fe21c2c330ed 100644 --- 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(tmb); tmb3141RPC->setCSCGeometry(csc_g);