-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 17 additions & 14 deletions
31
RecoHI/HiCentralityAlgos/python/RecoHiCentrality_EventContent_cff.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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
29
RecoHI/HiEvtPlaneAlgos/python/RecoHiEvtPlane_EventContent_cff.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
|
|
||
67 changes: 28 additions & 39 deletions
67
RecoHI/HiTracking/python/RecoHiTracker_EventContent_cff.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where are these
RecoMuonIsolationXXXevent contents used here, or in the calling configs?If I am not wrong this
importcould even be removed here, if we want to clean up the config.@mandrenguyen ?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.