Cfg Reorganisation

cms-sw · Jul 2, 2020 · 532b816 · 532b816
1 parent d4693b1
commit 532b816
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 160 deletions.
diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_Ph2_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_Ph2_cff.py
diff --git a/SimCalorimetry/Configuration/python/ecalDigiSequence_Ph2_cff.py b/SimCalorimetry/Configuration/python/ecalDigiSequence_Ph2_cff.py
diff --git a/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py b/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py
@@ -18,8 +18,14 @@
 premix_stage1.toReplaceWith(ecalDigiTask, ecalDigiTask.copyAndExclude([simEcalPreshowerDigis]))
 
 from SimCalorimetry.EcalEBTrigPrimProducers.ecalEBTriggerPrimitiveDigis_cff import *
-_phase2_ecalDigiTask = ecalDigiTask.copy()
-_phase2_ecalDigiTask.add(simEcalEBTriggerPrimitiveDigis)
+
+#DARIO COMMENTED:
+#_phase2_ecalDigiTask = ecalDigiTask.copy()
+#_phase2_ecalDigiTask.add(simEcalEBTriggerPrimitiveDigis)
+
+#DARIO ADDED:
+#_phase2_ecalDigiTask = cms.Task(simEcalDigis)
+_phase2_ecalDigiTask = cms.Task()
 
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 phase2_common.toReplaceWith(ecalDigiTask,_phase2_ecalDigiTask)

diff --git a/SimCalorimetry/EcalSelectiveReadoutProducers/python/ecalDigis_cfi.py b/SimCalorimetry/EcalSelectiveReadoutProducers/python/ecalDigis_cfi.py
@@ -38,6 +38,7 @@
     trigPrimCollection = cms.string(''),
 
     #switch to run w/o trigger primitive. For debug use only
+
     trigPrimBypass = cms.bool(False),
 
     # Mode selection for "Trig bypass" mode
@@ -72,6 +73,82 @@
     defaultTtf = cms.int32(4)
 )
 
+
+simEcalDigisPh2 = cms.EDProducer("EcalSelectiveReadoutProducer",
+    # Label of input EB and EE digi collections
+    digiProducer = cms.string('simEcalUnsuppressedDigis'),
+
+    # Instance name of input EB digi collections
+    EBdigiCollection = cms.string(''),
+
+    # Instance name of input EB digi collections
+    EEdigiCollection = cms.string(''),
+
+    # Instance name of output EB SR flags collection
+    EBSrFlagCollection = cms.string('ebSrFlags'),
+
+    # Instance name of output EE SR flags collection
+    EESrFlagCollection = cms.string('eeSrFlags'),
+
+    # Instance name of output EB digis collection
+    EBSRPdigiCollection = cms.string('ebDigis'),
+
+    # Instance name of output EE digis collection
+    EESRPdigiCollection = cms.string('eeDigis'),
+
+    # Switch for reading SRP settings from condition database
+    configFromCondDB = cms.bool(True),
+
+    # Switch to turn off SRP altogether using special DB payload
+    UseFullReadout = cms.bool(False),
+
+    # ES label?
+    # NZSLabel = cms.ESInputTag(' '),
+
+    # Label name of input ECAL trigger primitive collection
+    trigPrimProducer = cms.string('simEcalTriggerPrimitiveDigis'),
+
+    # Instance name of ECAL trigger primitive collection
+    trigPrimCollection = cms.string(''),
+
+    #switch to run w/o trigger primitive. For debug use only
+                                  trigPrimBypass = cms.bool(True),
+
+    # Mode selection for "Trig bypass" mode
+    # 0: TT thresholds applied on sum of crystal Et's
+    # 1: TT thresholds applies on compressed Et from Trigger primitive
+    # @ee trigPrimByPass_ switch
+    trigPrimBypassMode = cms.int32(0),
+
+    #for debug mode only:
+    trigPrimBypassLTH = cms.double(1.0),
+
+    #for debug mode only:
+    trigPrimBypassHTH = cms.double(1.0),
+
+    #for debug mode only
+    trigPrimBypassWithPeakFinder = cms.bool(True),
+
+    #number of events whose TT and SR flags must be dumped (for debug purpose):
+    dumpFlags = cms.untracked.int32(0),
+
+    #logical flag to write out SrFlags
+    writeSrFlags = cms.untracked.bool(True),
+
+    #switch to apply selective readout decision on the digis and produce
+    #the "suppressed" digis
+    produceDigis = cms.untracked.bool(True),
+
+    #Trigger Tower Flag to use when a flag is not found from the input
+    #Trigger Primitive collection. Must be one of the following values:
+    # 0: low interest, 1: mid interest, 3: high interest
+    # 4: forced low interest, 5: forced mid interest, 7: forced high interest
+    defaultTtf = cms.int32(4)
+)
+
+
+
+
 # Turn off SR in Ecal for premixing stage1
 from Configuration.ProcessModifiers.premix_stage1_cff import premix_stage1
 premix_stage1.toModify(simEcalDigis, UseFullReadout = True)
diff --git a/SimCalorimetry/EcalSimProducers/python/ecaldigi_cfi.py b/SimCalorimetry/EcalSimProducers/python/ecaldigi_cfi.py
@@ -2,3 +2,5 @@
 import FWCore.ParameterSet.Config as cms
 
 from SimGeneral.MixingModule.ecalDigitizer_cfi import *
+
+
diff --git a/SimGeneral/MixingModule/python/aliases_Ph2_cfi.py b/SimGeneral/MixingModule/python/aliases_Ph2_cfi.py
diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py
@@ -11,6 +11,15 @@
         cms.PSet(type = cms.string('ESDigiCollection'))
     )
 )
+
+from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
+
+phase2_ecal.toModify(simEcalUnsuppressedDigis,
+    mix = cms.VPSet(
+        cms.PSet(type = cms.string('EBDigiCollectionPh2'))
+    )                 
+)
+
 simHcalUnsuppressedDigis = cms.EDAlias(
     mix = cms.VPSet(
       cms.PSet(type = cms.string('HBHEDataFramesSorted')),

diff --git a/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py b/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py
@@ -8,6 +8,7 @@
 from SimCalorimetry.EcalSimProducers.ecalNotContainmentSim_cff import *
 from SimCalorimetry.EcalSimProducers.ecalCosmicsSim_cff import *
 
+
 ecalDigitizer = cms.PSet(
     ecal_digi_parameters,
     apd_sim_parameters,
@@ -32,3 +33,9 @@
 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) )
+
+
+#phase 2 digitization
+from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
+from SimGeneral.MixingModule.ecalDigitizer_Ph2_cfi import *
+phase2_ecal.toReplaceWith(ecalDigitizer,ecalDigitizer_Ph2)