Merge pull request #44591 from stahlleiton/UnsubjetMapTracked_CMSSW_1…

…4_1_X Change unsubjet_map in btag info producers to tracked
cms-sw · Apr 3, 2024 · 993ec50 · 993ec50
2 parents 051fdff + 169cad2
commit 993ec50
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -305,7 +305,7 @@ DeepBoostedJetTagInfoProducer::DeepBoostedJetTagInfoProducer(const edm::Paramete
     trkPhi_value_map_token_ = consumes<edm::ValueMap<float>>(trkPhi_value_map_tag);
   }
 
-  const auto &unsubjet_map_tag = iConfig.getUntrackedParameter<edm::InputTag>("unsubjet_map", {});
+  const auto &unsubjet_map_tag = iConfig.getParameter<edm::InputTag>("unsubjet_map");
   if (!unsubjet_map_tag.label().empty()) {
     unsubjet_map_token_ = consumes<JetMatchMap>(unsubjet_map_tag);
     use_unsubjet_map_ = true;
@@ -335,7 +335,7 @@ void DeepBoostedJetTagInfoProducer::fillDescriptions(edm::ConfigurationDescripti
   desc.add<edm::InputTag>("secondary_vertices", edm::InputTag("inclusiveCandidateSecondaryVertices"));
   desc.add<edm::InputTag>("pf_candidates", edm::InputTag("particleFlow"));
   desc.add<edm::InputTag>("jets", edm::InputTag("ak8PFJetsPuppi"));
-  desc.addUntracked<edm::InputTag>("unsubjet_map", {});
+  desc.add<edm::InputTag>("unsubjet_map", {});
   desc.add<edm::InputTag>("puppi_value_map", edm::InputTag("puppi"));
   desc.add<edm::InputTag>("vertex_associator", edm::InputTag("primaryVertexAssociation", "original"));
   desc.add<bool>("use_scouting_features", false);

diff --git a/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc
@@ -160,7 +160,7 @@ DeepFlavourTagInfoProducer::DeepFlavourTagInfoProducer(const edm::ParameterSet&
     calib3d_token_ = esConsumes<TrackProbabilityCalibration, BTagTrackProbability3DRcd>();
   }
 
-  const auto& unsubjet_map_tag = iConfig.getUntrackedParameter<edm::InputTag>("unsubjet_map", {});
+  const auto& unsubjet_map_tag = iConfig.getParameter<edm::InputTag>("unsubjet_map");
   if (!unsubjet_map_tag.label().empty()) {
     unsubjet_map_token_ = consumes<JetMatchMap>(unsubjet_map_tag);
     use_unsubjet_map_ = true;
@@ -180,7 +180,7 @@ void DeepFlavourTagInfoProducer::fillDescriptions(edm::ConfigurationDescriptions
   desc.add<edm::InputTag>("puppi_value_map", edm::InputTag("puppi"));
   desc.add<edm::InputTag>("secondary_vertices", edm::InputTag("inclusiveCandidateSecondaryVertices"));
   desc.add<edm::InputTag>("jets", edm::InputTag("ak4PFJetsCHS"));
-  desc.addUntracked<edm::InputTag>("unsubjet_map", {});
+  desc.add<edm::InputTag>("unsubjet_map", {});
   desc.add<edm::InputTag>("candidates", edm::InputTag("packedPFCandidates"));
   desc.add<edm::InputTag>("vertex_associator", edm::InputTag("primaryVertexAssociation", "original"));
   desc.add<bool>("fallback_puppi_weight", false);

diff --git 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<edm::InputTag>("unsubjet_map", {});
+  const auto& unsubjet_map_tag = iConfig.getParameter<edm::InputTag>("unsubjet_map");
   if (!unsubjet_map_tag.label().empty()) {
     unsubjet_map_token_ = consumes<JetMatchMap>(unsubjet_map_tag);
     use_unsubjet_map_ = true;
@@ -154,7 +154,7 @@ void ParticleTransformerAK4TagInfoProducer::fillDescriptions(edm::ConfigurationD
   desc.add<edm::InputTag>("puppi_value_map", edm::InputTag("puppi"));
   desc.add<edm::InputTag>("secondary_vertices", edm::InputTag("inclusiveCandidateSecondaryVertices"));
   desc.add<edm::InputTag>("jets", edm::InputTag("ak4PFJetsCHS"));
-  desc.addUntracked<edm::InputTag>("unsubjet_map", {});
+  desc.add<edm::InputTag>("unsubjet_map", {});
   desc.add<edm::InputTag>("candidates", edm::InputTag("packedPFCandidates"));
   desc.add<edm::InputTag>("vertex_associator", edm::InputTag("primaryVertexAssociation", "original"));
   desc.add<bool>("fallback_puppi_weight", false);