Merge pull request #11068 from jeongeun/patch-10

Rebase PR#10798 Update standard EventContent definitions
cms-sw · Sep 29, 2015 · ff47886 · ff47886
2 parents f7a4609 + 17a054f
commit ff47886
Show file tree

Hide file tree

Showing 17 changed files with 389 additions and 93 deletions.
diff --git a/CalibMuon/RPCCalibration/python/l1Muon_EventContent_cff.py b/CalibMuon/RPCCalibration/python/l1Muon_EventContent_cff.py
@@ -5,7 +5,9 @@
         'keep CSCDetIdCSCWireDigiMuonDigiCollection_*_*_*', 
         'keep CSCDetIdCSCStripDigiMuonDigiCollection_*_*_*', 
         'keep DTLayerIdDTDigiMuonDigiCollection_*_*_*', 
-        'keep RPCDetIdRPCDigiMuonDigiCollection_*_*_*', 
+        #'keep RPCDetIdRPCDigiMuonDigiCollection_*_*_*', 
+        'keep RPCDetIdRPCDigiMuonDigiCollection_muonRPCDigis_*_*', 
+        'keep RPCDetIdRPCDigiMuonDigiCollection_simMuonRPCDigis_*_*', 
         'keep L1MuGMTCands_*_*_*', 
         'keep L1MuGMTReadoutCollection_*_*_*')
 )

diff --git a/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py b/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py
@@ -13,8 +13,11 @@
     'keep *_pfCombinedInclusiveSecondaryVertexV2BJetTagsEI_*_*',
     # taus 
     'keep recoPFTaus_pfTausEI_*_*',
-    'keep recoPFTauDiscriminator_pfTausDiscrimination*_*_*',
+    #'keep recoPFTauDiscriminator_pfTausDiscrimination*_*_*',
+    'keep recoPFTauDiscriminator_pfTausDiscriminationByDecayModeFinding_*_*',
+    'keep recoPFTauDiscriminator_pfTausDiscriminationByIsolation_*_*',
     # MET
-    'keep *_pfMetEI_*_*'
+    #'keep *_pfMetEI_*_*'
+    'keep recoPFMETs_pfMetEI_*_*'
     )
 )
diff --git a/EventFilter/ScalersRawToDigi/python/Scalers_EventContent_cff.py b/EventFilter/ScalersRawToDigi/python/Scalers_EventContent_cff.py
@@ -10,24 +10,27 @@
 # RECO content
 EvtScalersRECO = cms.PSet(
    outputCommands = cms.untracked.vstring(
-       'keep L1AcceptBunchCrossings_*_*_*',
-       'keep L1TriggerScalerss_*_*_*',
-       'keep Level1TriggerScalerss_*_*_*',
-       'keep LumiScalerss_*_*_*',
-       'keep BeamSpotOnlines_*_*_*',
-       'keep DcsStatuss_*_*_*'
+       #'keep L1AcceptBunchCrossings_*_*_*',
+       'keep L1AcceptBunchCrossings_scalersRawToDigi_*_*',
+       'keep L1TriggerScalerss_scalersRawToDigi_*_*',
+       'keep Level1TriggerScalerss_scalersRawToDigi_*_*',
+       'keep LumiScalerss_scalersRawToDigi_*_*',
+       'keep BeamSpotOnlines_scalersRawToDigi_*_*',
+       'keep DcsStatuss_scalersRawToDigi_*_*',
+       'keep DcsStatuss_hltScalersRawToDigi_*_*'
        )
 )
 
 
 # AOD content
 EvtScalersAOD = cms.PSet(
    outputCommands = cms.untracked.vstring(
-       'keep L1AcceptBunchCrossings_*_*_*',
-       'keep L1TriggerScalerss_*_*_*',
-       'keep Level1TriggerScalerss_*_*_*',
-       'keep LumiScalerss_*_*_*',
-       'keep BeamSpotOnlines_*_*_*',
-       'keep DcsStatuss_*_*_*'
+       #'keep L1AcceptBunchCrossings_*_*_*',
+       'keep L1AcceptBunchCrossings_scalersRawToDigi_*_*',
+       'keep L1TriggerScalerss_scalersRawToDigi_*_*',
+       'keep Level1TriggerScalerss_scalersRawToDigi_*_*',
+       'keep LumiScalerss_scalersRawToDigi_*_*',
+       'keep BeamSpotOnlines_scalersRawToDigi_*_*',
+       'keep DcsStatuss_scalersRawToDigi_*_*'
        )
 )
diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
@@ -3,31 +3,32 @@
 MicroEventContent = cms.PSet(
     outputCommands = cms.untracked.vstring(
         'drop *',
-        'keep *_slimmedPhotons*_*_*',
+        'keep *_slimmedPhotons_*_*',
         'keep *_slimmedElectrons_*_*',
-        'keep *_slimmedMuons*_*_*',
-        'keep *_slimmedTaus*_*_*',
+        'keep *_slimmedMuons_*_*',
+        'keep *_slimmedTaus_*_*',
         'keep *_slimmedJets_*_*',
         'keep *_slimmedJetsAK8_*_*',
         'keep *_slimmedJetsPuppi_*_*',
-        'keep *_slimmedMETs*_*_*',
-        'keep *_slimmedSecondaryVertices*_*_*',
+        #'keep *_slimmedMETs*_*_*',
+        'keep *_slimmedMETs_*_*',
+        'keep *_slimmedMETsPuppi_*_*',
+        'keep *_slimmedSecondaryVertices_*_*',
         'keep *_cmsTopTaggerMap_*_*',
         #'keep *_slimmedJetsAK8PFCHSSoftDropSubjets_*_*',
         #'keep *_slimmedJetsCMSTopTagCHSSubjets_*_*',
         'keep *_slimmedJetsAK8PFCHSSoftDropPacked_SubJets_*',
         'keep *_slimmedJetsCMSTopTagCHSPacked_SubJets_*',
         #'keep *_packedPatJetsAK8_*_*',
         ## add extra METs
-
+        
         'keep recoPhotonCores_reducedEgamma_*_*',
         'keep recoGsfElectronCores_reducedEgamma_*_*',
         'keep recoConversions_reducedEgamma_*_*',
         'keep recoSuperClusters_reducedEgamma_*_*',
         'keep recoCaloClusters_reducedEgamma_*_*',
         'keep EcalRecHitsSorted_reducedEgamma_*_*',
 
-
         'drop *_*_caloTowers_*',
         'drop *_*_pfCandidates_*',
         'drop *_*_genJets_*',
@@ -36,7 +37,13 @@
         'keep *_offlineSlimmedPrimaryVertices_*_*',
         'keep patPackedCandidates_packedPFCandidates_*_*',
 
-        'keep double_fixedGridRho*__*',
+        #'keep double_fixedGridRho*__*',
+        'keep double_fixedGridRhoAll__*',
+        'keep double_fixedGridRhoFastjetAll__*',
+        'keep double_fixedGridRhoFastjetAllCalo__*',
+        'keep double_fixedGridRhoFastjetCentralCalo__*',
+        'keep double_fixedGridRhoFastjetCentralChargedPileUp__*',
+        'keep double_fixedGridRhoFastjetCentralNeutral__*',
 
         'keep *_selectedPatTrigger_*_*',
         'keep patPackedTriggerPrescales_patTrigger__*',

diff --git a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py
@@ -49,8 +49,10 @@
 # RECO content
 RecoEgammaRECO = cms.PSet(
     outputCommands = cms.untracked.vstring(
-        'keep recoGsfElectronCores_gsfElectronCores_*_*', 
-        'keep recoGsfElectrons_gsfElectrons_*_*', 
+        'keep recoGsfElectronCores_gsfElectronCores_*_*',
+        'keep recoGsfElectronCores_gedGsfElectronCores_*_*',
+        'keep recoGsfElectrons_gsfElectrons_*_*',
+        'keep recoGsfElectrons_gedGsfElectrons_*_*',
         'keep recoGsfElectronCores_uncleanedOnlyGsfElectronCores_*_*', 
         'keep recoGsfElectrons_uncleanedOnlyGsfElectrons_*_*', 
         'keep floatedmValueMap_eidRobustLoose_*_*',
@@ -79,12 +81,12 @@
         'drop *_gedPhotonsTmp_valMapPFEgammaCandToPhoton_*',
         'keep recoConversions_allConversions_*_*',
         'keep recoConversions_allConversionsOldEG_*_*',
-        'keep recoTracks_ckfOutInTracksFrom*Conversions_*_*', 
-        'keep recoTracks_ckfInOutTracksFrom*Conversions_*_*', 
-        'keep recoTrackExtras_ckfOutInTracksFrom*Conversions_*_*', 
-        'keep recoTrackExtras_ckfInOutTracksFrom*Conversions_*_*', 
-        'keep TrackingRecHitsOwned_ckfOutInTracksFrom*Conversions_*_*', 
-        'keep TrackingRecHitsOwned_ckfInOutTracksFrom*Conversions_*_*',
+        'keep recoTracks_ckfOutInTracksFromConversions_*_*', 
+        'keep recoTracks_ckfInOutTracksFromConversions_*_*', 
+        'keep recoTrackExtras_ckfOutInTracksFromConversions_*_*', 
+        'keep recoTrackExtras_ckfInOutTracksFromConversions_*_*', 
+        'keep TrackingRecHitsOwned_ckfOutInTracksFromConversions_*_*', 
+        'keep TrackingRecHitsOwned_ckfInOutTracksFromConversions_*_*',
         'keep recoConversions_uncleanedOnlyAllConversions_*_*',
         'keep recoTracks_uncleanedOnlyCkfOutInTracksFromConversions_*_*', 
         'keep recoTracks_uncleanedOnlyCkfInOutTracksFromConversions_*_*', 
@@ -94,7 +96,8 @@
         'keep TrackingRecHitsOwned_uncleanedOnlyCkfInOutTracksFromConversions_*_*',
         'keep *_PhotonIDProd_*_*',
         'keep *_PhotonIDProdGED_*_*',
-        'keep *_hfRecoEcalCandidate_*_*',
+        #'keep *_hfRecoEcalCandidate_*_*',
+        'keep recoRecoEcalCandidates_hfRecoEcalCandidate_*_*',
         'keep *_hfEMClusters_*_*',
         'keep *_gedGsfElectronCores_*_*',
         'keep *_gedGsfElectrons_*_*'
@@ -105,7 +108,9 @@
 RecoEgammaAOD = cms.PSet(
     outputCommands = cms.untracked.vstring(
         'keep recoGsfElectronCores_gsfElectronCores_*_*', 
+        'keep recoGsfElectronCores_gedGsfElectronCores_*_*',
         'keep recoGsfElectrons_gsfElectrons_*_*', 
+        'keep recoGsfElectrons_gedGsfElectrons_*_*', 
         'keep recoGsfElectronCores_uncleanedOnlyGsfElectronCores_*_*', 
         'keep recoGsfElectrons_uncleanedOnlyGsfElectrons_*_*', 
         'keep floatedmValueMap_eidRobustLoose_*_*',
@@ -131,14 +136,15 @@
         'drop *_conversions_uncleanedConversions_*',
         'keep recoConversions_allConversions_*_*',
         'keep recoConversions_allConversionsOldEG_*_*',
-        'keep recoTracks_ckfOutInTracksFrom*Conversions_*_*', 
-        'keep recoTracks_ckfInOutTracksFrom*Conversions_*_*',
+        'keep recoTracks_ckfOutInTracksFromConversions_*_*', 
+        'keep recoTracks_ckfInOutTracksFromConversions_*_*',
         'keep recoConversions_uncleanedOnlyAllConversions_*_*',
         'keep recoTracks_uncleanedOnlyCkfOutInTracksFromConversions_*_*', 
         'keep recoTracks_uncleanedOnlyCkfInOutTracksFromConversions_*_*',
         'keep *_PhotonIDProd_*_*',
         'keep *_PhotonIDProdGED_*_*',
         'keep *_hfRecoEcalCandidate_*_*',
+        'keep recoRecoEcalCandidates_hfRecoEcalCandidate_*_*',
         'keep *_hfEMClusters_*_*',
         'keep *_gedGsfElectronCores_*_*',
         'keep *_gedGsfElectrons_*_*'

diff --git a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py
@@ -20,11 +20,55 @@
 
 RecoHiEgammaRECO = cms.PSet(
     outputCommands = cms.untracked.vstring(
-    'keep recoSuperClusters_*_*_*',
-    'keep recoCaloClusters_*_*_*',
-    'keep EcalRecHitsSorted_*_*_*',
-    'keep floatedmValueMap_*_*_*',  # isolation not created yet in RECO step, but in case it is later
-    'keep recoPFCandidates_*_*_*',
+    #'keep recoSuperClusters_*_*_*',
+     'keep recoSuperCluster_cleanedHybridSuperClusters_*_*',
+     'keep recoSuperCluster_correctedEndcapSuperClustersWithPreshower_*_*',     
+     'keep recoSuperCluster_correctedHybridSuperClusters_*_*',        
+     'keep recoSuperCluster_correctedIslandBarrelSuperClusters_*_*',
+     'keep recoSuperCluster_correctedIslandEndcapSuperClusters_*_*',
+     'keep recoSuperCluster_correctedMulti5x5SuperClustersWithPreshower_*_*',
+     'keep recoSuperCluster_hybridSuperClusters_*_*',
+     'keep recoSuperCluster_islandSuperClusters_*_*',
+     'keep recoSuperCluster_mergedSuperClusters_*_*',
+     'keep recoSuperCluster_multi5x5SuperClusters_*_*',
+     'keep recoSuperCluster_multi5x5SuperClustersCleaned_*_*',
+     'keep recoSuperCluster_multi5x5SuperClustersUncleaned_*_*',
+     'keep recoSuperCluster_multi5x5SuperClustersWithPreshower_*_*',
+     'keep recoSuperCluster_particleFlowEGamma_*_*',
+     'keep recoSuperCluster_particleFlowSuperClusterECAL_*_*',
+     'keep recoSuperCluster_uncleanedHybridSuperClusters_*_*',
+     'keep recoSuperCluster_uncleanedOnlyCorrectedHybridSuperClusters_*_*',
+     'keep recoSuperCluster_uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower_*_*',
+     'keep recoSuperCluster_uncleanedOnlyMulti5x5SuperClustersWithPreshower_*_*',
+    #'keep recoCaloClusters_*_*_*',
+     'keep recoCaloClusters_particleFlowEGamma_*_*',
+     'keep recoCaloClusters_cleanedHybridSuperClusters_*_*',
+     'keep recoCaloClusters_hybridSuperClusters_*_*',
+     'keep recoCaloClusters_uncleanedHybridSuperClusters_*_*',
+     'keep recoCaloClusters_islandBasicClusters_*_*',
+     'keep recoCaloClusters_multi5x5BasicClustersCleaned_*_*',
+     'keep recoCaloClusters_multi5x5BasicClustersUncleaned_*_*',
+     'keep recoCaloClusters_multi5x5SuperClusters_*_*',
+     'keep recoCaloClusters_particleFlowSuperClusterECAL_*_*',
+     'keep recoCaloClusters_multi5x5SuperClusters_*_*',
+    #'keep EcalRecHitsSorted_*_*_*',
+    'keep EcalRecHitsSorted_ecalRecHit_*_*',
+    'keep EcalRecHitsSorted_ecalPreshowerRecHit_*_*',
+    #'keep floatedmValueMap_*_*_*',  # isolation not created yet in RECO step, but in case it is later
+    'keep floatedmValueMap_hiDetachedTripletStepQual_MVAVals_*',        
+    'keep floatedmValueMap_hiDetachedTripletStepSelector_MVAVals_*',    
+    'keep floatedmValueMap_hiGeneralTracks_MVAVals_*',                  
+    'keep floatedmValueMap_hiInitialStepSelector_MVAVals_*',            
+    'keep floatedmValueMap_hiLowPtTripletStepQual_MVAVals_*',           
+    'keep floatedmValueMap_hiLowPtTripletStepSelector_MVAVals_*', 
+    'keep floatedmValueMap_hiPixelPairStepSelector_MVAVals_*',          
+    'keep floatedmValueMap_hiRegitMuInitialStepSelector_MVAVals_*', 
+    'keep floatedmValueMap_hiRegitMuMixedTripletStepSelector_MVAVals_*',
+    'keep floatedmValueMap_hiRegitMuPixelLessStepSelector_MVAVals_*', 
+    'keep floatedmValueMap_hiRegitMuPixelPairStepSelector_MVAVals_*', 
+    #'keep recoPFCandidates_*_*_*',
+    'keep recoPFCandidates_particleFlowEGamma_*_*',
+    'keep recoPFCandidates_particleFlowTmp_*_*',
     "drop recoPFClusters_*_*_*",
     "keep recoElectronSeeds_*_*_*",
     "keep recoGsfElectrons_*_*_*",

diff --git a/RecoHI/HiJetAlgos/python/RecoHiJets_EventContent_cff.py b/RecoHI/HiJetAlgos/python/RecoHiJets_EventContent_cff.py
@@ -2,11 +2,29 @@
 
 #Full Event content ---- temporary
 RecoHiJetsRECO = cms.PSet(
-    outputCommands = cms.untracked.vstring('keep *_*CaloJets_*_*',
-                                           'keep *_*PFJets_*_*',
-                                           'keep *_*HiGenJets_*_*',
-                                           'keep *_*voronoiBackground*_*_*',
-                                           'keep *_*PFTowers_*_*'
+    outputCommands = cms.untracked.vstring(#'keep *_*CaloJets_*_*',
+                                            'keep *_akPu3CaloJets_*_*',
+                                            'keep *_akPu4CaloJets_*_*', 
+                                            'keep *_akPu5CaloJets_*_*', 
+                                            'keep *_akVs2CaloJets_*_*', 
+                                            'keep *_akVs3CaloJets_*_*', 
+                                            'keep *_akVs4CaloJets_*_*', 
+                                            'keep *_akVs5CaloJets_*_*', 
+                                            'keep *_iterativeConePu5CaloJets_*_*', 
+                                           #'keep *_*PFJets_*_*',
+                                            'keep *_akPu3PFJets_*_*',
+                                            'keep *_akPu4PFJets_*_*',
+                                            'keep *_akPu5PFJets_*_*',
+                                            'keep *_akVs3PFJets_*_*',
+                                            'keep *_akVs4PFJets_*_*',
+                                            'keep *_akVs5PFJets_*_*',
+                                            'keep *_*HiGenJets_*_*',
+                                            #'keep *_*voronoiBackground*_*_*',
+                                            'keep *_voronoiBackgroundCalo_*_*',
+                                            'keep *_voronoiBackgroundPF_*_*',  
+                                            #'keep *_*PFTowers_*_*'
+                                            'keep *_PFTowers_*_*'
+
                                            )
     )
 

diff --git a/RecoJets/Configuration/python/RecoJets_EventContent_cff.py b/RecoJets/Configuration/python/RecoJets_EventContent_cff.py
@@ -60,7 +60,7 @@
                                            'keep *_JetPlusTrackZSPCorJetAntiKt4_*_*',                                  
                                            'keep *_ak4TrackJets_*_*',
                                            'keep recoRecoChargedRefCandidates_trackRefsForJets_*_*',         
-                                           #'keep *_caloTowers_*_*', 
+                                           'keep *_caloTowers_*_*', 
                                            'keep *_towerMaker_*_*',
                                            'keep *_CastorTowerReco_*_*',                                           
                                            'keep *_ak4JetTracksAssociatorAtVertex_*_*',
@@ -101,7 +101,7 @@
                                            'keep *_JetPlusTrackZSPCorJetAntiKt4_*_*',    
                                            'keep *_ak4TrackJets_*_*',
                                            'keep recoRecoChargedRefCandidates_trackRefsForJets_*_*',                                             
-                                           #'keep *_caloTowers_*_*', 
+                                           'keep *_caloTowers_*_*', 
                                            'keep *_CastorTowerReco_*_*',                                           
                                            'keep *_ak4JetTracksAssociatorAtVertex_*_*',
                                            'keep *_ak4JetTracksAssociatorAtVertexPF_*_*', 

diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContentCosmics_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContentCosmics_cff.py
@@ -27,9 +27,13 @@
                                            'keep HBHERecHitsSorted_hbherecoMB_*_*',
                                            'keep HORecHitsSorted_horecoMB_*_*',
                                            'keep HFRecHitsSorted_hfrecoMB_*_*',
-                                           'keep ZDCDataFramesSorted_*Digis_*_*',
+                                           #'keep ZDCDataFramesSorted_*Digis_*_*',
+                                           'keep ZDCDataFramesSorted_hcalDigis_*_*',
+                                           'keep ZDCDataFramesSorted_simHcalUnsuppressedDigis_*_*',
                                            'keep ZDCRecHitsSorted_*_*_*',
-                                           'keep HcalUnpackerReport_*_*_*'
+                                           #'keep HcalUnpackerReport_*_*_*'
+                                           'keep HcalUnpackerReport_castorDigis_*_*',
+                                           'keep HcalUnpackerReport_hcalDigis_*_*'
         )
 )
 #AOD content

diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py
@@ -30,19 +30,26 @@
                                            'keep HBHERecHitsSorted_hbherecoMB_*_*',
                                            'keep HORecHitsSorted_horecoMB_*_*',
                                            'keep HFRecHitsSorted_hfrecoMB_*_*',
-                                           'keep ZDCDataFramesSorted_*Digis_*_*',
+                                           #'keep ZDCDataFramesSorted_*Digis_*_*',
+                                           'keep ZDCDataFramesSorted_hcalDigis_*_*',
                                            'keep ZDCRecHitsSorted_*_*_*',
                                            'keep *_reducedHcalRecHits_*_*',
                                            'keep *_castorreco_*_*',
-                                           'keep HcalUnpackerReport_*_*_*'
+                                           #'keep HcalUnpackerReport_*_*_*'
+                                           'keep HcalUnpackerReport_castorDigis_*_*',
+                                           'keep HcalUnpackerReport_hcalDigiAlCaMB_*_*',
+                                           'keep HcalUnpackerReport_hcalDigis_*_*'
         )
 )
 #AOD content
 RecoLocalCaloAOD = cms.PSet(
     outputCommands = cms.untracked.vstring(
     'keep *_castorreco_*_*',
     'keep *_reducedHcalRecHits_*_*',
-    'keep HcalUnpackerReport_*_*_*'
+    #'keep HcalUnpackerReport_*_*_*'
+    'keep HcalUnpackerReport_castorDigis_*_*',
+    'keep HcalUnpackerReport_hcalDigiAlCaMB_*_*',
+    'keep HcalUnpackerReport_hcalDigis_*_*'
     )
 )
 RecoLocalCaloFEVT.outputCommands.extend(ecalLocalRecoFEVT.outputCommands)

diff --git a/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py b/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py
@@ -16,10 +16,10 @@
     'keep DetIdedmEDCollection_siPixelDigis_*_*',
     'keep *_siPixelClusters_*_*', 
     'keep *_siStripClusters_*_*',
-    'keep *_clusterSummaryProducer_*_*')
+    'keep ClusterSummary_clusterSummaryProducer_*_*')
 )
 #AOD content
 RecoLocalTrackerAOD = cms.PSet(
-    outputCommands = cms.untracked.vstring('keep *_clusterSummaryProducer_*_*')
+    outputCommands = cms.untracked.vstring('keep ClusterSummary_clusterSummaryProducer_*_*')
 )