From 978f4441f6eab0739576a95b0d955ed2ecc457f6 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 10 Nov 2015 12:44:06 +0100 Subject: [PATCH] got rid of needless fastsim sequences in muon and photon postValidation configuration --- .../python/postValidation_cff.py | 8 +++--- .../python/photonFastSimPostProcessor_cff.py | 26 ------------------- .../python/photonPostProcessor_cff.py | 5 ++++ .../RecoMuon/python/PostProcessor_cff.py | 2 -- 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 Validation/RecoEgamma/python/photonFastSimPostProcessor_cff.py diff --git a/Validation/Configuration/python/postValidation_cff.py b/Validation/Configuration/python/postValidation_cff.py index ca981d9876757..6cd5bc83fa658 100644 --- a/Validation/Configuration/python/postValidation_cff.py +++ b/Validation/Configuration/python/postValidation_cff.py @@ -13,8 +13,8 @@ from Validation.RecoParticleFlow.PFValidationClient_cff import * from Validation.RPCRecHits.postValidation_cfi import * from Validation.RecoTau.DQMMCValidation_cfi import * -from Validation.RecoEgamma.photonFastSimPostProcessor_cff import * -from Validation.RecoVertex.PostProcessorVertex_cff import * +from Validation.RecoVertex.PrimaryVertexAnalyzer4PUSlimmed_Client_cfi import * +from Validation.RecoVertex.PostProcessorV0_cfi import * from Validation.RecoMET.METPostProcessor_cff import * from DQMOffline.RecoB.dqmCollector_cff import * @@ -44,10 +44,10 @@ postValidation_fastsim = cms.Sequence( - recoMuonPostProcessorsFastSim + recoMuonPostProcessor + postProcessorTrackSequence + MuIsoValPostProcessor - + fastSimPhotonPostProcessor + + photonPostProcessor + bTagCollectorSequenceMC + runTauEff ) diff --git a/Validation/RecoEgamma/python/photonFastSimPostProcessor_cff.py b/Validation/RecoEgamma/python/photonFastSimPostProcessor_cff.py deleted file mode 100644 index e48266bbc22c3..0000000000000 --- a/Validation/RecoEgamma/python/photonFastSimPostProcessor_cff.py +++ /dev/null @@ -1,26 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -#from Validation.RecoEgamma.photonPostprocessing_cfi import * -import Validation.RecoEgamma.photonPostprocessing_cfi -fastSimPhotonPostProcessing=Validation.RecoEgamma.photonPostprocessing_cfi.photonPostprocessing.clone() -fastSimPhotonPostProcessing.batch = cms.bool(False) -fastSimPhotonPostProcessing.standalone = cms.bool(False) -fastSimPhotonPostProcessing.isRunCentrally = cms.bool(True) -fastSimPhotonPostProcessing.fastSim = cms.bool(True) - -fastSimGEDPhotonPostProcessing=Validation.RecoEgamma.photonPostprocessing_cfi.photonPostprocessing.clone() -fastSimGEDPhotonPostProcessing.ComponentName = cms.string('fastSimpfPhotonPostprocessing') -fastSimGEDPhotonPostProcessing.analyzerName = cms.string('pfPhotonValidator') -fastSimGEDPhotonPostProcessing.batch = cms.bool(False) -fastSimGEDPhotonPostProcessing.standalone = cms.bool(False) -fastSimGEDPhotonPostProcessing.isRunCentrally = cms.bool(True) -fastSimGEDPhotonPostProcessing.fastSim = cms.bool(True) - - - -#from Validation.RecoEgamma.conversionPostprocessing_cfi import * -#conversionPostprocessing.batch = cms.bool(False) -#conversionPostprocessing.standalone = cms.bool(False) -#conversionPostprocessing.fastSim = cms.bool(True) - -fastSimPhotonPostProcessor = cms.Sequence(fastSimPhotonPostProcessing*fastSimGEDPhotonPostProcessing) diff --git a/Validation/RecoEgamma/python/photonPostProcessor_cff.py b/Validation/RecoEgamma/python/photonPostProcessor_cff.py index 18c6e011901ea..853f84cd216fb 100644 --- a/Validation/RecoEgamma/python/photonPostProcessor_cff.py +++ b/Validation/RecoEgamma/python/photonPostProcessor_cff.py @@ -29,3 +29,8 @@ photonPostProcessor = cms.Sequence(photonPostprocessing*pfPhotonPostprocessing*conversionPostprocessing) #photonPostProcessor = cms.Sequence(photonPostprocessing*conversionPostprocessing) +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + photonPostprocessing.fastsim = cms.bool(True) + oldpfPhotonPostprocessing.fastsim = cms.bool(True) + diff --git a/Validation/RecoMuon/python/PostProcessor_cff.py b/Validation/RecoMuon/python/PostProcessor_cff.py index f14aa84688eac..400d1e818dc74 100644 --- a/Validation/RecoMuon/python/PostProcessor_cff.py +++ b/Validation/RecoMuon/python/PostProcessor_cff.py @@ -165,5 +165,3 @@ recoMuonPostProcessors = cms.Sequence(postProcessorMuonMultiTrack*postProcessorRecoMuon_Glb*postProcessorRecoMuon_Trk*postProcessorRecoMuon_Sta*postProcessorRecoMuon_Tgt*postProcessorRecoMuon_GlbPF*postProcessorRecoMuon_TrkPF*postProcessorRecoMuon_StaPF*postProcessorMuonMultiTrackComp*postProcessorRecoMuonComp*postProcessorRecoMuonCompPF) - -recoMuonPostProcessorsFastSim = cms.Sequence(postProcessorMuonMultiTrack*postProcessorRecoMuon_Glb*postProcessorRecoMuon_Trk*postProcessorRecoMuon_Sta*postProcessorRecoMuon_Tgt*postProcessorRecoMuon_GlbPF*postProcessorRecoMuon_TrkPF*postProcessorRecoMuon_StaPF*postProcessorMuonMultiTrackComp*postProcessorRecoMuonComp*postProcessorRecoMuonCompPF)