From a3c4b5baa71ea748b2363efa0e2c648f4b8c870d Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Thu, 7 Apr 2016 11:23:26 +0200 Subject: [PATCH] Move type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD sequence out of EndPath This change is needed for trackingLowPU, where particleFlowDisplacedVertex is no longer in reconstruction_step Path after conversion to unscheduled, but the product is expected to be produced via the unscheduled execution. Having the produced in EndPath prevents it being run as unscheduled. I could have moved just particleFlowDisplacedVertex, but it turned out that the entire sequence is only about producing products, and hence it was simpler to move them all. --- Configuration/StandardSequences/python/Validation_cff.py | 4 ++-- DQMOffline/Configuration/python/DQMOffline_cff.py | 2 +- Validation/RecoParticleFlow/python/miniAODDQM_cff.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Configuration/StandardSequences/python/Validation_cff.py b/Configuration/StandardSequences/python/Validation_cff.py index 566b1128dcf04..526417e45d967 100644 --- a/Configuration/StandardSequences/python/Validation_cff.py +++ b/Configuration/StandardSequences/python/Validation_cff.py @@ -34,7 +34,7 @@ prevalidation = cms.Sequence( globalPrevalidation * hltassociation * metPreValidSeq * jetPreValidSeq ) prevalidationLiteTracking = cms.Sequence( prevalidation ) prevalidationLiteTracking.replace(globalPrevalidation,globalPrevalidationLiteTracking) -prevalidationMiniAOD = cms.Sequence( genParticles1 * miniAODValidationSequence * photonMiniAODValidationSequence * egammaValidationMiniAOD) +prevalidationMiniAOD = cms.Sequence( genParticles1 * miniAODValidationSequence * photonMiniAODValidationSequence * egammaValidationMiniAOD * type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD) validation = cms.Sequence(cms.SequencePlaceholder("mix") @@ -54,7 +54,7 @@ validationLiteTracking.replace(globalValidation,globalValidationLiteTracking) validationLiteTracking.remove(condDataValidation) -validationMiniAOD = cms.Sequence(type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD * JetValidationMiniAOD * METValidationMiniAOD) +validationMiniAOD = cms.Sequence(JetValidationMiniAOD * METValidationMiniAOD) prevalidation_preprod = cms.Sequence( preprodPrevalidation ) diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py index 59289eb4d3ccd..ccc276ae87c37 100644 --- a/DQMOffline/Configuration/python/DQMOffline_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_cff.py @@ -132,7 +132,7 @@ DQMOfflineBTag = cms.Sequence( bTagPlotsDATA ) -DQMOfflineMiniAOD = cms.Sequence(jetMETDQMOfflineRedoProductsMiniAOD) +DQMOfflineMiniAOD = cms.Sequence(jetMETDQMOfflineRedoProductsMiniAOD*miniAODDQMSequencePre) #Post sequences are automatically placed in the EndPath by ConfigBuilder if PAT is run. #miniAOD DQM sequences need to access the filter results. diff --git a/Validation/RecoParticleFlow/python/miniAODDQM_cff.py b/Validation/RecoParticleFlow/python/miniAODDQM_cff.py index 0cf6615ec9d33..469e4d0b43708 100644 --- a/Validation/RecoParticleFlow/python/miniAODDQM_cff.py +++ b/Validation/RecoParticleFlow/python/miniAODDQM_cff.py @@ -82,8 +82,10 @@ from JetMETCorrections.Type1MET.pfMETCorrectionType0_cfi import type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD +miniAODDQMSequencePre = cms.Sequence( + type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD +) miniAODDQMSequence = cms.Sequence( - type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD * JetValidation1 * JetValidation2 * JetResValidation1 * JetResValidation2 * METValidation1 * METValidation2 *