Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

swith on phaseII upgrade for ME31,ME41 positive endcap #190

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down