code quality fixes

cms-sw · May 4, 2020 · c923494 · c923494
1 parent e9d3a2e
commit c923494
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 142 deletions.
diff --git a/RecoTauTag/RecoTau/interface/AntiElectronDeadECAL.h b/RecoTauTag/RecoTau/interface/AntiElectronDeadECAL.h
@@ -27,17 +27,16 @@
 #include <vector>
 #include <string>
 
-class AntiElectronDeadECAL
-{
- public:
+class AntiElectronDeadECAL {
+public:
   explicit AntiElectronDeadECAL(const edm::ParameterSet&);
   ~AntiElectronDeadECAL();
 
   void beginEvent(const edm::EventSetup&);
 
   bool operator()(const reco::Candidate* tau) const;
 
- private:
+private:
   unsigned minStatus_;
   double dR_;
   int verbosity_;
@@ -47,15 +46,9 @@ class AntiElectronDeadECAL
 
   void updateBadTowers(const edm::EventSetup&);
 
-  struct towerInfo
-  {
+  struct towerInfo {
     towerInfo(uint32_t id, unsigned nBad, unsigned maxStatus, double eta, double phi)
-      : id_(id),
-	nBad_(nBad),
-	maxStatus_(maxStatus),
-	eta_(eta),
-	phi_(phi)
-    {}
+        : id_(id), nBad_(nBad), maxStatus_(maxStatus), eta_(eta), phi_(phi) {}
     uint32_t id_;
     unsigned nBad_;
     unsigned maxStatus_;
@@ -73,4 +66,4 @@ class AntiElectronDeadECAL
   bool isFirstEvent_;
 };
 
-#endif // RecoTauTag_RecoTau_AntiElectronDeadECAL_h
+#endif  // RecoTauTag_RecoTau_AntiElectronDeadECAL_h
diff --git a/RecoTauTag/RecoTau/interface/PositionAtECalEntrance.h b/RecoTauTag/RecoTau/interface/PositionAtECalEntrance.h
@@ -16,18 +16,17 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
 
-class PositionAtECalEntrance
-{
- public:
+class PositionAtECalEntrance {
+public:
   PositionAtECalEntrance();
   ~PositionAtECalEntrance();
 
   void beginEvent(const edm::EventSetup&);
 
   reco::Candidate::Point operator()(const reco::Candidate* particle, bool& success) const;
 
- private:
+private:
   double bField_z_;
 };
 
-#endif // RecoTauTag_RecoTau_PositionAtECalEntrance_h
+#endif  // RecoTauTag_RecoTau_PositionAtECalEntrance_h
diff --git a/RecoTauTag/RecoTau/plugins/PATTauDiscriminationAgainstElectronDeadECAL.cc b/RecoTauTag/RecoTau/plugins/PATTauDiscriminationAgainstElectronDeadECAL.cc
@@ -26,32 +26,26 @@
 #include "RecoTauTag/RecoTau/interface/TauDiscriminationProducerBase.h"
 #include "RecoTauTag/RecoTau/interface/AntiElectronDeadECAL.h"
 
-class PATTauDiscriminationAgainstElectronDeadECAL : public PATTauDiscriminationProducerBase
-{
- public:
+class PATTauDiscriminationAgainstElectronDeadECAL : public PATTauDiscriminationProducerBase {
+public:
   explicit PATTauDiscriminationAgainstElectronDeadECAL(const edm::ParameterSet& cfg)
       : PATTauDiscriminationProducerBase(cfg),
         moduleLabel_(cfg.getParameter<std::string>("@module_label")),
         verbosity_(cfg.getParameter<int>("verbosity")),
-        antiElectronDeadECAL_(cfg)
-  {}
-  ~PATTauDiscriminationAgainstElectronDeadECAL() override
-  {}
+        antiElectronDeadECAL_(cfg) {}
+  ~PATTauDiscriminationAgainstElectronDeadECAL() override {}
 
-  void beginEvent(const edm::Event& evt, const edm::EventSetup& es) override
-  {
-    antiElectronDeadECAL_.beginEvent(es);
-  }
+  void beginEvent(const edm::Event& evt, const edm::EventSetup& es) override { antiElectronDeadECAL_.beginEvent(es); }
 
-  double discriminate(const TauRef& tau) const override
-  {
+  double discriminate(const TauRef& tau) const override {
     if (verbosity_) {
       edm::LogPrint("PATTauAgainstEleDeadECAL") << "<PATTauDiscriminationAgainstElectronDeadECAL::discriminate>:";
       edm::LogPrint("PATTauAgainstEleDeadECAL") << " moduleLabel = " << moduleLabel_;
-      edm::LogPrint("PATTauAgainstEleDeadECAL") << " tau: Pt = " << tau->pt() << ", eta = " << tau->eta() << ", phi = " << tau->phi();
+      edm::LogPrint("PATTauAgainstEleDeadECAL")
+          << " tau: Pt = " << tau->pt() << ", eta = " << tau->eta() << ", phi = " << tau->phi();
     }
     double discriminator = 1.;
-    if ( antiElectronDeadECAL_(tau.get()) ) {
+    if (antiElectronDeadECAL_(tau.get())) {
       discriminator = 0.;
     }
     if (verbosity_) {
@@ -62,15 +56,14 @@ class PATTauDiscriminationAgainstElectronDeadECAL : public PATTauDiscriminationP
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
- private:
+private:
   std::string moduleLabel_;
   int verbosity_;
 
   AntiElectronDeadECAL antiElectronDeadECAL_;
 };
 
-void PATTauDiscriminationAgainstElectronDeadECAL::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
-{
+void PATTauDiscriminationAgainstElectronDeadECAL::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   // patTauDiscriminationAgainstElectronDeadECAL
   edm::ParameterSetDescription desc;
 
@@ -79,7 +72,7 @@ void PATTauDiscriminationAgainstElectronDeadECAL::fillDescriptions(edm::Configur
   desc.add<bool>("extrapolateToECalEntrance", true);
   desc.add<int>("verbosity", 0);
 
-  fillProducerDescriptions(desc); // inherited from the base-class
+  fillProducerDescriptions(desc);  // inherited from the base-class
 
   descriptions.add("patTauDiscriminationAgainstElectronDeadECAL", desc);
 }

diff --git a/RecoTauTag/RecoTau/plugins/PFRecoTauDiscriminationAgainstElectronDeadECAL.cc b/RecoTauTag/RecoTau/plugins/PFRecoTauDiscriminationAgainstElectronDeadECAL.cc
@@ -23,32 +23,26 @@
 #include "RecoTauTag/RecoTau/interface/TauDiscriminationProducerBase.h"
 #include "RecoTauTag/RecoTau/interface/AntiElectronDeadECAL.h"
 
-class PFRecoTauDiscriminationAgainstElectronDeadECAL : public PFTauDiscriminationProducerBase
-{
- public:
+class PFRecoTauDiscriminationAgainstElectronDeadECAL : public PFTauDiscriminationProducerBase {
+public:
   explicit PFRecoTauDiscriminationAgainstElectronDeadECAL(const edm::ParameterSet& cfg)
       : PFTauDiscriminationProducerBase(cfg),
         moduleLabel_(cfg.getParameter<std::string>("@module_label")),
         verbosity_(cfg.getParameter<int>("verbosity")),
-        antiElectronDeadECAL_(cfg)
-  {}
-  ~PFRecoTauDiscriminationAgainstElectronDeadECAL() override
-  {}
+        antiElectronDeadECAL_(cfg) {}
+  ~PFRecoTauDiscriminationAgainstElectronDeadECAL() override {}
 
-  void beginEvent(const edm::Event& evt, const edm::EventSetup& es) override
-  {
-    antiElectronDeadECAL_.beginEvent(es);
-  }
+  void beginEvent(const edm::Event& evt, const edm::EventSetup& es) override { antiElectronDeadECAL_.beginEvent(es); }
 
-  double discriminate(const reco::PFTauRef& tau) const override
-  {
+  double discriminate(const reco::PFTauRef& tau) const override {
     if (verbosity_) {
       edm::LogPrint("PFTauAgainstEleDeadECAL") << "<PFRecoTauDiscriminationAgainstElectronDeadECAL::discriminate>:";
       edm::LogPrint("PFTauAgainstEleDeadECAL") << " moduleLabel = " << moduleLabel_;
-      edm::LogPrint("PFTauAgainstEleDeadECAL") << " tau: Pt = " << tau->pt() << ", eta = " << tau->eta() << ", phi = " << tau->phi();
+      edm::LogPrint("PFTauAgainstEleDeadECAL")
+          << " tau: Pt = " << tau->pt() << ", eta = " << tau->eta() << ", phi = " << tau->phi();
     }
     double discriminator = 1.;
-    if ( antiElectronDeadECAL_(tau.get()) ) {
+    if (antiElectronDeadECAL_(tau.get())) {
       discriminator = 0.;
     }
     if (verbosity_) {
@@ -59,15 +53,14 @@ class PFRecoTauDiscriminationAgainstElectronDeadECAL : public PFTauDiscriminatio
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
- private:
+private:
   std::string moduleLabel_;
   int verbosity_;
 
   AntiElectronDeadECAL antiElectronDeadECAL_;
 };
 
-void PFRecoTauDiscriminationAgainstElectronDeadECAL::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
-{
+void PFRecoTauDiscriminationAgainstElectronDeadECAL::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   // pfRecoTauDiscriminationAgainstElectronDeadECAL
   edm::ParameterSetDescription desc;
 
@@ -76,7 +69,7 @@ void PFRecoTauDiscriminationAgainstElectronDeadECAL::fillDescriptions(edm::Confi
   desc.add<bool>("extrapolateToECalEntrance", true);
   desc.add<int>("verbosity", 0);
 
-  fillProducerDescriptions(desc); // inherited from the base-class
+  fillProducerDescriptions(desc);  // inherited from the base-class
 
   descriptions.add("pfRecoTauDiscriminationAgainstElectronDeadECAL", desc);
 }