Merge pull request #94 from jshlee/gem-csc-trigger-development

turn off gem for default
jshlee · Mar 5, 2014 · 7215b10 · 7215b10
2 parents ece43bf + 1ab5c5f
commit 7215b10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.cc
@@ -235,7 +235,7 @@ CSCMotherboardME11::CSCMotherboardME11(unsigned endcap, unsigned station,
   runGEMCSCILT_ = tmbParams.getUntrackedParameter<bool>("runGEMCSCILT", false);
 
   /// Do GEM matching?
-  do_gem_matching = tmbParams.getUntrackedParameter<bool>("doGemMatching", true);
+  do_gem_matching = tmbParams.getUntrackedParameter<bool>("doGemMatching", false);
 
   /// GEM matching dphi and deta
   gem_match_delta_phi_odd = tmbParams.getUntrackedParameter<double>("gemMatchDeltaPhiOdd", 0.0055);
@@ -464,13 +464,13 @@ void CSCMotherboardME11::run(const CSCWireDigiCollection* wiredc,
 
   // build coincidence pads
   std::auto_ptr<GEMCSCPadDigiCollection> pCoPads(new GEMCSCPadDigiCollection());
-  bool buildGEMCSCCoPads(true);
+  bool buildGEMCSCCoPads = do_gem_matching;
   if (buildGEMCSCCoPads){
     buildCoincidencePads(gemPads, *pCoPads);
   }
 
   // retrieve pads and copads in a certain BX window for this CSC 
-  bool wrapPads(true);
+  bool wrapPads = do_gem_matching;
   if (wrapPads){
     pads_.clear();
     coPads_.clear();

diff --git a/SLHCUpgradeSimulations/Configuration/python/gemCustoms.py b/SLHCUpgradeSimulations/Configuration/python/gemCustoms.py
@@ -55,6 +55,7 @@ def customise_L1Emulator(process, ptdphi = 'pt0'):
     }
 
     tmb = process.simCscTriggerPrimitiveDigis.tmbSLHC
+    tmb.doGemMatching = cms.untracked.bool(True)
     tmb.printAvailablePads = cms.untracked.bool(False)
     tmb.dropLowQualityCLCTsNoGEMs = cms.untracked.bool(False)
     tmb.buildLCTfromALCTandGEMinME1b = cms.untracked.bool(False)