diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py index af2ab9744e11c..f2e1502782e25 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfosModEta2p4_cfi.py @@ -8,6 +8,7 @@ flip = cms.bool(False), jet_radius = cms.double(0.4), jets = cms.InputTag("hltPFPuppiJetForBtagEta2p4"), + unsubjet_map = cms.InputTag(""), max_jet_eta = cms.double(2.5), mightGet = cms.optional.untracked.vstring, min_candidate_pt = cms.double(0.95), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py index 64cb63b3c70d2..e84a87f035045 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPfDeepFlavourTagInfos_cfi.py @@ -8,6 +8,7 @@ flip = cms.bool(False), jet_radius = cms.double(0.4), jets = cms.InputTag("hltAK4PFPuppiJets"), + unsubjet_map = cms.InputTag(""), max_jet_eta = cms.double(2.5), mightGet = cms.optional.untracked.vstring, min_candidate_pt = cms.double(0.95), diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index cf6b3f412d26e..17aa142d7aa92 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -253,6 +253,15 @@ def customizeHLTfor44510(process): delattr(producer, 'AXOL1TLModelVersion') return process +def customizeHLTfor44591(process): + """ + Customisation for running HLT with the updated btag info producers from the PR 44591 + """ + for type in ["DeepFlavourTagInfoProducer", "ParticleTransformerAK4TagInfoProducer", "DeepBoostedJetTagInfoProducer"]: + for producer in producers_by_type(process, type): + if hasattr(producer, 'unsubjet_map'): + delattr(producer, 'unsubjet_map') + return process # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -273,4 +282,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # customizes AXOL1TL condition in the L1 menu process = customizeHLTfor44510(process) + process = customizeHLTfor44591(process) + return process diff --git a/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc index 52b47b85c4b61..a7464bb060735 100644 --- a/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc +++ b/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc @@ -305,7 +305,7 @@ DeepBoostedJetTagInfoProducer::DeepBoostedJetTagInfoProducer(const edm::Paramete trkPhi_value_map_token_ = consumes>(trkPhi_value_map_tag); } - const auto &unsubjet_map_tag = iConfig.getUntrackedParameter("unsubjet_map", {}); + const auto &unsubjet_map_tag = iConfig.getParameter("unsubjet_map"); if (!unsubjet_map_tag.label().empty()) { unsubjet_map_token_ = consumes(unsubjet_map_tag); use_unsubjet_map_ = true; @@ -335,7 +335,7 @@ void DeepBoostedJetTagInfoProducer::fillDescriptions(edm::ConfigurationDescripti desc.add("secondary_vertices", edm::InputTag("inclusiveCandidateSecondaryVertices")); desc.add("pf_candidates", edm::InputTag("particleFlow")); desc.add("jets", edm::InputTag("ak8PFJetsPuppi")); - desc.addUntracked("unsubjet_map", {}); + desc.add("unsubjet_map", {}); desc.add("puppi_value_map", edm::InputTag("puppi")); desc.add("vertex_associator", edm::InputTag("primaryVertexAssociation", "original")); desc.add("use_scouting_features", false); diff --git a/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc index 15ff99af02bbf..ce45078e4d463 100644 --- a/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc +++ b/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc @@ -160,7 +160,7 @@ DeepFlavourTagInfoProducer::DeepFlavourTagInfoProducer(const edm::ParameterSet& calib3d_token_ = esConsumes(); } - const auto& unsubjet_map_tag = iConfig.getUntrackedParameter("unsubjet_map", {}); + const auto& unsubjet_map_tag = iConfig.getParameter("unsubjet_map"); if (!unsubjet_map_tag.label().empty()) { unsubjet_map_token_ = consumes(unsubjet_map_tag); use_unsubjet_map_ = true; @@ -180,7 +180,7 @@ void DeepFlavourTagInfoProducer::fillDescriptions(edm::ConfigurationDescriptions desc.add("puppi_value_map", edm::InputTag("puppi")); desc.add("secondary_vertices", edm::InputTag("inclusiveCandidateSecondaryVertices")); desc.add("jets", edm::InputTag("ak4PFJetsCHS")); - desc.addUntracked("unsubjet_map", {}); + desc.add("unsubjet_map", {}); desc.add("candidates", edm::InputTag("packedPFCandidates")); desc.add("vertex_associator", edm::InputTag("primaryVertexAssociation", "original")); desc.add("fallback_puppi_weight", false); diff --git a/RecoBTag/FeatureTools/plugins/ParticleTransformerAK4TagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/ParticleTransformerAK4TagInfoProducer.cc index 64c50e7fdbbea..312dfd9852d57 100644 --- a/RecoBTag/FeatureTools/plugins/ParticleTransformerAK4TagInfoProducer.cc +++ b/RecoBTag/FeatureTools/plugins/ParticleTransformerAK4TagInfoProducer.cc @@ -137,7 +137,7 @@ ParticleTransformerAK4TagInfoProducer::ParticleTransformerAK4TagInfoProducer(con use_pvasq_value_map_ = true; } - const auto& unsubjet_map_tag = iConfig.getUntrackedParameter("unsubjet_map", {}); + const auto& unsubjet_map_tag = iConfig.getParameter("unsubjet_map"); if (!unsubjet_map_tag.label().empty()) { unsubjet_map_token_ = consumes(unsubjet_map_tag); use_unsubjet_map_ = true; @@ -154,7 +154,7 @@ void ParticleTransformerAK4TagInfoProducer::fillDescriptions(edm::ConfigurationD desc.add("puppi_value_map", edm::InputTag("puppi")); desc.add("secondary_vertices", edm::InputTag("inclusiveCandidateSecondaryVertices")); desc.add("jets", edm::InputTag("ak4PFJetsCHS")); - desc.addUntracked("unsubjet_map", {}); + desc.add("unsubjet_map", {}); desc.add("candidates", edm::InputTag("packedPFCandidates")); desc.add("vertex_associator", edm::InputTag("primaryVertexAssociation", "original")); desc.add("fallback_puppi_weight", false);