Add new Era Ecal_Phase2_Devel

cms-sw · Oct 6, 2020 · a43270b · a43270b
1 parent ebb7343
commit a43270b
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 12 deletions.
diff --git a/Configuration/Eras/python/Era_Phase2_Ecal_Devel_cff.py b/Configuration/Eras/python/Era_Phase2_Ecal_Devel_cff.py
@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C9_cff import Phase2C9
+from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
+from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel
+
+Phase2_Ecal_Devel = cms.ModifierChain(Phase2C9, phase2_hfnose,phase2_ecal_devel)
+
diff --git a/Configuration/Eras/python/Modifier_phase2_ecal_devel_cff.py b/Configuration/Eras/python/Modifier_phase2_ecal_devel_cff.py
@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+phase2_ecal_devel =  cms.Modifier()
+
diff --git a/Configuration/StandardSequences/python/DigiToRaw_cff.py b/Configuration/StandardSequences/python/DigiToRaw_cff.py
@@ -53,8 +53,8 @@
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
 phase2_muon.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([rpcpacker]))
 
-from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
-phase2_ecal.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([esDigiToRaw]))
+from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel
+phase2_ecal_devel.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([esDigiToRaw]))
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 fastSim.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData,ctppsRawData]))
diff --git a/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py b/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py
@@ -18,10 +18,12 @@
 premix_stage1.toReplaceWith(ecalDigiTask, ecalDigiTask.copyAndExclude([simEcalPreshowerDigis]))
 
 from SimCalorimetry.EcalEBTrigPrimProducers.ecalEBTriggerPrimitiveDigis_cff import *
+_phase2_ecalDigiTask = ecalDigiTask.copy()
+_phase2_ecalDigiTask.add(simEcalEBTriggerPrimitiveDigis)
 
-#_phase2_ecalDigiTask = ecalDigiTask.copy()
-#_phase2_ecalDigiTask.add(simEcalEBTriggerPrimitiveDigis)
-_phase2_ecalDigiTask = cms.Task()
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 phase2_common.toReplaceWith(ecalDigiTask,_phase2_ecalDigiTask)
 
+from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel
+_phase2_ecalDigiTask_devel = cms.Task()
+phase2_common.toReplaceWith(ecalDigiTask,_phase2_ecalDigiTask_devel)
diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py
@@ -12,9 +12,9 @@
     )
 )
 
-from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
+from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel
 
-phase2_ecal.toModify(simEcalUnsuppressedDigis,
+phase2_ecal_devel.toModify(simEcalUnsuppressedDigis,
     mix = cms.VPSet(
         cms.PSet(type = cms.string('EBDigiCollectionPh2'))
     )                 

diff --git a/SimGeneral/MixingModule/python/ecalDigitizer_Ph2_cfi.py b/SimGeneral/MixingModule/python/ecalDigitizer_Ph2_cfi.py
@@ -18,7 +18,8 @@
     hitsProducer = cms.string('g4SimHits'),
     accumulatorType = cms.string("EcalDigiProducer_Ph2"),
     makeDigiSimLinks = cms.untracked.bool(False),
-    doEB = cms.bool(True)
+    doEB = cms.bool(True),
+    doES = cms.bool(False)
 )
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim

diff --git a/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py b/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py
@@ -29,13 +29,16 @@
 ecalDigitizer.doEE = cms.bool(True)
 ecalDigitizer.doES = cms.bool(True)
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toModify( ecalDigitizer, doES = cms.bool(False) )
+
+
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toModify( ecalDigitizer, doEE = cms.bool(False) )
 
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify( ecalDigitizer, doES = cms.bool(False) )
 
 #phase 2 digitization
-from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
+from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel
 from SimGeneral.MixingModule.ecalDigitizer_Ph2_cfi import ecalDigitizer_Ph2 as _ecalDigitizer_Ph2
-phase2_ecal.toReplaceWith(ecalDigitizer,_ecalDigitizer_Ph2)
+phase2_ecal_devel.toReplaceWith(ecalDigitizer,_ecalDigitizer_Ph2)
+phase2_ecal_devel.toModify(_ecalDigitizer_Ph2, doES = cms.bool(False) )