Merge pull request #26745 from cms-sw/code-format-dqm-29f030

Running code-format for dqm
cms-sw · May 15, 2019 · b13393b · b13393b
2 parents bac68f7 + ad1ff36
commit b13393b
Show file tree

Hide file tree

Showing 207 changed files with 26,202 additions and 27,852 deletions.
diff --git a/DQM/EcalMonitorTasks/interface/ClusterTask.h b/DQM/EcalMonitorTasks/interface/ClusterTask.h
@@ -16,8 +16,7 @@
 
 #include <bitset>
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   class ClusterTask : public DQWorkerTask {
   public:
     ClusterTask();
@@ -38,14 +37,7 @@ namespace ecaldqm
 
     void setTokens(edm::ConsumesCollector&) override;
 
-    enum TriggerTypes {
-      kEcalTrigger,
-      kHcalTrigger,
-      kCSCTrigger,
-      kDTTrigger,
-      kRPCTrigger,
-      nTriggerTypes
-    };
+    enum TriggerTypes { kEcalTrigger, kHcalTrigger, kCSCTrigger, kDTTrigger, kRPCTrigger, nTriggerTypes };
 
   private:
     void setParams(edm::ParameterSet const&) override;
@@ -67,31 +59,33 @@ namespace ecaldqm
     edm::EDGetTokenT<L1MuGMTReadoutCollection> L1MuGMTReadoutCollectionToken_;
   };
 
-  inline bool ClusterTask::analyze(void const* _p, Collections _collection){
-    switch(_collection){
-    case kEBRecHit:
-    case kEERecHit:
-      if(_p) runOnRecHits(*static_cast<EcalRecHitCollection const*>(_p), _collection);
-      return true;
-      break;
-    case kEBBasicCluster:
-    case kEEBasicCluster:
-      if(_p) runOnBasicClusters(*static_cast<edm::View<reco::CaloCluster> const*>(_p), _collection);
-      return true;
-      break;
-    case kEBSuperCluster:
-    case kEESuperCluster:
-      if(_p) runOnSuperClusters(*static_cast<reco::SuperClusterCollection const*>(_p), _collection);
-      return true;
-      break;
-    default:
-      break;
+  inline bool ClusterTask::analyze(void const* _p, Collections _collection) {
+    switch (_collection) {
+      case kEBRecHit:
+      case kEERecHit:
+        if (_p)
+          runOnRecHits(*static_cast<EcalRecHitCollection const*>(_p), _collection);
+        return true;
+        break;
+      case kEBBasicCluster:
+      case kEEBasicCluster:
+        if (_p)
+          runOnBasicClusters(*static_cast<edm::View<reco::CaloCluster> const*>(_p), _collection);
+        return true;
+        break;
+      case kEBSuperCluster:
+      case kEESuperCluster:
+        if (_p)
+          runOnSuperClusters(*static_cast<reco::SuperClusterCollection const*>(_p), _collection);
+        return true;
+        break;
+      default:
+        break;
     }
 
     return false;
   }
 
-}
+}  // namespace ecaldqm
 
 #endif
-
diff --git a/DQM/EcalMonitorTasks/interface/Collections.h b/DQM/EcalMonitorTasks/interface/Collections.h
@@ -44,44 +44,42 @@ namespace ecaldqm {
     nCollections
   };
 
-  std::string const collectionName[nCollections] = {
-    "Source",
-    "EcalRawData",
-    "EBGainErrors",
-    "EEGainErrors",
-    "EBChIdErrors",
-    "EEChIdErrors",
-    "EBGainSwitchErrors",
-    "EEGainSwitchErrors",
-    "TowerIdErrors",
-    "BlockSizeErrors",
-    "MEMTowerIdErrors",
-    "MEMBlockSizeErrors",
-    "MEMChIdErrors",
-    "MEMGainErrors",
-    "EBSrFlag",
-    "EESrFlag",
-    "EBDigi",
-    "EEDigi",
-    "PnDiodeDigi",
-    "TrigPrimDigi",
-    "TrigPrimEmulDigi",
-    "EBUncalibRecHit",
-    "EEUncalibRecHit",
-    "EBLaserLedUncalibRecHit",
-    "EELaserLedUncalibRecHit",
-    "EBTestPulseUncalibRecHit",
-    "EETestPulseUncalibRecHit",
-    "EBRecHit",
-    "EERecHit",
-    "EBReducedRecHit",
-    "EEReducedRecHit",
-    "EBBasicCluster",
-    "EEBasicCluster",
-    "EBSuperCluster",
-    "EESuperCluster"
-  };
+  std::string const collectionName[nCollections] = {"Source",
+                                                    "EcalRawData",
+                                                    "EBGainErrors",
+                                                    "EEGainErrors",
+                                                    "EBChIdErrors",
+                                                    "EEChIdErrors",
+                                                    "EBGainSwitchErrors",
+                                                    "EEGainSwitchErrors",
+                                                    "TowerIdErrors",
+                                                    "BlockSizeErrors",
+                                                    "MEMTowerIdErrors",
+                                                    "MEMBlockSizeErrors",
+                                                    "MEMChIdErrors",
+                                                    "MEMGainErrors",
+                                                    "EBSrFlag",
+                                                    "EESrFlag",
+                                                    "EBDigi",
+                                                    "EEDigi",
+                                                    "PnDiodeDigi",
+                                                    "TrigPrimDigi",
+                                                    "TrigPrimEmulDigi",
+                                                    "EBUncalibRecHit",
+                                                    "EEUncalibRecHit",
+                                                    "EBLaserLedUncalibRecHit",
+                                                    "EELaserLedUncalibRecHit",
+                                                    "EBTestPulseUncalibRecHit",
+                                                    "EETestPulseUncalibRecHit",
+                                                    "EBRecHit",
+                                                    "EERecHit",
+                                                    "EBReducedRecHit",
+                                                    "EEReducedRecHit",
+                                                    "EBBasicCluster",
+                                                    "EEBasicCluster",
+                                                    "EBSuperCluster",
+                                                    "EESuperCluster"};
 
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalMonitorTasks/interface/DQWorkerTask.h b/DQM/EcalMonitorTasks/interface/DQWorkerTask.h
@@ -9,63 +9,60 @@
 
 #include <bitset>
 
-namespace edm
-{
+namespace edm {
   class TriggerResultsByName;
   class ConsumesCollector;
-}
+}  // namespace edm
 
-namespace ecaldqm
-{
+namespace ecaldqm {
 
   struct Dependency {
     Collections dependant;
     std::set<Collections> requisite;
 
     Dependency() : dependant(Collections(-1)), requisite() {}
-    Dependency(Collections _d, int _r1 = -1, int _r2 = -1, int _r3 = -1, int _r4 = -1) :
-      dependant(_d),
-      requisite()
-    {
-      if(_r1 >= 0) append(Collections(_r1));
-      if(_r2 >= 0) append(Collections(_r2));
-      if(_r3 >= 0) append(Collections(_r3));
-      if(_r4 >= 0) append(Collections(_r4));
+    Dependency(Collections _d, int _r1 = -1, int _r2 = -1, int _r3 = -1, int _r4 = -1) : dependant(_d), requisite() {
+      if (_r1 >= 0)
+        append(Collections(_r1));
+      if (_r2 >= 0)
+        append(Collections(_r2));
+      if (_r3 >= 0)
+        append(Collections(_r3));
+      if (_r4 >= 0)
+        append(Collections(_r4));
     }
-    void append(Collections _r)
-    {
-      if(_r != int(dependant)) requisite.insert(_r);
+    void append(Collections _r) {
+      if (_r != int(dependant))
+        requisite.insert(_r);
     }
-    void append(std::set<Collections> const& _s)
-    {
-      for(std::set<Collections>::const_iterator sItr(_s.begin()); sItr != _s.end(); ++sItr)
+    void append(std::set<Collections> const& _s) {
+      for (std::set<Collections>::const_iterator sItr(_s.begin()); sItr != _s.end(); ++sItr)
         append(*sItr);
     }
   };
 
   struct DependencySet {
-    DependencySet() :
-      set_()
-    {}
-    void push_back(Dependency const& _d)
-    {
+    DependencySet() : set_() {}
+    void push_back(Dependency const& _d) {
       std::vector<Dependency>::iterator dItr(set_.begin());
       std::vector<Dependency>::iterator dEnd(set_.end());
-      for(; dItr != dEnd; ++dItr)
-        if(dItr->dependant == _d.dependant) dItr->append(_d.requisite);
-      if(dItr == dEnd) set_.push_back(_d);
+      for (; dItr != dEnd; ++dItr)
+        if (dItr->dependant == _d.dependant)
+          dItr->append(_d.requisite);
+      if (dItr == dEnd)
+        set_.push_back(_d);
     }
-    std::vector<Collections> formSequence() const
-    {
+    std::vector<Collections> formSequence() const {
       std::vector<Collections> sequence;
-      for(unsigned iD(0); iD < set_.size(); iD++){
-        if(std::find(sequence.begin(), sequence.end(), set_[iD].dependant) != sequence.end()) continue;
+      for (unsigned iD(0); iD < set_.size(); iD++) {
+        if (std::find(sequence.begin(), sequence.end(), set_[iD].dependant) != sequence.end())
+          continue;
         formSequenceFragment_(set_[iD], sequence, sequence.end());
       }
       return sequence;
     }
 
-    private:
+  private:
     std::vector<Dependency> set_;
 
     void formSequenceFragment_(Dependency const&, std::vector<Collections>&, std::vector<Collections>::iterator) const;
@@ -102,5 +99,5 @@ namespace ecaldqm
 
     std::set<std::string> resettable_;
   };
-}
+}  // namespace ecaldqm
 #endif
diff --git a/DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h b/DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h
@@ -10,39 +10,41 @@
 #include <set>
 #include <map>
 
-namespace edm
-{
+namespace edm {
   class InputTag;
   class ParameterSetDescription;
-}
+}  // namespace edm
 
 class EcalDQMonitorTask : public one::DQMEDAnalyzer<one::DQMLuminosityBlockElements>, public ecaldqm::EcalDQMonitor {
- public:
+public:
   EcalDQMonitorTask(edm::ParameterSet const&);
-  ~EcalDQMonitorTask() {}
+  ~EcalDQMonitorTask() override {}
 
   static void fillDescriptions(edm::ConfigurationDescriptions&);
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
   void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
 
- private:
+private:
   void endRun(edm::Run const&, edm::EventSetup const&) override;
   void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
   void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
   void analyze(edm::Event const&, edm::EventSetup const&) override;
-
-  typedef void (EcalDQMonitorTask::*Processor)(edm::Event const&, ecaldqm::Collections, std::set<ecaldqm::DQWorker*> const&);
 
-  template <typename CollectionClass> void runOnCollection(edm::Event const&, ecaldqm::Collections, std::set<ecaldqm::DQWorker*> const&);
+  typedef void (EcalDQMonitorTask::*Processor)(edm::Event const&,
+                                               ecaldqm::Collections,
+                                               std::set<ecaldqm::DQWorker*> const&);
+
+  template <typename CollectionClass>
+  void runOnCollection(edm::Event const&, ecaldqm::Collections, std::set<ecaldqm::DQWorker*> const&);
 
   void formSchedule(std::vector<ecaldqm::Collections> const&, edm::ParameterSet const&);
 
   /* DATA MEMBERS */
 
-  edm::EDGetToken collectionTokens_[ecaldqm::nCollections]; // list of EDGetTokens
-  std::vector<std::pair<Processor, ecaldqm::Collections> > schedule_; // schedule of collections to run
-  bool allowMissingCollections_; // when true, skip missing collections silently
+  edm::EDGetToken collectionTokens_[ecaldqm::nCollections];            // list of EDGetTokens
+  std::vector<std::pair<Processor, ecaldqm::Collections> > schedule_;  // schedule of collections to run
+  bool allowMissingCollections_;                                       // when true, skip missing collections silently
   int processedEvents_;
 
   /* TASK TIME PROFILING */

diff --git a/DQM/EcalMonitorTasks/interface/EcalFEDMonitor.h b/DQM/EcalMonitorTasks/interface/EcalFEDMonitor.h
@@ -24,27 +24,19 @@
 #include <iostream>
 
 // Making the class templated temporarily, until HLT sequence can be fixed (is using EBHltTask and EEHltTask currently)
-template<int SUBDET>
-class EcalFEDMonitorTemp : public DQMEDAnalyzer{
- public:
+template <int SUBDET>
+class EcalFEDMonitorTemp : public DQMEDAnalyzer {
+public:
   EcalFEDMonitorTemp(edm::ParameterSet const&);
-  ~EcalFEDMonitorTemp() {}
+  ~EcalFEDMonitorTemp() override {}
 
- private:
+private:
   void analyze(edm::Event const&, edm::EventSetup const&) override;
   void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
 
-  enum MEs {
-    kEBOccupancy,
-    kEBFatal,
-    kEBNonFatal,
-    kEEOccupancy,
-    kEEFatal,
-    kEENonFatal,
-    nMEs
-  };
+  enum MEs { kEBOccupancy, kEBFatal, kEBNonFatal, kEEOccupancy, kEEFatal, kEENonFatal, nMEs };
 
   std::string folderName_;
 

diff --git a/DQM/EcalMonitorTasks/interface/EnergyTask.h b/DQM/EcalMonitorTasks/interface/EnergyTask.h
@@ -10,7 +10,7 @@ namespace ecaldqm {
   class EnergyTask : public DQWorkerTask {
   public:
     EnergyTask();
-    ~EnergyTask() {}
+    ~EnergyTask() override {}
 
     bool filterRunType(short const*) override;
 
@@ -27,21 +27,21 @@ namespace ecaldqm {
     //    float threshS9_;
   };
 
-  inline bool EnergyTask::analyze(void const* _p, Collections _collection){
-    switch(_collection){
-    case kEBRecHit:
-    case kEERecHit:
-      if(_p) runOnRecHits(*static_cast<EcalRecHitCollection const*>(_p));
-      return true;
-      break;
-    default:
-      break;
+  inline bool EnergyTask::analyze(void const* _p, Collections _collection) {
+    switch (_collection) {
+      case kEBRecHit:
+      case kEERecHit:
+        if (_p)
+          runOnRecHits(*static_cast<EcalRecHitCollection const*>(_p));
+        return true;
+        break;
+      default:
+        break;
     }
 
     return false;
   }
 
-}
+}  // namespace ecaldqm
 
 #endif
-