From 6b9c94e4ac63079355526551d42b9b3f5be5b97a Mon Sep 17 00:00:00 2001 From: Jeongeun Lee Date: Tue, 28 Apr 2020 17:06:37 +0200 Subject: [PATCH 1/2] update eventcontent structure in RecoHI packages --- .../python/RecoHI_EventContent_cff.py | 31 ++++---- .../RecoHiCentrality_EventContent_cff.py | 31 ++++---- .../python/RecoHiEvtPlane_EventContent_cff.py | 29 ++++---- .../python/RecoHiMuon_EventContent_cff.py | 70 +++++++++---------- .../python/RecoHiTracker_EventContent_cff.py | 67 ++++++++---------- 5 files changed, 111 insertions(+), 117 deletions(-) diff --git a/RecoHI/Configuration/python/RecoHI_EventContent_cff.py b/RecoHI/Configuration/python/RecoHI_EventContent_cff.py index 3f1755a61e753..7361d422b905d 100644 --- a/RecoHI/Configuration/python/RecoHI_EventContent_cff.py +++ b/RecoHI/Configuration/python/RecoHI_EventContent_cff.py @@ -8,22 +8,24 @@ from RecoHI.HiEvtPlaneAlgos.RecoHiEvtPlane_EventContent_cff import * from RecoHI.HiMuonAlgos.RecoHiMuon_EventContent_cff import * - # combine RECO, AOD, FEVT content from all RecoHI packages # RecoHI event contents to be included by Configuration.EventContent.EventContentHeavyIons_cff -RecoHIRECO = cms.PSet( - outputCommands = cms.untracked.vstring() - ) - +# AOD content RecoHIAOD = cms.PSet( outputCommands = cms.untracked.vstring() - ) +) +RecoHIAOD.outputCommands.extend(RecoHiTrackerAOD.outputCommands) +RecoHIAOD.outputCommands.extend(RecoHiJetsAOD.outputCommands) +RecoHIAOD.outputCommands.extend(RecoHiEgammaAOD.outputCommands) +RecoHIAOD.outputCommands.extend(RecoHiEvtPlaneAOD.outputCommands) +RecoHIAOD.outputCommands.extend(RecoHiCentralityAOD.outputCommands) +RecoHIAOD.outputCommands.extend(RecoHiMuonAOD.outputCommands) -RecoHIFEVT = cms.PSet( +# RECO content +RecoHIRECO = cms.PSet( outputCommands = cms.untracked.vstring() - ) - +) RecoHIRECO.outputCommands.extend(RecoHiTrackerRECO.outputCommands) RecoHIRECO.outputCommands.extend(RecoHiTrackerLocalRECO.outputCommands) RecoHIRECO.outputCommands.extend(RecoHiJetsRECO.outputCommands) @@ -32,13 +34,10 @@ RecoHIRECO.outputCommands.extend(RecoHiCentralityRECO.outputCommands) RecoHIRECO.outputCommands.extend(RecoHiMuonRECO.outputCommands) -RecoHIAOD.outputCommands.extend(RecoHiTrackerAOD.outputCommands) -RecoHIAOD.outputCommands.extend(RecoHiJetsAOD.outputCommands) -RecoHIAOD.outputCommands.extend(RecoHiEgammaAOD.outputCommands) -RecoHIAOD.outputCommands.extend(RecoHiEvtPlaneAOD.outputCommands) -RecoHIAOD.outputCommands.extend(RecoHiCentralityAOD.outputCommands) -RecoHIAOD.outputCommands.extend(RecoHiMuonAOD.outputCommands) - +# FEVT content +RecoHIFEVT = cms.PSet( + outputCommands = cms.untracked.vstring() +) RecoHIFEVT.outputCommands.extend(RecoHiTrackerFEVT.outputCommands) RecoHIFEVT.outputCommands.extend(RecoHiTrackerLocalFEVT.outputCommands) RecoHIFEVT.outputCommands.extend(RecoHiJetsFEVT.outputCommands) diff --git a/RecoHI/HiCentralityAlgos/python/RecoHiCentrality_EventContent_cff.py b/RecoHI/HiCentralityAlgos/python/RecoHiCentrality_EventContent_cff.py index 39dda5b015a21..f6338eae54c53 100644 --- a/RecoHI/HiCentralityAlgos/python/RecoHiCentrality_EventContent_cff.py +++ b/RecoHI/HiCentralityAlgos/python/RecoHiCentrality_EventContent_cff.py @@ -1,17 +1,20 @@ import FWCore.ParameterSet.Config as cms +# AOD content +RecoHiCentralityAOD = cms.PSet( + outputCommands = cms.untracked.vstring( + 'keep recoCentrality*_hiCentrality_*_*', + 'keep *_centralityBin_*_*', + 'keep recoClusterCompatibility*_hiClusterCompatibility_*_*') +) -RecoHiCentralityFEVT = cms.PSet( - outputCommands = cms.untracked.vstring('keep recoCentrality*_hiCentrality_*_*', - 'keep *_centralityBin_*_*', - 'keep recoClusterCompatibility*_hiClusterCompatibility_*_*') - ) +# RECO content RecoHiCentralityRECO = cms.PSet( - outputCommands = cms.untracked.vstring('keep recoCentrality*_hiCentrality_*_*', - 'keep *_centralityBin_*_*', - 'keep recoClusterCompatibility*_hiClusterCompatibility_*_*') - ) -RecoHiCentralityAOD = cms.PSet( - outputCommands = cms.untracked.vstring('keep recoCentrality*_hiCentrality_*_*', - 'keep *_centralityBin_*_*', - 'keep recoClusterCompatibility*_hiClusterCompatibility_*_*') - ) + outputCommands = cms.untracked.vstring() +) +RecoHiCentralityRECO.outputCommands.extend(RecoHiCentralityAOD.outputCommands) + +# FEVT content +RecoHiCentralityFEVT = cms.PSet( + outputCommands = cms.untracked.vstring() +) +RecoHiCentralityFEVT.outputCommands.extend(RecoHiCentralityRECO.outputCommands) diff --git a/RecoHI/HiEvtPlaneAlgos/python/RecoHiEvtPlane_EventContent_cff.py b/RecoHI/HiEvtPlaneAlgos/python/RecoHiEvtPlane_EventContent_cff.py index c32f5b744ec8a..33e7b661b7c8f 100644 --- a/RecoHI/HiEvtPlaneAlgos/python/RecoHiEvtPlane_EventContent_cff.py +++ b/RecoHI/HiEvtPlaneAlgos/python/RecoHiEvtPlane_EventContent_cff.py @@ -1,17 +1,22 @@ import FWCore.ParameterSet.Config as cms -RecoHiEvtPlaneFEVT = cms.PSet( - outputCommands = cms.untracked.vstring('keep recoEvtPlanes_hiEvtPlane_*_*') - ) +# AOD content +RecoHiEvtPlaneAOD = cms.PSet( + outputCommands = cms.untracked.vstring( + 'keep recoEvtPlanes_hiEvtPlane_*_*', + 'keep ZDCRecHitsSorted_zdcreco_*_*', + 'keep ZDCDataFramesSorted_hcalDigis_*_*', + 'keep HFRecHitsSorted_hfreco_*_*') +) +# RECO content RecoHiEvtPlaneRECO = cms.PSet( - outputCommands = cms.untracked.vstring('keep recoEvtPlanes_hiEvtPlane_*_*') - ) + outputCommands = cms.untracked.vstring() +) +RecoHiEvtPlaneRECO.outputCommands.extend(RecoHiEvtPlaneAOD.outputCommands) -RecoHiEvtPlaneAOD = cms.PSet( - outputCommands = cms.untracked.vstring('keep recoEvtPlanes_hiEvtPlane_*_*', - 'keep ZDCRecHitsSorted_zdcreco_*_*', - 'keep ZDCDataFramesSorted_hcalDigis_*_*', - 'keep HFRecHitsSorted_hfreco_*_*' - ) - ) +# FEVT content +RecoHiEvtPlaneFEVT = cms.PSet( + outputCommands = cms.untracked.vstring() +) +RecoHiEvtPlaneFEVT.outputCommands.extend(RecoHiEvtPlaneRECO.outputCommands) diff --git a/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py b/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py index d5e210e82243f..be373e80be1b3 100644 --- a/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py +++ b/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py @@ -1,54 +1,52 @@ import FWCore.ParameterSet.Config as cms -#Full Event content -RecoHiMuonFEVT = cms.PSet( - outputCommands = cms.untracked.vstring() - ) - -#RECO content -RecoHiMuonRECO = cms.PSet( - outputCommands = cms.untracked.vstring() - ) - #AOD content RecoHiMuonAOD = cms.PSet( outputCommands = cms.untracked.vstring() ) - #Add Isolation from RecoMuon.MuonIsolationProducers.muIsolation_EventContent_cff import * # AOD content for re-muons reRecoMuonAOD = cms.PSet( - outputCommands = cms.untracked.vstring('keep *_remuons_*_*', - 'keep *_*_remuons_*', - # Tracks known by the Muon obj - 'keep recoTracks_standAloneMuons_*_*', - 'keep recoTrackExtras_standAloneMuons_*_*', - 'keep TrackingRecHitsOwned_standAloneMuons_*_*', - 'keep recoTracks_reglobalMuons_*_*', - 'keep recoTrackExtras_reglobalMuons_*_*', - 'keep recoTracks_retevMuons_*_*', - 'keep recoTrackExtras_retevMuons_*_*', - 'keep recoTracksToOnerecoTracksAssociation_retevMuons_*_*' - ) + outputCommands = cms.untracked.vstring( + 'keep *_remuons_*_*', + 'keep *_*_remuons_*', + # Tracks known by the Muon obj + 'keep recoTracks_standAloneMuons_*_*', + 'keep recoTrackExtras_standAloneMuons_*_*', + 'keep TrackingRecHitsOwned_standAloneMuons_*_*', + 'keep recoTracks_reglobalMuons_*_*', + 'keep recoTrackExtras_reglobalMuons_*_*', + 'keep recoTracks_retevMuons_*_*', + 'keep recoTrackExtras_retevMuons_*_*', + 'keep recoTracksToOnerecoTracksAssociation_retevMuons_*_*') ) -# RECO content +RecoHiMuonAOD.outputCommands.extend(reRecoMuonAOD.outputCommands) + +#RECO content +RecoHiMuonRECO = cms.PSet( + outputCommands = cms.untracked.vstring() + ) + reRecoMuonRECO = cms.PSet( - outputCommands = cms.untracked.vstring('keep *_MuonSeed_*_*', - 'keep *_ancientMuonSeed_*_*', - 'keep *_mergedStandAloneMuonSeeds_*_*', - 'keep TrackingRecHitsOwned_reglobalMuons_*_*', - 'keep TrackingRecHitsOwned_retevMuons_*_*', - 'keep recoCaloMuons_recalomuons_*_*') + outputCommands = cms.untracked.vstring( + 'keep *_MuonSeed_*_*', + 'keep *_ancientMuonSeed_*_*', + 'keep *_mergedStandAloneMuonSeeds_*_*', + 'keep TrackingRecHitsOwned_reglobalMuons_*_*', + 'keep TrackingRecHitsOwned_retevMuons_*_*', + 'keep recoCaloMuons_recalomuons_*_*') ) -# Full Event content +reRecoMuonRECO.outputCommands.extend(reRecoMuonAOD.outputCommands) +RecoHiMuonRECO.outputCommands.extend(reRecoMuonRECO.outputCommands) + +#Full Event content +RecoHiMuonFEVT = cms.PSet( + outputCommands = cms.untracked.vstring() + ) + reRecoMuonFEVT = cms.PSet( outputCommands = cms.untracked.vstring() ) -reRecoMuonRECO.outputCommands.extend(reRecoMuonAOD.outputCommands) reRecoMuonFEVT.outputCommands.extend(reRecoMuonRECO.outputCommands) - -RecoHiMuonAOD.outputCommands.extend(reRecoMuonAOD.outputCommands) -RecoHiMuonRECO.outputCommands.extend(reRecoMuonRECO.outputCommands) RecoHiMuonFEVT.outputCommands.extend(reRecoMuonFEVT.outputCommands) - diff --git a/RecoHI/HiTracking/python/RecoHiTracker_EventContent_cff.py b/RecoHI/HiTracking/python/RecoHiTracker_EventContent_cff.py index 25a96a7c694a0..bef311d674ee8 100644 --- a/RecoHI/HiTracking/python/RecoHiTracker_EventContent_cff.py +++ b/RecoHI/HiTracking/python/RecoHiTracker_EventContent_cff.py @@ -1,54 +1,43 @@ import FWCore.ParameterSet.Config as cms -#Full Event content -RecoHiTrackerFEVT = cms.PSet( +#AOD content +RecoHiTrackerAOD = cms.PSet( outputCommands = cms.untracked.vstring( - 'keep *_hiGeneralTracks_*_*', - 'keep *_hiGeneralAndPixelTracks_*_*', - 'keep *_hiPixel3PrimTracks_*_*', - 'keep *_hiPixel3ProtoTracks_*_*', - 'keep *_hiSelectedProtoTracks_*_*', - 'keep recoVertexs_hiPixelMedianVertex_*_*', - 'keep recoVertexs_hiPixelAdaptiveVertex_*_*', - 'keep recoVertexs_hiSelectedVertex_*_*', - 'keep recoVertexs_hiSelectedPixelVertex_*_*', - 'keep recoVertexs_hiPixelClusterVertex_*_*' - ) -) - -RecoHiTrackerLocalFEVT = cms.PSet( - outputCommands = cms.untracked.vstring( - 'keep *_*_APVCM_*', - 'keep *_siStripZeroSuppression_BADAPVBASELINE_*', - 'keep SiStripRawDigiedmDetSetVector_siStripZeroSuppression_VirginRaw_*' - ) + 'keep recoTracks_hiGeneralTracks_*_*', + 'keep recoTracks_hiGeneralAndPixelTracks_*_*', + 'keep recoVertexs_hiSelectedVertex_*_*') ) #RECO content RecoHiTrackerRECO = cms.PSet( outputCommands = cms.untracked.vstring( - 'keep *_hiGeneralTracks_*_*', - 'keep *_hiGeneralAndPixelTracks_*_*', - 'keep recoVertexs_hiPixelMedianVertex_*_*', - 'keep recoVertexs_hiPixelAdaptiveVertex_*_*', - 'keep recoVertexs_hiSelectedVertex_*_*', - 'keep recoVertexs_hiSelectedPixelVertex_*_*', - 'keep recoVertexs_hiPixelClusterVertex_*_*' - ) + 'keep *_hiGeneralTracks_*_*', + 'keep *_hiGeneralAndPixelTracks_*_*', + 'keep recoVertexs_hiPixelMedianVertex_*_*', + 'keep recoVertexs_hiPixelAdaptiveVertex_*_*', + 'keep recoVertexs_hiSelectedPixelVertex_*_*', + 'keep recoVertexs_hiPixelClusterVertex_*_*') ) +RecoHiTrackerRECO.outputCommands.extend(RecoHiTrackerAOD.outputCommands) RecoHiTrackerLocalRECO = cms.PSet( outputCommands = cms.untracked.vstring( - 'keep *_*_APVCM_*' - #'keep *_siStripZeroSuppression_BADAPVBASELINE_*', - #'keep SiStripRawDigiedmDetSetVector_siStripZeroSuppression_VirginRaw_*' - ) + 'keep *_*_APVCM_*') ) -#AOD content -RecoHiTrackerAOD = cms.PSet( - outputCommands = cms.untracked.vstring('keep recoTracks_hiGeneralTracks_*_*', - 'keep recoTracks_hiGeneralAndPixelTracks_*_*', - 'keep recoVertexs_hiSelectedVertex_*_*', - ) +#Full Event content +RecoHiTrackerFEVT = cms.PSet( + outputCommands = cms.untracked.vstring( + 'keep *_hiPixel3PrimTracks_*_*', + 'keep *_hiPixel3ProtoTracks_*_*', + 'keep *_hiSelectedProtoTracks_*_*', + 'keep recoVertexs_hiSelectedVertex_*_*') +) +RecoHiTrackerFEVT.outputCommands.extend(RecoHiTrackerRECO.outputCommands) + +RecoHiTrackerLocalFEVT = cms.PSet( + outputCommands = cms.untracked.vstring( + 'keep *_siStripZeroSuppression_BADAPVBASELINE_*', + 'keep SiStripRawDigiedmDetSetVector_siStripZeroSuppression_VirginRaw_*') ) +RecoHiTrackerLocalFEVT.outputCommands.extend(RecoHiTrackerLocalRECO.outputCommands) From b923b12cce493f5e890dc1d34e40278830f69629 Mon Sep 17 00:00:00 2001 From: JeongEun Lee Date: Thu, 30 Apr 2020 11:36:17 +0900 Subject: [PATCH 2/2] remove unused muIsolation --- RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py b/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py index be373e80be1b3..1666d25ed186b 100644 --- a/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py +++ b/RecoHI/HiMuonAlgos/python/RecoHiMuon_EventContent_cff.py @@ -4,9 +4,7 @@ RecoHiMuonAOD = cms.PSet( outputCommands = cms.untracked.vstring() ) -#Add Isolation -from RecoMuon.MuonIsolationProducers.muIsolation_EventContent_cff import * -# AOD content for re-muons +# for re-muons reRecoMuonAOD = cms.PSet( outputCommands = cms.untracked.vstring( 'keep *_remuons_*_*',