Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update eventcontent structure in RecoHI packages #29576

Merged
merged 2 commits into from Apr 30, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 15 additions & 16 deletions RecoHI/Configuration/python/RecoHI_EventContent_cff.py
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
@@ -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)
29 changes: 17 additions & 12 deletions 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)
70 changes: 34 additions & 36 deletions 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 *
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are these RecoMuonIsolationXXX event contents used here, or in the calling configs?
If I am not wrong this import could even be removed here, if we want to clean up the config.
@mandrenguyen ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, it looks like nothing from that import is actually used. If it's not doing anything, might as well remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will remove it.

# 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)

67 changes: 28 additions & 39 deletions 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)