minor changes from code review

cms-sw · Nov 15, 2021 · 696c60c · 696c60c
1 parent db43d9e
commit 696c60c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc
@@ -4,7 +4,7 @@
 
 MiniAODTaggerAnalyzer::MiniAODTaggerAnalyzer(const edm::ParameterSet& pSet)
     : jetToken_(consumes<std::vector<pat::Jet> >(pSet.getParameter<edm::InputTag>("JetTag"))),
-      disrParameters_(pSet.getParameter<edm::ParameterSet>("parameters")),
+      discrParameters_(pSet.getParameter<edm::ParameterSet>("parameters")),
 
       folder_(pSet.getParameter<std::string>("folder")),
       discrNumerator_(pSet.getParameter<vstring>("numerator")),
@@ -29,7 +29,7 @@ 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_,
+                                                   discrParameters_,
                                                    mclevel_,
                                                    false,
                                                    ibook,
@@ -47,18 +47,18 @@ void MiniAODTaggerAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSe
     // fill numerator
     float numerator = 0;
     for (const auto& discrLabel : discrNumerator_) {
-      numerator = numerator + jet->bDiscriminator(discrLabel);
+      numerator += jet->bDiscriminator(discrLabel);
     }
 
     // fill denominator
     float denominator;
     if (discrDenominator_.empty()) {
-      denominator = 1;
+      denominator = 1;  // no division performed
     } else {
       denominator = 0;
 
       for (const auto& discrLabel : discrDenominator_) {
-        denominator = denominator + jet->bDiscriminator(discrLabel);
+        denominator += jet->bDiscriminator(discrLabel);
       }
     }
 

diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h
@@ -27,7 +27,7 @@ class MiniAODTaggerAnalyzer : public DQMEDAnalyzer {
   std::unique_ptr<JetTagPlotter> jetTagPlotter_;
 
   const edm::EDGetTokenT<std::vector<pat::Jet> > jetToken_;
-  const edm::ParameterSet disrParameters_;
+  const edm::ParameterSet discrParameters_;
 
   const std::string folder_;
   const vstring discrNumerator_;

diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.cc b/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.cc
@@ -4,7 +4,7 @@
 
 MiniAODTaggerHarvester::MiniAODTaggerHarvester(const edm::ParameterSet& pSet)
     : folder_(pSet.getParameter<std::string>("folder")),
-      disrParameters_(pSet.getParameter<edm::ParameterSet>("parameters")),
+      discrParameters_(pSet.getParameter<edm::ParameterSet>("parameters")),
 
       mclevel_(pSet.getParameter<int>("MClevel")),
       doCTagPlots_(pSet.getParameter<bool>("CTagPlots")),
@@ -25,7 +25,7 @@ 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_,
+                                                   discrParameters_,
                                                    mclevel_,
                                                    true,
                                                    ibook,

diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.h b/DQMOffline/RecoB/plugins/MiniAODTaggerHarvester.h
@@ -22,7 +22,7 @@ class MiniAODTaggerHarvester : public DQMEDHarvester {
   std::unique_ptr<JetTagPlotter> jetTagPlotter_;
 
   const std::string folder_;
-  const edm::ParameterSet disrParameters_;
+  const edm::ParameterSet discrParameters_;
 
   const int mclevel_;
   const bool doCTagPlots_;

diff --git a/DQMOffline/RecoB/python/bTagMiniDQMDeepFlavour.py b/DQMOffline/RecoB/python/bTagMiniDQMDeepFlavour.py
@@ -16,7 +16,7 @@
     'BvsAll': cms.PSet(
         bTagGenericAnalysisBlock,
 
-        folder = cms.string('deepFlavour_BvsAll'),
+        folder = cms.string('DeepFlavour_BvsAll'),
         CTagPlots = cms.bool(False),
         discrCut = cms.double(deepFlavourWP['BvsAll']),
         numerator = cms.vstring(
@@ -30,7 +30,7 @@
     'CvsL': cms.PSet(
         cTagGenericAnalysisBlock,
 
-        folder = cms.string('deepFlavour_CvsL'),
+        folder = cms.string('DeepFlavour_CvsL'),
         CTagPlots = cms.bool(True),
         discrCut = cms.double(deepFlavourWP['CvsL']),
         numerator = cms.vstring('pfDeepFlavourJetTags:probc'),
@@ -44,7 +44,7 @@
     'CvsB': cms.PSet(
         cTagGenericAnalysisBlock,
 
-        folder = cms.string('deepFlavour_CvsB'),
+        folder = cms.string('DeepFlavour_CvsB'),
         CTagPlots = cms.bool(True),
         discrCut = cms.double(deepFlavourWP['CvsB']),
         numerator = cms.vstring('pfDeepFlavourJetTags:probc'),