Merge pull request #8 from silviodonato/fixDQMscouting

Code-format

Author: elfontan

HLTriggerOffline/Scouting/plugins/ElectronEfficiencyPlotter.cc

@@ -19,8 +19,7 @@ using namespace edm;
 using namespace std;
 
 // Constructor
-ElectronEfficiencyPlotter::ElectronEfficiencyPlotter(
-    const edm::ParameterSet &ps) {
+ElectronEfficiencyPlotter::ElectronEfficiencyPlotter(const edm::ParameterSet &ps) {
   ptBin_ = ps.getParameter<int>("ptBin");
   ptMin_ = ps.getParameter<double>("ptMin");
   ptMax_ = ps.getParameter<double>("ptMax");
@@ -30,22 +29,17 @@ ElectronEfficiencyPlotter::ElectronEfficiencyPlotter(
   sourceFolder_ = ps.getParameter<string>("srcFolder");
 }
 
-void ElectronEfficiencyPlotter::dqmEndJob(DQMStore::IBooker &ibooker,
-                                          DQMStore::IGetter &igetter) {
+void ElectronEfficiencyPlotter::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
   ibooker.setCurrentFolder(theFolder_);
 
   h_eff_pt_EB_doubleEG_HLT =
-      ibooker.book1D("Eff_pt_barrel_DSTdoubleEG",
-                     "DSTdoubleEG Eff. vs Pt (barrel)", ptBin_, ptMin_, ptMax_);
+      ibooker.book1D("Eff_pt_barrel_DSTdoubleEG", "DSTdoubleEG Eff. vs Pt (barrel)", ptBin_, ptMin_, ptMax_);
   h_eff_pt_EE_doubleEG_HLT =
-      ibooker.book1D("Eff_pt_endcap_DSTdoubleEG",
-                     "DSTdoubleEG Eff. vs Pt (endcap)", ptBin_, ptMin_, ptMax_);
-  h_eff_pt_EB_singlePhoton_HLT = ibooker.book1D(
-      "Eff_pt_barrel_DSTsinglePhoton", "DSTsinglePhoton Eff. vs Pt (barrel)",
-      ptBin_, ptMin_, ptMax_);
-  h_eff_pt_EE_singlePhoton_HLT = ibooker.book1D(
-      "Eff_pt_endcap_DSTsinglePhoton", "DSTsinglePhoton Eff. vs Pt (endcap)",
-      ptBin_, ptMin_, ptMax_);
+      ibooker.book1D("Eff_pt_endcap_DSTdoubleEG", "DSTdoubleEG Eff. vs Pt (endcap)", ptBin_, ptMin_, ptMax_);
+  h_eff_pt_EB_singlePhoton_HLT =
+      ibooker.book1D("Eff_pt_barrel_DSTsinglePhoton", "DSTsinglePhoton Eff. vs Pt (barrel)", ptBin_, ptMin_, ptMax_);
+  h_eff_pt_EE_singlePhoton_HLT =
+      ibooker.book1D("Eff_pt_endcap_DSTsinglePhoton", "DSTsinglePhoton Eff. vs Pt (endcap)", ptBin_, ptMin_, ptMax_);
 
   // Axis title
   h_eff_pt_EB_singlePhoton_HLT->setAxisTitle("p_{T} (GeV)", 1);
@@ -69,42 +63,38 @@ void ElectronEfficiencyPlotter::dqmEndJob(DQMStore::IBooker &ibooker,
       igetter.get(sourceFolder_ +
                   "/resonanceZ_Tag_pat_Probe_sctElectron_passSinglePhoton_DST_"
                   "fireTrigObj_Pt_Endcap");
-  MonitorElement *Denominator_pt_barrel = igetter.get(
-      sourceFolder_ + "/resonanceZ_Tag_pat_Probe_sctElectron_Pt_Barrel");
-  MonitorElement *Denominator_pt_endcap = igetter.get(
-      sourceFolder_ + "/resonanceZ_Tag_pat_Probe_sctElectron_Pt_Endcap");
+  MonitorElement *Denominator_pt_barrel =
+      igetter.get(sourceFolder_ + "/resonanceZ_Tag_pat_Probe_sctElectron_Pt_Barrel");
+  MonitorElement *Denominator_pt_endcap =
+      igetter.get(sourceFolder_ + "/resonanceZ_Tag_pat_Probe_sctElectron_Pt_Endcap");
 
   if (Numerator_pt_barrel_doubleEG_hlt && Denominator_pt_barrel)
-    calculateEfficiency(Numerator_pt_barrel_doubleEG_hlt, Denominator_pt_barrel,
-                        h_eff_pt_EB_doubleEG_HLT);
+    calculateEfficiency(Numerator_pt_barrel_doubleEG_hlt, Denominator_pt_barrel, h_eff_pt_EB_doubleEG_HLT);
   if (Numerator_pt_endcap_doubleEG_hlt && Denominator_pt_endcap)
-    calculateEfficiency(Numerator_pt_endcap_doubleEG_hlt, Denominator_pt_endcap,
-                        h_eff_pt_EE_doubleEG_HLT);
+    calculateEfficiency(Numerator_pt_endcap_doubleEG_hlt, Denominator_pt_endcap, h_eff_pt_EE_doubleEG_HLT);
   if (Numerator_pt_barrel_singlePhoton_hlt && Denominator_pt_barrel)
-    calculateEfficiency(Numerator_pt_barrel_singlePhoton_hlt,
-                        Denominator_pt_barrel, h_eff_pt_EB_singlePhoton_HLT);
+    calculateEfficiency(Numerator_pt_barrel_singlePhoton_hlt, Denominator_pt_barrel, h_eff_pt_EB_singlePhoton_HLT);
   if (Numerator_pt_endcap_singlePhoton_hlt && Denominator_pt_endcap)
-    calculateEfficiency(Numerator_pt_endcap_singlePhoton_hlt,
-                        Denominator_pt_endcap, h_eff_pt_EE_singlePhoton_HLT);
+    calculateEfficiency(Numerator_pt_endcap_singlePhoton_hlt, Denominator_pt_endcap, h_eff_pt_EE_singlePhoton_HLT);
 }
 
-void ElectronEfficiencyPlotter::calculateEfficiency(
-    MonitorElement *Numerator, MonitorElement *Denominator,
-    MonitorElement *Efficiency) {
+void ElectronEfficiencyPlotter::calculateEfficiency(MonitorElement *Numerator,
+                                                    MonitorElement *Denominator,
+                                                    MonitorElement *Efficiency) {
   TH1F *h_numerator_pt = Numerator->getTH1F();
   TH1F *h_denominator_pt = Denominator->getTH1F();
   TH1F *h_eff_pt = Efficiency->getTH1F();
-  if (h_eff_pt->GetSumw2N() == 0) h_eff_pt->Sumw2();
+  if (h_eff_pt->GetSumw2N() == 0)
+    h_eff_pt->Sumw2();
 
   // ReBin
   int nBins = h_eff_pt->GetNbinsX();
   double *binEdges = new double[nBins + 1];
-  for (int i = 0; i <= nBins; i++) binEdges[i] = h_eff_pt->GetBinLowEdge(i + 1);
+  for (int i = 0; i <= nBins; i++)
+    binEdges[i] = h_eff_pt->GetBinLowEdge(i + 1);
 
-  TH1F *h_numerator_pt_rebin =
-      (TH1F *)h_numerator_pt->Rebin(nBins, "num_pt_rebinned", binEdges);
-  TH1F *h_denominator_pt_rebin =
-      (TH1F *)h_denominator_pt->Rebin(nBins, "num_pt_rebinned", binEdges);
+  TH1F *h_numerator_pt_rebin = (TH1F *)h_numerator_pt->Rebin(nBins, "num_pt_rebinned", binEdges);
+  TH1F *h_denominator_pt_rebin = (TH1F *)h_denominator_pt->Rebin(nBins, "num_pt_rebinned", binEdges);
   h_eff_pt->Divide(h_numerator_pt_rebin, h_denominator_pt_rebin, 1., 1., "B");
 }
 

HLTriggerOffline/Scouting/plugins/ElectronEfficiencyPlotter.h

@@ -13,17 +13,17 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 class ElectronEfficiencyPlotter : public DQMEDHarvester {
- public:
+public:
   // Constructor
   ElectronEfficiencyPlotter(const edm::ParameterSet& ps);
   // Destructor
   ~ElectronEfficiencyPlotter() override = default;
 
- protected:
+protected:
   // DQM Client Diagnostic
   void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
 
- private:
+private:
   // counters
 
   int ptBin_;
@@ -39,9 +39,7 @@ class ElectronEfficiencyPlotter : public DQMEDHarvester {
 
   std::string theFolder_;
   std::string sourceFolder_;
-  void calculateEfficiency(MonitorElement* Numerator,
-                           MonitorElement* Denominator,
-                           MonitorElement* Efficiency);
+  void calculateEfficiency(MonitorElement* Numerator, MonitorElement* Denominator, MonitorElement* Efficiency);
 };
 
 #endif