Fix discrepancies in e/mu objects.

Author: hqucms

PhysicsTools/NanoAOD/python/electrons_cff.py

@@ -540,5 +540,5 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
 run2_egamma.toReplaceWith(electronTask, _electronTask_Run2)
 
 # Revert back to AK4 CHS jets for Run2 inputs
-run2_nanoAOD_ANY.toModify(
+run2_egamma.toModify(
     ptRatioRelForEle,srcJet="updatedJets")

PhysicsTools/NanoAOD/python/jetsAK4_CHS_cff.py

@@ -498,6 +498,7 @@ def nanoAOD_refineFastSim_bTagDeepFlav(process):
 jetUserDataTask = cms.Task(bJetVars,qgtagger,jercVars,pileupJetIdNano)
 
 #before cross linking
+chsJetUpdateTask = cms.Task(jetCorrFactorsNano,updatedJets)
 jetTask = cms.Task(jetCorrFactorsNano,updatedJets,jetUserDataTask,updatedJetsWithUserData,finalJets)
 
 #after cross linkining

PhysicsTools/NanoAOD/python/muons_cff.py

@@ -15,6 +15,12 @@
     pfCandsForMiniIso = cms.InputTag("packedPFCandidates"),
     miniIsoParams = PhysicsTools.PatAlgos.producersLayer1.muonProducer_cfi.patMuons.miniIsoParams, # so they're in sync
     recomputeMuonBasicSelectors = cms.bool(False),
+    recomputeSoftMuonMvaRun3 = cms.bool(False),
+    softMvaRun3Model = PhysicsTools.PatAlgos.producersLayer1.muonProducer_cfi.patMuons.softMvaRun3Model,
+)
+
+(run2_nanoAOD_106Xv2 | run3_nanoAOD_pre142X).toModify(
+    slimmedMuonsUpdated, recomputeMuonBasicSelectors=True, recomputeSoftMuonMvaRun3=True,
 )
 
 isoForMu = cms.EDProducer("MuonIsoValueMapProducer",
@@ -305,7 +311,7 @@
 
 
 # Revert back to AK4 CHS jets for Run 2
-run2_nanoAOD_ANY.toModify(
+run2_muon.toModify(
     ptRatioRelForMu,srcJet="updatedJets"
 )
 

PhysicsTools/NanoAOD/python/nano_cff.py

@@ -67,6 +67,11 @@
     isoTrackTablesTask,softActivityTablesTask
 )
 
+(run2_muon | run2_egamma).toReplaceWith(
+    nanoTableTaskCommon,
+    nanoTableTaskCommon.copyAndAdd(chsJetUpdateTask)
+)
+
 nanoSequenceCommon = cms.Sequence(nanoTableTaskCommon)
 
 nanoSequenceOnlyFullSim = cms.Sequence(triggerObjectTablesTask)
@@ -132,7 +137,7 @@ def nanoAOD_addTauIds(process, idsToRun=[], addPNetCHS=False, addUParTPuppi=Fals
             addGenJetMatch=False,
             genJetMatch=""
         ))
-        process.tauTask.add(process.jetTask, getattr(process, updatedTauName))
+        process.tauTask.add(process.chsJetUpdateTask, getattr(process, updatedTauName))
         originalTauName = updatedTauName
 
     if addUParTPuppi:

PhysicsTools/NanoAOD/python/nano_eras_cff.py

@@ -24,8 +24,13 @@
 
 from Configuration.ProcessModifiers.nanoAOD_rePuppi_cff import nanoAOD_rePuppi
 
+# [General Note]
+# use `runX_nanoAOD_YYY` only for input-dataset-specific changes
+# (e.g., run2_nanoAOD_106Xv2 for 106X MiniAODv2, run3_nanoAOD_pre142X for pre-142X Run3 MiniAODs)
 run2_nanoAOD_ANY = (
     run2_nanoAOD_106Xv2
 )
 
+# use other modifiers for intrinsic era-dependent changes
 run2_egamma = (run2_egamma_2016 | run2_egamma_2017 | run2_egamma_2018)
+run2_muon = (run2_muon_2016 | run2_muon_2017 | run2_muon_2018)

PhysicsTools/PatAlgos/plugins/BuildFile.xml

@@ -18,6 +18,7 @@
   <use name="DataFormats/HeavyIonEvent"/>
   <use name="DataFormats/HepMCCandidate"/>
   <use name="PhysicsTools/PatUtils"/>
+  <use name="PhysicsTools/XGBoost"/>
   <use name="CondFormats/JetMETObjects"/>
   <use name="CondFormats/HcalObjects"/>
   <use name="CondFormats/DataRecord"/>

PhysicsTools/PatAlgos/plugins/LeptonUpdater.cc

@@ -1,11 +1,13 @@
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "PhysicsTools/PatUtils/interface/MiniIsolation.h"
+#include "PhysicsTools/PatAlgos/interface/SoftMuonMvaRun3Estimator.h"
+#include "PhysicsTools/XGBoost/interface/XGBooster.h"
 #include "DataFormats/Common/interface/View.h"
 
 #include "DataFormats/PatCandidates/interface/Muon.h"
@@ -18,7 +20,7 @@
 namespace pat {
 
   template <typename T>
-  class LeptonUpdater : public edm::global::EDProducer<> {
+  class LeptonUpdater : public edm::stream::EDProducer<> {
   public:
     explicit LeptonUpdater(const edm::ParameterSet &iConfig)
         : src_(consumes<std::vector<T>>(iConfig.getParameter<edm::InputTag>("src"))),
@@ -32,14 +34,23 @@ namespace pat {
         pcToken_ = consumes<pat::PackedCandidateCollection>(iConfig.getParameter<edm::InputTag>("pfCandsForMiniIso"));
       }
       recomputeMuonBasicSelectors_ = false;
-      if (typeid(T) == typeid(pat::Muon))
+      recomputeSoftMuonMvaRun3_ = false;
+      if (typeid(T) == typeid(pat::Muon)) {
         recomputeMuonBasicSelectors_ = iConfig.getParameter<bool>("recomputeMuonBasicSelectors");
+        recomputeSoftMuonMvaRun3_ = iConfig.getParameter<bool>("recomputeSoftMuonMvaRun3");
+        if (recomputeSoftMuonMvaRun3_) {
+          std::string softMvaRun3Model = iConfig.getParameter<std::string>("softMvaRun3Model");
+          softMuonMvaRun3Booster_ =
+              std::make_unique<pat::XGBooster>(edm::FileInPath(softMvaRun3Model + ".model").fullPath(),
+                                               edm::FileInPath(softMvaRun3Model + ".features").fullPath());
+        }
+      }
       produces<std::vector<T>>();
     }
 
     ~LeptonUpdater() override {}
 
-    void produce(edm::StreamID, edm::Event &, edm::EventSetup const &) const override;
+    void produce(edm::Event &, const edm::EventSetup &) override;
 
     static void fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
       edm::ParameterSetDescription desc;
@@ -53,6 +64,9 @@ namespace pat {
       if (typeid(T) == typeid(pat::Muon)) {
         desc.add<bool>("recomputeMuonBasicSelectors", false)
             ->setComment("Recompute basic cut-based muon selector flags");
+        desc.add<bool>("recomputeSoftMuonMvaRun3", false)->setComment("Recompute Run3 soft muon MVA value");
+        desc.add<std::string>("softMvaRun3Model", "RecoMuon/MuonIdentification/data/Run2022-20231030-1731-Event0")
+            ->setComment("Run3 soft muon MVA model path");
         desc.addOptional<std::vector<double>>("miniIsoParams")
             ->setComment("Parameters used for miniIso (as in PATMuonProducer)");
         descriptions.add("muonsUpdated", desc);
@@ -76,6 +90,8 @@ namespace pat {
 
     void recomputeMuonBasicSelectors(T &, const reco::Vertex &, const bool) const;
 
+    void recomputeSoftMuonMvaRun3(T &);
+
   private:
     // configurables
     edm::EDGetTokenT<std::vector<T>> src_;
@@ -84,8 +100,10 @@ namespace pat {
     bool computeMiniIso_;
     bool fixDxySign_;
     bool recomputeMuonBasicSelectors_;
+    bool recomputeSoftMuonMvaRun3_;
     std::vector<double> miniIsoParams_[2];
     edm::EDGetTokenT<pat::PackedCandidateCollection> pcToken_;
+    std::unique_ptr<pat::XGBooster> softMuonMvaRun3Booster_;
   };
 
   // must do the specialization within the namespace otherwise gcc complains
@@ -128,10 +146,18 @@ namespace pat {
     lep.setSelectors(muon::makeSelectorBitset(lep, &pv, do_hip_mitigation_2016));
   }
 
+  template <typename T>
+  void LeptonUpdater<T>::recomputeSoftMuonMvaRun3(T &lep) {}
+
+  template <>
+  void LeptonUpdater<pat::Muon>::recomputeSoftMuonMvaRun3(pat::Muon &muon) {
+    muon.setSoftMvaRun3Value(computeSoftMvaRun3(*softMuonMvaRun3Booster_, muon));
+  }
+
 }  // namespace pat
 
 template <typename T>
-void pat::LeptonUpdater<T>::produce(edm::StreamID, edm::Event &iEvent, edm::EventSetup const &) const {
+void pat::LeptonUpdater<T>::produce(edm::Event &iEvent, edm::EventSetup const &) {
   edm::Handle<std::vector<T>> src;
   iEvent.getByToken(src_, src);
 
@@ -179,6 +205,9 @@ void pat::LeptonUpdater<T>::produce(edm::StreamID, edm::Event &iEvent, edm::Even
     }
     if (recomputeMuonBasicSelectors_)
       recomputeMuonBasicSelectors(lep, pv, do_hip_mitigation_2016);
+    if (recomputeSoftMuonMvaRun3_) {
+      recomputeSoftMuonMvaRun3(lep);
+    }
     //Fixing the sign of impact parameters
     if (fixDxySign_) {
       float signPV = 1.;