From 208aa592eb91a14ba12fa37f25ff8389deccec7a Mon Sep 17 00:00:00 2001 From: Mark Grimes Date: Tue, 10 Nov 2015 17:38:13 +0100 Subject: [PATCH 1/2] Add an phase1Pixel era command equivalent to "process.validation_step.remove(process.PixelTrackingRecHitsValid)" --- Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py b/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py index 0efb51559bc75..a94f2e3ad7845 100644 --- a/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py +++ b/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py @@ -5,3 +5,7 @@ from Validation.RecoTrack.SiStripTrackingRecHitsValid_cfi import * trackingRecHitsValid = cms.Sequence(PixelTrackingRecHitsValid*StripTrackingRecHitsValid) +# If the Phase 1 pixel detector is active, don't run this validation sequence +from Configuration.StandardSequences.Eras import eras +if eras.phase1Pixel.isChosen(): + trackingRecHitsValid.remove(PixelTrackingRecHitsValid) From eab5bef633aef2e13f7233ac13be3813c1979aba Mon Sep 17 00:00:00 2001 From: Mark Grimes Date: Tue, 10 Nov 2015 17:39:10 +0100 Subject: [PATCH 2/2] Add an phase1Pixel era command equivalent to "process.validation_step.remove(process.hltHiggsValidator)" --- HLTriggerOffline/Common/python/HLTValidation_cff.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/HLTriggerOffline/Common/python/HLTValidation_cff.py b/HLTriggerOffline/Common/python/HLTValidation_cff.py index e22c89ca5a1ba..96404e86638fb 100644 --- a/HLTriggerOffline/Common/python/HLTValidation_cff.py +++ b/HLTriggerOffline/Common/python/HLTValidation_cff.py @@ -48,6 +48,11 @@ +hltbtagValidationSequence ) +# The higgs validation is not compatible with the Phase 1 pixel, so +# take it out if that is active. +from Configuration.StandardSequences.Eras import eras +if eras.phase1Pixel.isChosen(): + hltvalidation.remove(HiggsValidationSequence) # additional producer sequence prior to hltvalidation_fastsim # to evacuate producers from the EndPath