From 634a1f5d45040e62e50a21a7db598663c7fcdb8a Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Thu, 2 Aug 2018 13:27:35 +0200 Subject: [PATCH] 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. --- .../python/SimCalorimetry_EventContent_cff.py | 4 ++-- .../PreMixingModule/python/mixOne_premix_on_sim_cfi.py | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py index 551537de3d1fe..cf890a20ebce3 100644 --- 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 index 825a2bb49abb5..3092e3c9dc8b7 100644 --- 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(