got rid of needless fastsim sequences in muon and photon postValidati…

…on configuration
gpetruc · Dec 2, 2015 · 978f444 · 978f444
1 parent 188a7f5
commit 978f444
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 32 deletions.
diff --git 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
diff --git 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
@@ -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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -165,5 +165,3 @@


		recoMuonPostProcessors = cms.Sequence(postProcessorMuonMultiTrackpostProcessorRecoMuon_GlbpostProcessorRecoMuon_TrkpostProcessorRecoMuon_StapostProcessorRecoMuon_TgtpostProcessorRecoMuon_GlbPFpostProcessorRecoMuon_TrkPFpostProcessorRecoMuon_StaPFpostProcessorMuonMultiTrackComppostProcessorRecoMuonComppostProcessorRecoMuonCompPF)

		recoMuonPostProcessorsFastSim = cms.Sequence(postProcessorMuonMultiTrackpostProcessorRecoMuon_GlbpostProcessorRecoMuon_TrkpostProcessorRecoMuon_StapostProcessorRecoMuon_TgtpostProcessorRecoMuon_GlbPFpostProcessorRecoMuon_TrkPFpostProcessorRecoMuon_StaPFpostProcessorMuonMultiTrackComppostProcessorRecoMuonComppostProcessorRecoMuonCompPF)