From 4a6b5869e25e9f5ad7723c8eb67d03df609272f0 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Tue, 31 Jul 2018 16:55:41 +0200 Subject: [PATCH] Reorganize phase2 configurations accordingly --- .../EventContent/python/EventContent_cff.py | 40 +------------------ .../python/SimCalorimetry_EventContent_cff.py | 4 ++ .../python/SimGeneral_EventContent_cff.py | 7 +++- .../python/mixOne_premix_on_sim_cfi.py | 22 +--------- .../python/SimMuon_EventContent_cff.py | 5 +++ .../python/SimTracker_EventContent_cff.py | 5 +++ 6 files changed, 22 insertions(+), 61 deletions(-) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index b91b909939118..a737fcbf502f4 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -533,46 +533,8 @@ PREMIXEventContent.outputCommands.extend(SimTrackerPREMIX.outputCommands) PREMIXEventContent.outputCommands.extend(SimCalorimetryPREMIX.outputCommands) PREMIXEventContent.outputCommands.extend(SimMuonPREMIX.outputCommands) +PREMIXEventContent.outputCommands.extend(SimGeneralPREMIX.outputCommands) fastSim.toModify(PREMIXEventContent, outputCommands = PREMIXEventContent.outputCommands+fastSimEC.extraPremixContent) -# Phase2 essentially extends the content to DIGI -# We could split this by subdetector-eras, but let's start with simple -from Configuration.Eras.Modifier_phase2_common_cff import phase2_common -phase2_common.toModify(PREMIXEventContent, outputCommands = PREMIXEventContent.outputCommands+[ - # Tracker - 'keep Phase2TrackerDigiedmDetSetVector_mix_*_*', - 'keep *_*_Phase2OTDigiSimLink_*', - 'keep *_simSiPixelDigis_*_*', # covers digis and digiSimLinks - # MTD - # ??? - # ECAL - 'keep *_simEcalDigis_ebDigis_*', - 'keep ESDigiCollection_simEcalUnsuppressedDigis_*_*', - # HCAL - 'keep *_simHcalDigis_*_*', - 'keep ZDCDataFramesSorted_simHcalUnsuppressedDigis_*_*', - # HGCAL - 'keep *_simHGCalUnsuppressedDigis_EE_*', - 'keep *_simHGCalUnsuppressedDigis_HEfront_*', - 'keep *_simHGCalUnsuppressedDigis_HEback_*', - # DT - 'keep *_simMuonDTDigis_*_*', - # CSC - 'keep *_simMuonCSCDigis_*_*', - 'keep *_simMuonCscTriggerPrimitiveDigis_*_*', - # RPC - 'keep *_simMuonRPCDigis_*_*', - # GEM - 'keep *_simMuonGEMDigis_*_*', - 'keep *_*_GEMDigiSimLink_*', - 'keep *_*_GEMStripDigiSimLink_*', - # ME0 - 'keep *_simMuonME0Digis_*_*', - 'keep *_mix_g4SimHitsMuonME0Hits_*', - 'keep *_*_ME0DigiSimLink_*', - 'keep *_*_ME0StripDigiSimLink_*', - # CaloParticles - 'keep *_mix_MergedCaloTruth_*', -]) PREMIXRAWEventContent.outputCommands.extend(RAWSIMEventContent.outputCommands) PREMIXRAWEventContent.outputCommands.append('keep CrossingFramePlaybackInfoNew_*_*_*') diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py index 6913aad7beb21..551537de3d1fe 100644 --- a/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py +++ b/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py @@ -58,3 +58,7 @@ from Configuration.Eras.Modifier_phase2_common_cff import phase2_common 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_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/Configuration/python/SimGeneral_EventContent_cff.py b/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py index 3a29e6ff4a729..b7c377aedcb9b 100644 --- a/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py +++ b/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py @@ -28,8 +28,12 @@ 'keep int_*_bunchSpacing_*', 'keep *_genPUProtons_*_*') ) +# Event content for premixing library +SimGeneralPREMIX = cms.PSet( + outputCommands = cms.untracked.vstring() +) -# mods for HGCAL +# mods for HGCAL; should these be moved under SimCalorimetry? _phase2_hgc_extraCommands = cms.PSet( # using PSet in order to customize with Modifier v = cms.vstring('keep *_simHGCalUnsuppressedDigis_EE_*', 'keep *_simHGCalUnsuppressedDigis_HEfront_*', 'keep *_simHGCalUnsuppressedDigis_HEback_*', 'keep *_mix_MergedCaloTruth_*'), ) @@ -42,6 +46,7 @@ phase2_hgcal.toModify( SimGeneralRAW, outputCommands = SimGeneralRAW.outputCommands + _phase2_hgc_extraCommands.v ) phase2_hgcal.toModify( SimGeneralFEVTDEBUG, outputCommands = SimGeneralFEVTDEBUG.outputCommands + _phase2_hgc_extraCommands.v ) phase2_hgcal.toModify( SimGeneralRECO, outputCommands = SimGeneralRECO.outputCommands + _phase2_hgc_extraCommands.v ) +phase2_hgcal.toModify( SimGeneralPREMIX, outputCommands = SimGeneralPREMIX.outputCommands + _phase2_hgc_extraCommands.v ) _phase2_timing_extraCommands = [ 'keep *_mix_FTLBarrel_*','keep *_mix_FTLEndcap_*','keep *_mix_InitialVertices_*' ] from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing diff --git a/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py b/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py index 7888d0c66680f..825a2bb49abb5 100644 --- a/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py +++ b/SimGeneral/PreMixingModule/python/mixOne_premix_on_sim_cfi.py @@ -242,26 +242,13 @@ ) # ECAL -phase2_ecal.toModify(mixData, - workers = dict( - ecal = dict( - doES = False, - EBPileInputTag = "simEcalDigis:ebDigis", - EEPileInputTag = "simEcalDigis:eeDigis", - ) - ) -) +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( - HBHEPileInputTag = "simHcalDigis", - HOPileInputTag = "simHcalDigis", - HFPileInputTag = "simHcalDigis", - QIE10PileInputTag = "simHcalDigis:HFQIE10DigiCollection", - QIE11PileInputTag = "simHcalDigis:HBHEQIE11DigiCollection", ZDCPileInputTag = "simHcalUnsuppressedDigis", ) ) @@ -299,13 +286,6 @@ # Muon phase2_muon.toModify(mixData, workers = dict( - dt = dict(pileInputTag = "simMuonDTDigis"), - rpc = dict(pileInputTag = "simMuonRPCDigis"), - csc = dict( - strip = dict(pileInputTag = "simMuonCSCDigis:MuonCSCStripDigi"), - wire = dict(pileInputTag = "simMuonCSCDigis:MuonCSCWireDigi"), - comparator = dict(pileInputTag = "simMuonCSCDigis:MuonCSCComparatorDigi"), - ), gem = cms.PSet( workerType = cms.string("PreMixingGEMWorker"), digiTagSig = cms.InputTag("simMuonGEMDigis"), diff --git a/SimMuon/Configuration/python/SimMuon_EventContent_cff.py b/SimMuon/Configuration/python/SimMuon_EventContent_cff.py index 78f08916a0c2d..700e895751977 100644 --- a/SimMuon/Configuration/python/SimMuon_EventContent_cff.py +++ b/SimMuon/Configuration/python/SimMuon_EventContent_cff.py @@ -117,6 +117,11 @@ 'keep *_simMuonME0PadDigiClusters_*_*'] ) phase2_muon.toModify( SimMuonRAW, outputCommands = SimMuonRAW.outputCommands + ['keep StripDigiSimLinkedmDetSetVector_simMuonME0Digis_*_*'] ) phase2_muon.toModify( SimMuonRECO, outputCommands = SimMuonRECO.outputCommands + ['keep StripDigiSimLinkedmDetSetVector_simMuonME0Digis_*_*'] ) +phase2_muon.toModify( SimMuonPREMIX, outputCommands = SimMuonPREMIX.outputCommands + ['keep *_simMuonME0Digis_*_*', + 'keep *_mix_g4SimHitsMuonME0Hits_*', + 'keep *_*_ME0DigiSimLink_*', + 'keep *_*_ME0StripDigiSimLink_*'] ) + # For phase2 premixing switch the sim digi collections to the ones including pileup (premix_stage2 & phase2_muon).toModify(SimMuonFEVTDEBUG, outputCommands = SimMuonFEVTDEBUG.outputCommands + [ diff --git a/SimTracker/Configuration/python/SimTracker_EventContent_cff.py b/SimTracker/Configuration/python/SimTracker_EventContent_cff.py index da28ff219b6d9..89c229a32d7ef 100644 --- a/SimTracker/Configuration/python/SimTracker_EventContent_cff.py +++ b/SimTracker/Configuration/python/SimTracker_EventContent_cff.py @@ -57,3 +57,8 @@ 'keep *_mix_AffectedAPVList_*', ) ) +phase2_tracker.toModify(SimTrackerPREMIX, outputCommands = [ + 'keep Phase2TrackerDigiedmDetSetVector_mix_*_*', + 'keep *_*_Phase2OTDigiSimLink_*', + 'keep *_simSiPixelDigis_*_*', # covers digis and digiSimLinks +])