Merge pull request #29195 from watson-ij/update-gemEmap-run3-cmssw1101

Update Run3 GEM to use the eMap from the DB
cms-sw · Mar 24, 2020 · e837559 · e837559
2 parents eb2dca6 + 8fc8b69
commit e837559
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/Configuration/Eras/python/Era_Phase2_cff.py b/Configuration/Eras/python/Era_Phase2_cff.py
@@ -8,10 +8,11 @@
 from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
+from Configuration.Eras.Modifier_phase2_GEM_cff import phase2_GEM
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
 from Configuration.Eras.Modifier_hcalHardcodeConditions_cff import hcalHardcodeConditions
 from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
 from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 
-Phase2 = cms.ModifierChain(Run3.copyAndExclude([phase1Pixel,trackingPhase1]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, hcalHardcodeConditions, phase2_timing, phase2_timing_layer)
+Phase2 = cms.ModifierChain(Run3.copyAndExclude([phase1Pixel,trackingPhase1]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, phase2_GEM, hcalHardcodeConditions, phase2_timing, phase2_timing_layer)
diff --git a/Configuration/Eras/python/Modifier_phase2_GEM_cff.py b/Configuration/Eras/python/Modifier_phase2_GEM_cff.py
@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+phase2_GEM =  cms.Modifier()
diff --git a/EventFilter/GEMRawToDigi/python/gemPacker_cfi.py b/EventFilter/GEMRawToDigi/python/gemPacker_cfi.py
@@ -3,4 +3,9 @@
 gemPacker = _gemPackerDefault.clone()
 
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
+from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
+from Configuration.Eras.Modifier_phase2_GEM_cff import phase2_GEM
+
 run2_GEM_2017.toModify(gemPacker, useDBEMap = True)
+run3_GEM.toModify(gemPacker, useDBEMap = True)
+phase2_GEM.toModify(gemPacker, useDBEMap = False)
diff --git a/EventFilter/GEMRawToDigi/python/muonGEMDigis_cfi.py b/EventFilter/GEMRawToDigi/python/muonGEMDigis_cfi.py
@@ -3,4 +3,9 @@
 muonGEMDigis = _muonGEMDigisDefault.clone()
 
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
+from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
+from Configuration.Eras.Modifier_phase2_GEM_cff import phase2_GEM
+
 run2_GEM_2017.toModify(muonGEMDigis, useDBEMap = True)
+run3_GEM.toModify(muonGEMDigis, useDBEMap = True)
+phase2_GEM.toModify(muonGEMDigis, useDBEMap = False)