Drop ES digis for phase2, and ZDC digis completely

ES is anyway disabled for phase2_ecal, and ZDC is not used in (run2) premixing anyway.
cms-sw · Aug 2, 2018 · 634a1f5 · 634a1f5
1 parent 4a6b586
commit 634a1f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py
@@ -34,7 +34,6 @@
         'keep EEDigiCollection_simEcalDigis_*_*',
         'keep ESDigiCollection_simEcalUnsuppressedDigis_*_*',
         'keep *_simHcalDigis_*_*',
-        'keep ZDCDataFramesSorted_simHcalUnsuppressedDigis_*_*',
     )
 )
 
@@ -59,6 +58,7 @@
 phase2_common.toModify( SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simEcalUnsuppressedDigis_*_*') )
 phase2_common.toModify( SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simEcalUnsuppressedDigis_*_*') )
 
+from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
+phase2_ecal.toModify( SimCalorimetryPREMIX.outputCommands, func=lambda outputCommands: outputCommands.append('drop ESDigiCollection_simEcalUnsuppressedDigis_*_*') )
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
-# TODO: Also the ES digi collection could be removed?
 phase2_hgcal.toModify( SimCalorimetryPREMIX.outputCommands, func=lambda outputCommands: outputCommands.append('drop EEDigiCollection_simEcalDigis_*_*') )
diff --git a/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py b/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py
@@ -245,15 +245,7 @@
 phase2_ecal.toModify (mixData, workers=dict(ecal=dict(doES=False)))
 phase2_hgcal.toModify(mixData, workers=dict(ecal=dict(doEE=False)))
 
-# HCAL
-phase2_hcal.toModify(mixData,
-    workers = dict(
-        hcal = dict(
-            ZDCPileInputTag = "simHcalUnsuppressedDigis",
-        )
-    )
-)
-
+# HGCAL
 phase2_hgcal.toModify(mixData,
     workers = dict(
         hgcee = cms.PSet(