From 580376283f37c3fd3c303636d2a44f57f47b5d95 Mon Sep 17 00:00:00 2001 From: Andrea Date: Fri, 18 Mar 2022 06:44:48 +0100 Subject: [PATCH 1/2] Cleaning code recently added in DQMOffline/RecoB --- DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.cc | 53 +++++++++++++++--- .../RecoB/plugins/MiniAODTaggerAnalyzer.cc | 54 +++++++++++++++---- DQMOffline/RecoB/python/bTagMiniDQM_cff.py | 2 +- 3 files changed, 93 insertions(+), 16 deletions(-) diff --git a/DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.cc b/DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.cc index ef06b3ef64615..886bd4da6c1dd 100644 --- a/DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.cc +++ b/DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.cc @@ -1,16 +1,57 @@ -#include "DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.h" + +#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DataFormats/PatCandidates/interface/Jet.h" +#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h" +#include "CommonTools/Statistics/interface/ChiSquaredProbability.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/Event.h" +/** \class MiniAODSVAnalyzer + * + * Secondary Vertex Analyzer to run on MiniAOD + * + */ + +class MiniAODSVAnalyzer : public DQMEDAnalyzer { +public: + explicit MiniAODSVAnalyzer(const edm::ParameterSet& pSet); + ~MiniAODSVAnalyzer() override = default; + + void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; + +private: + void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; + + const edm::EDGetTokenT> jetToken_; + const std::string svTagInfo_; + const double ptMin_; + const double etaMax_; + + MonitorElement* n_sv_; + + MonitorElement* sv_mass_; + MonitorElement* sv_pt_; + MonitorElement* sv_ntracks_; + MonitorElement* sv_chi2norm_; + MonitorElement* sv_chi2prob_; + + // relation to jet + MonitorElement* sv_ptrel_; + MonitorElement* sv_energyratio_; + MonitorElement* sv_deltaR_; + + MonitorElement* sv_dxy_; + MonitorElement* sv_dxysig_; + MonitorElement* sv_d3d_; + MonitorElement* sv_d3dsig_; +}; + MiniAODSVAnalyzer::MiniAODSVAnalyzer(const edm::ParameterSet& pSet) : jetToken_(consumes>(pSet.getParameter("JetTag"))), svTagInfo_(pSet.getParameter("svTagInfo")), ptMin_(pSet.getParameter("ptMin")), - etaMax_(pSet.getParameter("etaMax")) - -{} - -MiniAODSVAnalyzer::~MiniAODSVAnalyzer() {} + etaMax_(pSet.getParameter("etaMax")) {} void MiniAODSVAnalyzer::bookHistograms(DQMStore::IBooker& ibook, edm::Run const& run, edm::EventSetup const& es) { ibook.setCurrentFolder("Btag/SV"); diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc index 377cdd94519cd..98d4a288b25eb 100644 --- a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc +++ b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.cc @@ -1,30 +1,66 @@ -#include "DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h" +#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DataFormats/PatCandidates/interface/Jet.h" +#include "DQMOffline/RecoB/interface/JetTagPlotter.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/Event.h" +/** \class MiniAODTaggerAnalyzer + * + * Tagger analyzer to run on MiniAOD + * + */ + +class MiniAODTaggerAnalyzer : public DQMEDAnalyzer { +public: + explicit MiniAODTaggerAnalyzer(const edm::ParameterSet& pSet); + ~MiniAODTaggerAnalyzer() override = default; + + 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 vstring; + + // using JetTagPlotter object for all the hard work ;) + std::unique_ptr jetTagPlotter_; + + const edm::EDGetTokenT > jetToken_; + const edm::ParameterSet discrParameters_; + + const std::string folder_; + const vstring discrNumerator_; + const vstring discrDenominator_; + + const int mclevel_; + const bool doCTagPlots_; + const bool dodifferentialPlots_; + const double discrCut_; + + const bool etaActive_; + const double etaMin_; + const double etaMax_; + const bool ptActive_; + const double ptMin_; + const double ptMax_; +}; + MiniAODTaggerAnalyzer::MiniAODTaggerAnalyzer(const edm::ParameterSet& pSet) : jetToken_(consumes >(pSet.getParameter("JetTag"))), discrParameters_(pSet.getParameter("parameters")), - folder_(pSet.getParameter("folder")), discrNumerator_(pSet.getParameter("numerator")), discrDenominator_(pSet.getParameter("denominator")), - mclevel_(pSet.getParameter("MClevel")), doCTagPlots_(pSet.getParameter("CTagPlots")), dodifferentialPlots_(pSet.getParameter("differentialPlots")), discrCut_(pSet.getParameter("discrCut")), - etaActive_(pSet.getParameter("etaActive")), etaMin_(pSet.getParameter("etaMin")), etaMax_(pSet.getParameter("etaMax")), ptActive_(pSet.getParameter("ptActive")), ptMin_(pSet.getParameter("ptMin")), - ptMax_(pSet.getParameter("ptMax")) - -{} - -MiniAODTaggerAnalyzer::~MiniAODTaggerAnalyzer() {} + ptMax_(pSet.getParameter("ptMax")) {} void MiniAODTaggerAnalyzer::bookHistograms(DQMStore::IBooker& ibook, edm::Run const& run, edm::EventSetup const& es) { jetTagPlotter_ = std::make_unique(folder_, diff --git a/DQMOffline/RecoB/python/bTagMiniDQM_cff.py b/DQMOffline/RecoB/python/bTagMiniDQM_cff.py index 0dcb2acc32b02..871f058caf757 100644 --- a/DQMOffline/RecoB/python/bTagMiniDQM_cff.py +++ b/DQMOffline/RecoB/python/bTagMiniDQM_cff.py @@ -11,7 +11,7 @@ # add jets with pfSecondaryVertexTagInfos patJetsSVInfo = patJets.clone( - tagInfoSources = cms.VInputTag('pfSecondaryVertexTagInfos'), + tagInfoSources = ['pfSecondaryVertexTagInfos'], addTagInfos = True ) patJetsSVInfoTask = cms.Task(patJetsSVInfo) From 18ece24880edda61c15d1dcea61f129c1bc3dc34 Mon Sep 17 00:00:00 2001 From: Andrea Date: Fri, 18 Mar 2022 06:46:57 +0100 Subject: [PATCH 2/2] Cleaning code recently added in DQMOffline/RecoB --- DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.h | 50 ------------------- .../RecoB/plugins/MiniAODTaggerAnalyzer.h | 49 ------------------ 2 files changed, 99 deletions(-) delete mode 100644 DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.h delete mode 100644 DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h diff --git a/DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.h b/DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.h deleted file mode 100644 index 5fa26dd361a8e..0000000000000 --- a/DQMOffline/RecoB/plugins/MiniAODSVAnalyzer.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef MiniAODSVAnalyzer_H -#define MiniAODSVAnalyzer_H - -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" -#include "DataFormats/PatCandidates/interface/Jet.h" -#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h" -#include "CommonTools/Statistics/interface/ChiSquaredProbability.h" - -/** \class MiniAODSVAnalyzer - * - * Secondary Vertex Analyzer to run on MiniAOD - * - */ - -class MiniAODSVAnalyzer : public DQMEDAnalyzer { -public: - explicit MiniAODSVAnalyzer(const edm::ParameterSet& pSet); - ~MiniAODSVAnalyzer() override; - - void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - -private: - void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; - - const edm::EDGetTokenT > jetToken_; - const std::string svTagInfo_; - const double ptMin_; - const double etaMax_; - - MonitorElement* n_sv_; - - MonitorElement* sv_mass_; - MonitorElement* sv_pt_; - MonitorElement* sv_ntracks_; - MonitorElement* sv_chi2norm_; - MonitorElement* sv_chi2prob_; - - // relation to jet - MonitorElement* sv_ptrel_; - MonitorElement* sv_energyratio_; - MonitorElement* sv_deltaR_; - - MonitorElement* sv_dxy_; - MonitorElement* sv_dxysig_; - MonitorElement* sv_d3d_; - MonitorElement* sv_d3dsig_; -}; - -#endif diff --git a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h b/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h deleted file mode 100644 index a39be8262e530..0000000000000 --- a/DQMOffline/RecoB/plugins/MiniAODTaggerAnalyzer.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef MiniAODTaggerAnalyzer_H -#define MiniAODTaggerAnalyzer_H - -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.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 vstring; - - // using JetTagPlotter object for all the hard work ;) - std::unique_ptr jetTagPlotter_; - - const edm::EDGetTokenT > jetToken_; - const edm::ParameterSet discrParameters_; - - const std::string folder_; - const vstring discrNumerator_; - const vstring discrDenominator_; - - const int mclevel_; - const bool doCTagPlots_; - const bool dodifferentialPlots_; - const double discrCut_; - - const bool etaActive_; - const double etaMin_; - const double etaMax_; - const bool ptActive_; - const double ptMin_; - const double ptMax_; -}; - -#endif