diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py index 8155e65990b38..da1f276c1e41a 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py @@ -49,13 +49,24 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA -(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBiasHLT, - eventSetupPathsKey='TkAlMinBiasHI' -) - (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBias, trackQualities = cms.vstring("highPurity") ) +pp_on_XeXe_2017.toModify(ALCARECOTkAlMinBiasHLT, + eventSetupPathsKey='TkAlMinBiasHI') + +import HLTrigger.HLTfilters.triggerResultsFilterFromDB_cfi +ALCARECOTkAlMinBiasTriggerResultsHI = HLTrigger.HLTfilters.triggerResultsFilterFromDB_cfi.triggerResultsFilterFromDB.clone( + eventSetupPathsKey = 'TkAlMinBiasHI', + usePathStatus = False, + hltResults = 'TriggerResults::HLT', + l1tResults = '', # leaving empty (not interested in L1T results) + throw = False # tolerate triggers stated above, but not available +) + +seqALCARECOTkAlMinBiasHI = cms.Sequence(ALCARECOTkAlMinBiasTriggerResultsHI*~ALCARECOTkAlMinBiasNOTHLT+ALCARECOTkAlMinBiasDCSFilter+ALCARECOTkAlMinBias) +pp_on_AA.toReplaceWith(seqALCARECOTkAlMinBias,seqALCARECOTkAlMinBiasHI) + from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(ALCARECOTkAlMinBias, etaMin = -4, etaMax = 4) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py index b2f88590caeab..56f667dc958fe 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py @@ -42,7 +42,18 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 +pp_on_XeXe_2017.toModify(ALCARECOSiStripCalMinBiasHLT, + eventSetupPathsKey='SiStripCalMinBiasHI') + from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA -(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiStripCalMinBiasHLT, - eventSetupPathsKey='SiStripCalMinBiasHI' +import HLTrigger.HLTfilters.triggerResultsFilterFromDB_cfi +ALCARECOSiStripCalMinBiasTriggerResultsHI = HLTrigger.HLTfilters.triggerResultsFilterFromDB_cfi.triggerResultsFilterFromDB.clone( + eventSetupPathsKey = 'SiStripCalMinBiasHI', + usePathStatus = False, + hltResults = 'TriggerResults::HLT', + l1tResults = '', # leaving empty (not interested in L1T results) + throw = False # tolerate triggers stated above, but not available ) + +seqALCARECOSiStripCalMinBiasHI = cms.Sequence(ALCARECOSiStripCalMinBiasTriggerResultsHI*DCSStatusForSiStripCalMinBias*ALCARECOSiStripCalMinBias) +pp_on_AA.toReplaceWith(seqALCARECOSiStripCalMinBias,seqALCARECOSiStripCalMinBiasHI) diff --git a/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc b/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc index fd6471a614f12..0b79f8f269c78 100644 --- a/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc +++ b/HLTrigger/HLTfilters/plugins/TriggerResultsFilterFromDB.cc @@ -40,6 +40,9 @@ TriggerResultsFilterFromDB::~TriggerResultsFilterFromDB() { delete m_expression; void TriggerResultsFilterFromDB::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; + // # use HLTPathStatus results + desc.add<bool>("usePathStatus", false) + ->setComment("Read the HLT results from the TriggerResults (false) or from the current job's PathStatus (true)."); // # HLT results - set to empty to ignore HLT desc.add<edm::InputTag>("hltResults", edm::InputTag("TriggerResults")); // # L1 uGT results - set to empty to ignore L1T