cms-sw · cmsbuild · Nov 16, 2021 · Oct 7, 2021 · Oct 7, 2021 · Oct 11, 2021
diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py
@@ -9,6 +9,7 @@
 from Validation.RecoHI.HarvestingHI_cff import *
 from Validation.RecoJets.JetPostProcessor_cff import *
 from Validation.RecoMET.METPostProcessor_cff import *
+from DQMOffline.RecoB.bTagMiniDQM_cff import *
 
 
 dqmHarvesting = cms.Path(DQMOffline_SecondStep*DQMOffline_Certification)
@@ -66,5 +67,5 @@
 alcaHarvesting = cms.Path()
 #alcaHarvesting = cms.Sequence()
 
-validationHarvestingMiniAOD = cms.Path(JetPostProcessor*METPostProcessorHarvesting*postValidationMiniAOD)
+validationHarvestingMiniAOD = cms.Path(JetPostProcessor*METPostProcessorHarvesting*bTagMiniValidationHarvesting*postValidationMiniAOD)
 #validationHarvestingMiniAOD = cms.Sequence(JetPostProcessor*METPostProcessorHarvesting*postValidationMiniAOD)
diff --git a/Configuration/StandardSequences/python/Validation_cff.py b/Configuration/StandardSequences/python/Validation_cff.py
@@ -31,6 +31,7 @@
 from Validation.RecoEgamma.photonMiniAODValidationSequence_cff import *
 from Validation.RecoEgamma.egammaValidationMiniAOD_cff import *
 from Validation.RecoTau.RecoTauValidation_cff import *
+from DQMOffline.RecoB.bTagMiniDQM_cff import *
 
 prevalidationNoHLT = cms.Sequence( cms.SequencePlaceholder("mix") * globalPrevalidation * metPreValidSeq * jetPreValidSeq )
 prevalidation = cms.Sequence( cms.SequencePlaceholder("mix") * globalPrevalidation * hltassociation * metPreValidSeq * jetPreValidSeq )
@@ -66,7 +67,7 @@
 validationLiteTracking.replace(globalValidation,globalValidationLiteTracking)
 validationLiteTracking.remove(condDataValidation)
 
-validationMiniAOD = cms.Sequence(type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD * JetValidationMiniAOD * METValidationMiniAOD * tauValidationSequenceMiniAOD)
+validationMiniAOD = cms.Sequence(type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD * JetValidationMiniAOD * METValidationMiniAOD * tauValidationSequenceMiniAOD * bTagMiniValidationSource)
 
 prevalidation_preprod = cms.Sequence( preprodPrevalidation )
 

diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -224,7 +224,8 @@
 
 from PhysicsTools.NanoAOD.nanoDQM_cff import *
 from Validation.RecoParticleFlow.DQMForPF_MiniAOD_cff import *
+from DQMOffline.RecoB.bTagMiniDQM_cff import *
 
-DQMHarvestMiniAOD = cms.Sequence( dataCertificationJetMETSequence * muonQualityTests_miniAOD * DQMHarvestPF )
+DQMHarvestMiniAOD = cms.Sequence( dataCertificationJetMETSequence * muonQualityTests_miniAOD * DQMHarvestPF * bTagMiniDQMHarvesting)
 DQMHarvestNanoAOD = cms.Sequence( nanoHarvest )
 
diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -245,10 +245,11 @@
 from Validation.RecoParticleFlow.miniAODDQM_cff import * # On MiniAOD vs RECO
 from Validation.RecoParticleFlow.DQMForPF_MiniAOD_cff import * # MiniAOD PF variables
 from DQM.TrackingMonitor.tracksDQMMiniAOD_cff import *
+from DQMOffline.RecoB.bTagMiniDQM_cff import *
 from DQMOffline.Muon.miniAOD_cff import *
 from DQM.Physics.DQMTopMiniAOD_cff import *
 
-DQMOfflineMiniAOD = cms.Sequence(jetMETDQMOfflineRedoProductsMiniAOD*muonMonitors_miniAOD*MuonMiniAOD*DQMOfflinePF)
+DQMOfflineMiniAOD = cms.Sequence(jetMETDQMOfflineRedoProductsMiniAOD*bTagMiniDQMSource*muonMonitors_miniAOD*MuonMiniAOD*DQMOfflinePF)
 
 #Post sequences are automatically placed in the EndPath by ConfigBuilder if PAT is run.
 #miniAOD DQM sequences need to access the filter results.

diff --git a/DQMOffline/RecoB/plugins/BuildFile.xml b/DQMOffline/RecoB/plugins/BuildFile.xml
@@ -6,14 +6,15 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/JetReco"/>
 <use name="DataFormats/VertexReco"/>
+<use name="DataFormats/PatCandidates"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="JetMETCorrections/JetCorrector"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<library file="BTagPerformanceAnalyzerOnData.cc PrimaryVertexMonitor.cc BTagPerformanceHarvester.cc" name="DQMOfflineRecoBPlugins">
+<library file="BTagPerformanceAnalyzerOnData.cc PrimaryVertexMonitor.cc BTagPerformanceHarvester.cc MiniAODTaggerAnalyzer.cc MiniAODTaggerHarvester.cc" name="DQMOfflineRecoBPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
 
diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc
@@ -0,0 +1,84 @@
+#include "DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/Event.h"
+
+MiniAODTaggerAnalyzer::MiniAODTaggerAnalyzer(const edm::ParameterSet& pSet)
+    : jetToken_(consumes<std::vector<pat::Jet> >(pSet.getParameter<edm::InputTag>("JetTag"))),
+      disrParameters_(pSet.getParameter<edm::ParameterSet>("parameters")),
+
+      folder_(pSet.getParameter<std::string>("folder")),
+      discrNumerator_(pSet.getParameter<vstring>("numerator")),
+      discrDenominator_(pSet.getParameter<vstring>("denominator")),
+
+      mclevel_(pSet.getParameter<int>("MClevel")),
+      doCTagPlots_(pSet.getParameter<bool>("CTagPlots")),
+      dodifferentialPlots_(pSet.getParameter<bool>("differentialPlots")),
+      discrCut_(pSet.getParameter<double>("discrCut")),
+
+      etaActive_(pSet.getParameter<bool>("etaActive")),
+      etaMin_(pSet.getParameter<double>("etaMin")),
+      etaMax_(pSet.getParameter<double>("etaMax")),
+      ptActive_(pSet.getParameter<bool>("ptActive")),
+      ptMin_(pSet.getParameter<double>("ptMin")),
+      ptMax_(pSet.getParameter<double>("ptMax"))
+
+{}
+
+MiniAODTaggerAnalyzer::~MiniAODTaggerAnalyzer() {}
+
+void MiniAODTaggerAnalyzer::bookHistograms(DQMStore::IBooker& ibook, edm::Run const& run, edm::EventSetup const& es) {
+  jetTagPlotter_ = std::make_unique<JetTagPlotter>(folder_,
+                                                   EtaPtBin(etaActive_, etaMin_, etaMax_, ptActive_, ptMin_, ptMax_),
+                                                   disrParameters_,
+                                                   mclevel_,
+                                                   false,
+                                                   ibook,
+                                                   doCTagPlots_,
+                                                   dodifferentialPlots_,
+                                                   discrCut_);
+}
+
+void MiniAODTaggerAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  edm::Handle<std::vector<pat::Jet> > jetCollection;
+  iEvent.getByToken(jetToken_, jetCollection);
+
+  const float jec = 1.;  // JEC not implemented!
+  float numerator = 0;
+  float denominator = 0;
+
+  // Loop over the pat::Jets
+  for (std::vector<pat::Jet>::const_iterator jet = jetCollection->begin(); jet != jetCollection->end(); ++jet) {
+    numerator = 0;
+    denominator = 0;
+
+    for (const auto& discrLabel : discrNumerator_) {
+      numerator = numerator + jet->bDiscriminator(discrLabel);
+    }
+
+    for (const auto& discrLabel : discrDenominator_) {
+      denominator = denominator + jet->bDiscriminator(discrLabel);
+    }
+
+    if (discrDenominator_.empty()) {
+      denominator = 1;
+    }
+
+    // only fill with valid discriminator values
+    if (numerator >= 0 && denominator >= 0) {
+      reco::Jet recoJet = *jet;
+      if (jetTagPlotter_->etaPtBin().inBin(recoJet, jec)) {
+        jetTagPlotter_->analyzeTag(recoJet, jec, numerator / denominator, jet->partonFlavour());
+      }
+    }
+  }
+
+  // fill JetMultiplicity
+  if (mclevel_ > 0) {
+    jetTagPlotter_->analyzeTag(1.);
+  } else {
+    jetTagPlotter_->analyzeTag();
+  }
+}
+
+//define this as a plug-in
+DEFINE_FWK_MODULE(MiniAODTaggerAnalyzer);
diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h
@@ -0,0 +1,50 @@
+#ifndef MiniAODTaggerAnalyzer_H
+#define MiniAODTaggerAnalyzer_H
+
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "DataFormats/PatCandidates/interface/Jet.h"
+#include "DQMOffline/RecoB/interface/JetTagPlotter.h"
+
+/** \class MiniAODTaggerAnalyzer
+ *
+ *  Tagger analyzer to run on MiniAOD
+ *
+ */
+
+class MiniAODTaggerAnalyzer : public DQMEDAnalyzer {
+public:
+  explicit MiniAODTaggerAnalyzer(const edm::ParameterSet& pSet);
+  ~MiniAODTaggerAnalyzer() override;
+
+  void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
+
+private:
+  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
+  typedef std::vector<std::string> vstring;
+
+  // using JetTagPlotter object for all the hard work ;)
+  std::unique_ptr<JetTagPlotter> jetTagPlotter_;
+
+  edm::EDGetTokenT<std::vector<pat::Jet> > jetToken_;
+  edm::ParameterSet disrParameters_;
+
+  std::string folder_;
+  vstring discrNumerator_;
+  vstring discrDenominator_;
+
+  int mclevel_;
+  bool doCTagPlots_;
+  bool dodifferentialPlots_;
+  double discrCut_;
+
+  bool etaActive_;
+  double etaMin_;
+  double etaMax_;
+  bool ptActive_;
+  double ptMin_;
+  double ptMax_;
+};
+
+#endif
diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.cc b/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.cc
@@ -0,0 +1,40 @@
+#include "DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/Event.h"
+
+MiniAODTaggerHarvester::MiniAODTaggerHarvester(const edm::ParameterSet& pSet)
+    : folder_(pSet.getParameter<std::string>("folder")),
+      disrParameters_(pSet.getParameter<edm::ParameterSet>("parameters")),
+
+      mclevel_(pSet.getParameter<int>("MClevel")),
+      doCTagPlots_(pSet.getParameter<bool>("CTagPlots")),
+      dodifferentialPlots_(pSet.getParameter<bool>("differentialPlots")),
+      discrCut_(pSet.getParameter<double>("discrCut")),
+
+      etaActive_(pSet.getParameter<bool>("etaActive")),
+      etaMin_(pSet.getParameter<double>("etaMin")),
+      etaMax_(pSet.getParameter<double>("etaMax")),
+      ptActive_(pSet.getParameter<bool>("ptActive")),
+      ptMin_(pSet.getParameter<double>("ptMin")),
+      ptMax_(pSet.getParameter<double>("ptMax"))
+
+{}
+
+MiniAODTaggerHarvester::~MiniAODTaggerHarvester() {}
+
+void MiniAODTaggerHarvester::dqmEndJob(DQMStore::IBooker& ibook, DQMStore::IGetter& iget) {
+  jetTagPlotter_ = std::make_unique<JetTagPlotter>(folder_,
+                                                   EtaPtBin(etaActive_, etaMin_, etaMax_, ptActive_, ptMin_, ptMax_),
+                                                   disrParameters_,
+                                                   mclevel_,
+                                                   true,
+                                                   ibook,
+                                                   doCTagPlots_,
+                                                   dodifferentialPlots_,
+                                                   discrCut_);
+
+  jetTagPlotter_->finalize(ibook, iget);
+}
+
+//define this as a plug-in
+DEFINE_FWK_MODULE(MiniAODTaggerHarvester);
diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.h b/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.h
@@ -0,0 +1,40 @@
+#ifndef MiniAODTaggerHarvester_H
+#define MiniAODTaggerHarvester_H
+
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMOffline/RecoB/interface/JetTagPlotter.h"
+
+/** \class MiniAODTaggerHarvester
+ *
+ *  Tagger harvester to run on MiniAOD
+ *
+ */
+
+class MiniAODTaggerHarvester : public DQMEDHarvester {
+public:
+  explicit MiniAODTaggerHarvester(const edm::ParameterSet& pSet);
+  ~MiniAODTaggerHarvester() override;
+
+private:
+  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
+
+  std::unique_ptr<JetTagPlotter> jetTagPlotter_;
+
+  std::string folder_;
+  edm::ParameterSet disrParameters_;
+
+  int mclevel_;
+  bool doCTagPlots_;
+  bool dodifferentialPlots_;
+  double discrCut_;
+
+  bool etaActive_;
+  double etaMin_;
+  double etaMax_;
+  bool ptActive_;
+  double ptMin_;
+  double ptMax_;
+};
+
+#endif
diff --git a/DQMOffline/RecoB/python/bTagCommon_cff.py b/DQMOffline/RecoB/python/bTagCommon_cff.py
@@ -50,29 +50,5 @@
             folder = cms.string("JP")
         ),
 
-        cms.PSet(
-            bTagGenericAnalysisBlock,
-            label = cms.InputTag("pfDeepCSVDiscriminatorsJetTags:BvsAll"),
-            folder = cms.string("deepCSV_BvsAll"),
-            differentialPlots = cms.bool(True),
-            discrCut = cms.double(0.1522)
-        ),
-        cms.PSet(
-            cTagGenericAnalysisBlock,
-            label = cms.InputTag("pfDeepCSVDiscriminatorsJetTags:CvsL"),
-            folder = cms.string("deepCSV_CvsL"),
-            doCTagPlots = cms.bool(True),
-            differentialPlots = cms.bool(True),
-            discrCut = cms.double(0.15)
-        ),
-        cms.PSet(
-            cTagGenericAnalysisBlock,
-            label = cms.InputTag("pfDeepCSVDiscriminatorsJetTags:CvsB"),
-            folder = cms.string("deepCSV_CvsB"),
-            doCTagPlots = cms.bool(True),
-            differentialPlots = cms.bool(True),
-            discrCut = cms.double(0.28)
-        ),
-
     )
 )
diff --git a/DQMOffline/RecoB/python/bTagMiniDQMDeepCSV.py b/DQMOffline/RecoB/python/bTagMiniDQMDeepCSV.py
@@ -0,0 +1,55 @@
+import FWCore.ParameterSet.Config as cms
+
+from DQMOffline.RecoB.bTagGenericAnalysis_cff import bTagGenericAnalysisBlock
+from DQMOffline.RecoB.cTagGenericAnalysis_cff import cTagGenericAnalysisBlock
+
+
+# recommendation for UL18: https://twiki.cern.ch/twiki/bin/view/CMS/BtagRecommendation106XUL18
+deepCSVWP = {
+    'BvsAll': 0.1208, # loose
+    'CvsL':   0.153,  # medium
+    'CvsB':   0.363,  # medium
+}
+
+
+DeepCSVDiscriminators = {
+    'BvsAll': cms.PSet(
+        bTagGenericAnalysisBlock,
+
+        folder = cms.string('DeepCSV_BvsAll'),
+        CTagPlots = cms.bool(False),
+        discrCut = cms.double(deepCSVWP['BvsAll']),
+        numerator = cms.vstring(
+            'pfDeepCSVJetTags:probb',
+            'pfDeepCSVJetTags:probbb',
+        ),
+        denominator = cms.vstring(),
+    ),
+
+    'CvsL': cms.PSet(
+        cTagGenericAnalysisBlock,
+
+        folder = cms.string('DeepCSV_CvsL'),
+        CTagPlots = cms.bool(True),
+        discrCut = cms.double(deepCSVWP['CvsL']),
+        numerator = cms.vstring('pfDeepCSVJetTags:probc'),
+        denominator = cms.vstring(
+            'pfDeepCSVJetTags:probc',
+            'pfDeepCSVJetTags:probudsg',
+        ),
+    ),
+
+    'CvsB': cms.PSet(
+        cTagGenericAnalysisBlock,
+
+        folder = cms.string('DeepCSV_CvsB'),
+        CTagPlots = cms.bool(True),
+        discrCut = cms.double(deepCSVWP['CvsB']),
+        numerator = cms.vstring('pfDeepCSVJetTags:probc'),
+        denominator = cms.vstring(
+            'pfDeepCSVJetTags:probc',
+            'pfDeepCSVJetTags:probb',
+            'pfDeepCSVJetTags:probbb',
+        ),
+    ),
+}