renaming BTV DQM@MiniAOD sequences

cms-sw · Oct 13, 2021 · e57ad02 · e57ad02
1 parent f686f58
commit e57ad02
Show file tree

Hide file tree

Showing 13 changed files with 234 additions and 285 deletions.
diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -220,8 +220,8 @@
 
 from PhysicsTools.NanoAOD.nanoDQM_cff import *
 from Validation.RecoParticleFlow.DQMForPF_MiniAOD_cff import *
-from DQMOffline.RecoB.dqmMiniAnalyzer_cff import *
+from DQMOffline.RecoB.bTagMiniDQM_cff import *
 
-DQMHarvestMiniAOD = cms.Sequence( dataCertificationJetMETSequence * muonQualityTests_miniAOD * DQMHarvestPF * bTagHarvester_mini)
+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
@@ -243,11 +243,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.dqmMiniAnalyzer_cff import *
+from DQMOffline.RecoB.bTagMiniDQM_cff import *
 from DQMOffline.Muon.miniAOD_cff import *
 from DQM.Physics.DQMTopMiniAOD_cff import *
 
-DQMOfflineMiniAOD = cms.Sequence(jetMETDQMOfflineRedoProductsMiniAOD*bTagAnalyzer_mini*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/MiniAODTaggerAnalyzer.cc b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc
@@ -12,7 +12,7 @@ folder_(pSet.getParameter<std::string>("folder")),
 discrNumerator_(pSet.getParameter<vstring>("numerator")),
 discrDenominator_(pSet.getParameter<vstring>("denominator")),
 
-isMC_(pSet.getParameter<bool>("MCplots")),
+mclevel_(pSet.getParameter<int>("MClevel")),
 doCTagPlots_(pSet.getParameter<bool>("CTagPlots")),
 dodifferentialPlots_(pSet.getParameter<bool>("differentialPlots")),
 discrCut_(pSet.getParameter<double>("discrCut")),
@@ -36,16 +36,10 @@ void MiniAODTaggerAnalyzer::bookHistograms(DQMStore::IBooker& ibook,
                                            edm::Run const& run,
                                            edm::EventSetup const& es)
 {
-    int MClevel = 0;
-    if(isMC_)
-    {
-        MClevel = 4;
-    }
-
     jetTagPlotter_ = std::make_unique<JetTagPlotter>(folder_,
                                                      EtaPtBin(etaActive_, etaMin_, etaMax_, ptActive_, ptMin_, ptMax_),
                                                      disrParameters_,
-                                                     MClevel,
+                                                     mclevel_,
                                                      false,
                                                      ibook,
                                                      doCTagPlots_,

diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h
@@ -36,7 +36,7 @@ class MiniAODTaggerAnalyzer : public DQMEDAnalyzer {
     vstring discrDenominator_;
 
 
-    bool isMC_;
+    int mclevel_;
     bool doCTagPlots_;
     bool dodifferentialPlots_;
     double discrCut_;

diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.cc b/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.cc
@@ -8,7 +8,7 @@ MiniAODTaggerHarvester::MiniAODTaggerHarvester(const edm::ParameterSet& pSet)
 : folder_(pSet.getParameter<std::string>("folder")),
 disrParameters_(pSet.getParameter<edm::ParameterSet>("parameters")),
 
-isMC_(pSet.getParameter<bool>("MCplots")),
+mclevel_(pSet.getParameter<int>("MClevel")),
 doCTagPlots_(pSet.getParameter<bool>("CTagPlots")),
 dodifferentialPlots_(pSet.getParameter<bool>("differentialPlots")),
 discrCut_(pSet.getParameter<double>("discrCut")),
@@ -30,16 +30,10 @@ MiniAODTaggerHarvester::~MiniAODTaggerHarvester() { }
 
 void MiniAODTaggerHarvester::dqmEndJob(DQMStore::IBooker& ibook, DQMStore::IGetter& iget)
 {
-    int MClevel = 0;
-    if(isMC_)
-    {
-        MClevel = 4;
-    }
-
     jetTagPlotter_ = std::make_unique<JetTagPlotter>(folder_,
                                                      EtaPtBin(etaActive_, etaMin_, etaMax_, ptActive_, ptMin_, ptMax_),
                                                      disrParameters_,
-                                                     MClevel,
+                                                     mclevel_,
                                                      true,
                                                      ibook,
                                                      doCTagPlots_,

diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.h b/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.h
@@ -24,7 +24,7 @@ class MiniAODTaggerHarvester : public DQMEDHarvester {
     std::string folder_;
     edm::ParameterSet disrParameters_;
 
-    bool isMC_;
+    int mclevel_;
     bool doCTagPlots_;
     bool dodifferentialPlots_;
     double discrCut_;

diff --git a/DQMOffline/RecoB/python/DeepCSV.py b/DQMOffline/RecoB/python/DeepCSV.py
diff --git a/DQMOffline/RecoB/python/DeepFlavour.py b/DQMOffline/RecoB/python/DeepFlavour.py
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',
+        ),
+    ),
+}