Merge pull request cms-sw#34035 from smuzaffar/12_0-code-checks-ANALYSIS

cmsbuild · web-flow · commit aed1e1daefd7 · 2021-06-10T09:18:33.000+02:00
[ANALYSIS] Apply code-checks/format with misc-definitions-in-headers
diff --git a/JetMETCorrections/MCJet/bin/Utilities.h b/JetMETCorrections/MCJet/bin/Utilities.h
@@ -146,7 +146,7 @@ std::vector<T> CommandLine::getVector(const std::string& name) {
     std::string::size_type pos;
     if (!tmp.empty()) {
       do {
-        pos = tmp.find(",");
+        pos = tmp.find(',');
         std::stringstream ss;
         ss << tmp.substr(0, pos);
         tmp.erase(0, pos + 1);
@@ -189,7 +189,7 @@ bool CommandLine::parse(int argc, char** argv) {
 
   for (int i = 1; i < argc; i++) {
     std::string opt = argv[i];
-    if (0 != opt.find("-")) {
+    if (0 != opt.find('-')) {
       if (i == 1) {
         bool success = parse_file(opt);
         if (!success)
@@ -210,7 +210,7 @@ bool CommandLine::parse(int argc, char** argv) {
     i++;
     if (i < argc - 1) {
       next = argv[i + 1];
-      while (next.find("-") != 0) {
+      while (next.find('-') != 0) {
         _options[opt].first += "," + next;
         i++;
         next = (i < argc - 1) ? argv[i + 1] : "-";
@@ -254,7 +254,7 @@ void CommandLine::print() {
       std::string::size_type length = tmp.length();
       std::string::size_type pos;
       do {
-        pos = tmp.find(",");
+        pos = tmp.find(',');
         if (tmp.length() == length) {
           std::cout << std::setiosflags(std::ios::left) << std::setw(22) << it->first
                     << std::resetiosflags(std::ios::left) << std::setw(3) << "=" << std::setiosflags(std::ios::right)
@@ -308,8 +308,8 @@ bool CommandLine::parse_file(const std::string& file_name) {
       last_token = "";
       value = "";
     } else if (!last_token.empty()) {
-      if (last_token.find("\"") == 0) {
-        if (last_token.rfind("\"") == last_token.length() - 1) {
+      if (last_token.find('\"') == 0) {
+        if (last_token.rfind('\"') == last_token.length() - 1) {
           last_token = last_token.substr(1, last_token.length() - 2);
           value += (!value.empty()) ? "," + last_token : last_token;
           last_token = token;
@@ -324,7 +324,7 @@ bool CommandLine::parse_file(const std::string& file_name) {
     ss >> token;
   }
   if (!last_token.empty()) {
-    if (last_token.find("\"") == 0 && last_token.rfind("\"") == last_token.length() - 1)
+    if (last_token.find('\"') == 0 && last_token.rfind('\"') == last_token.length() - 1)
       last_token = last_token.substr(1, last_token.length() - 2);
     value += (!value.empty()) ? "," + last_token : last_token;
   }
diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h b/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h
@@ -28,10 +28,12 @@
 #include "TCanvas.h"
 
 #include "TLorentzVector.h"
-#include <vector>
-#include <string>
-#include <iostream>
+#include <memory>
+
 #include "TMath.h"
+#include <iostream>
+#include <string>
+#include <vector>
 
 class Histograms {
 public:
@@ -2288,8 +2290,8 @@ class HMassResolutionVSPart : public Histograms {
     }
 
     // single particles histograms
-    muMinus.reset(new HDelta("muMinus"));
-    muPlus.reset(new HDelta("muPlus"));
+    muMinus = std::make_unique<HDelta>("muMinus");
+    muPlus = std::make_unique<HDelta>("muPlus");
   }
 
   ~HMassResolutionVSPart() override {
diff --git a/PhysicsTools/UtilAlgos/interface/CachingVariable.h b/PhysicsTools/UtilAlgos/interface/CachingVariable.h
@@ -333,7 +333,7 @@ class ExpressionVariable : public CachingVariable {
         //do something fancy for multiple variable from one PSet
         std::vector<std::string> vars = arg.iConfig.getParameter<std::vector<std::string> >("vars");
         for (unsigned int v = 0; v != vars.size(); ++v) {
-          unsigned int sep = vars[v].find(":");
+          unsigned int sep = vars[v].find(':');
           std::string name = vars[v].substr(0, sep);
           std::string expr = vars[v].substr(sep + 1);
 
diff --git a/PhysicsTools/UtilAlgos/interface/StringBasedNTupler.h b/PhysicsTools/UtilAlgos/interface/StringBasedNTupler.h
@@ -66,7 +66,7 @@ class TreeBranch {
   }
   const std::string& branchAlias() const { return branchAlias_; }
   const std::string& branchTitle() const { return branchTitle_; }
-  typedef std::unique_ptr<std::vector<float> > value;
+  typedef std::unique_ptr<std::vector<float>> value;
   value branch(const edm::Event& iEvent);
 
   std::vector<float>** dataHolderPtrAdress() { return &dataHolderPtr_; }
@@ -100,12 +100,12 @@ class StringLeaveHelper {
     //empty vector if product not found
     if (oH.failedToGet()) {
       edm::LogError("StringBranchHelper") << "cannot open: " << B.src();
-      value_.reset(new std::vector<float>(0));
+      value_ = std::make_unique<std::vector<float>>(0);
     } else {
       //parser for the object expression
       StringObjectFunction<Object> expr(B.expr());
       //allocate enough memory for the data holder
-      value_.reset(new std::vector<float>(1));
+      value_ = std::make_unique<std::vector<float>>(1);
       try {
         (*value_)[0] = (expr)(*oH);
       } catch (...) {
@@ -120,7 +120,7 @@ class StringLeaveHelper {
   value value_;
 };
 
-template <typename Object, typename Collection = std::vector<Object> >
+template <typename Object, typename Collection = std::vector<Object>>
 class StringBranchHelper {
 public:
   typedef TreeBranch::value value;
@@ -138,12 +138,12 @@ class StringBranchHelper {
       if (!(iEvent.isRealData() && B.className() == "reco::GenParticle")) {  //don't output genparticle error in data
         edm::LogError("StringBranchHelper") << "cannot open: " << B.src() << "  " << B.className();
       }
-      value_.reset(new std::vector<float>());
+      value_ = std::make_unique<std::vector<float>>();
     } else {
       //parser for the object expression
       StringObjectFunction<Object> expr(B.expr());
       //allocate enough memory for the data holder
-      value_.reset(new std::vector<float>());
+      value_ = std::make_unique<std::vector<float>>();
       value_->reserve(oH->size());
 
       StringCutObjectSelector<Object>* selection = nullptr;
@@ -233,17 +233,17 @@ class StringBasedNTupler : public NTupler {
 
       //do it once with configuration [vstring vars = { "x:x" ,... } ] where ":"=separator
       if (leavesPSet.exists("vars")) {
-        std::vector<std::string> leavesS = leavesPSet.getParameter<std::vector<std::string> >("vars");
+        std::vector<std::string> leavesS = leavesPSet.getParameter<std::vector<std::string>>("vars");
         for (uint l = 0; l != leavesS.size(); ++l) {
           uint sep = leavesS[l].find(separator);
           std::string name = leavesS[l].substr(0, sep);
           //removes spaces from the variable name
-          /*uint*/ int space = name.find(" ");
+          /*uint*/ int space = name.find(' ');
           while (space != -1 /*std::string::npos*/) {
             std::string first = name.substr(0, space);
             std::string second = name.substr(space + 1);
             name = first + second;
-            space = name.find(" ");
+            space = name.find(' ');
           }
           std::string expr = leavesS[l].substr(sep + 1);
           std::string branchAlias = branches[b] + "_" + name;
@@ -347,7 +347,7 @@ class StringBasedNTupler : public NTupler {
         for (; iL != iL_end; ++iL) {
           TreeBranch& b = *iL;
           //a vector of float for each leave
-          producesCollector.produces<std::vector<float> >(b.branchName()).setBranchAlias(b.branchAlias());
+          producesCollector.produces<std::vector<float>>(b.branchName()).setBranchAlias(b.branchAlias());
           nLeaves++;
         }
       }
@@ -371,7 +371,7 @@ class StringBasedNTupler : public NTupler {
         for (; iL != iL_end; ++iL) {
           TreeBranch& b = *iL;
           // grab the vector of values from the interpretation of expression for the associated collection
-          std::unique_ptr<std::vector<float> > branch(b.branch(iEvent));
+          std::unique_ptr<std::vector<float>> branch(b.branch(iEvent));
           // calculate the maximum index size.
           if (branch->size() > maxS)
             maxS = branch->size();
@@ -430,7 +430,7 @@ class StringBasedNTupler : public NTupler {
         uint maxS = 0;
         for (; iL != iL_end; ++iL) {
           TreeBranch& b = *iL;
-          std::unique_ptr<std::vector<float> > branch(b.branch(iEvent));
+          std::unique_ptr<std::vector<float>> branch(b.branch(iEvent));
           if (branch->size() > maxS)
             maxS = branch->size();
           iEvent.put(std::move(branch), b.branchName());
@@ -470,7 +470,7 @@ class StringBasedNTupler : public NTupler {
   }
 
 protected:
-  typedef std::map<std::string, std::vector<TreeBranch> > Branches;
+  typedef std::map<std::string, std::vector<TreeBranch>> Branches;
   Branches branches_;
 
   bool ownTheTree_;
diff --git a/PhysicsTools/Utilities/interface/NumericalIntegration.h b/PhysicsTools/Utilities/interface/NumericalIntegration.h
@@ -7,12 +7,12 @@
  * Gauss Legendre and Gauss algorithms based on ROOT implementation
  *
  */
+#include "Math/AllIntegrationTypes.h"
 #include "Math/Functor.h"
 #include "Math/Integrator.h"
-#include "Math/AllIntegrationTypes.h"
-#include <vector>
 #include <cmath>
 #include <memory>
+#include <vector>
 
 namespace funct {
 
@@ -142,15 +142,15 @@ namespace funct {
       relTol_ = o.relTol_;
       size_ = o.size_;
       rule_ = o.rule_;
-      integrator_.reset(new ROOT::Math::Integrator(type_, absTol_, relTol_, size_, rule_));
+      integrator_ = std::make_unique<ROOT::Math::Integrator>(type_, absTol_, relTol_, size_, rule_);
     }
     RootIntegrator& operator=(const RootIntegrator& o) {
       type_ = o.type_;
       absTol_ = o.absTol_;
       relTol_ = o.relTol_;
       size_ = o.size_;
       rule_ = o.rule_;
-      integrator_.reset(new ROOT::Math::Integrator(type_, absTol_, relTol_, size_, rule_));
+      integrator_ = std::make_unique<ROOT::Math::Integrator>(type_, absTol_, relTol_, size_, rule_);
       return *this;
     }
     template <typename F>
diff --git a/PhysicsTools/Utilities/interface/Primitive.h b/PhysicsTools/Utilities/interface/Primitive.h
@@ -155,8 +155,8 @@ namespace funct {
   //  /
 
   template <TYPXT2,
-            bool bint = not::std::is_same<PRIMIT(X, B), UndefinedIntegral>::value,
-            bool aint = not::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
+            bool bint = not ::std::is_same<PRIMIT(X, B), UndefinedIntegral>::value,
+            bool aint = not ::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
   struct PartIntegral {
     typedef UndefinedIntegral type;
     GET(PROD_S(A, B), type());
@@ -213,8 +213,8 @@ namespace funct {
   //  /
 
   template <TYPXT2,
-            bool bint = not::std::is_same<PRIMIT(X, RATIO(NUM(1), B)), UndefinedIntegral>::value,
-            bool aint = not::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
+            bool bint = not ::std::is_same<PRIMIT(X, RATIO(NUM(1), B)), UndefinedIntegral>::value,
+            bool aint = not ::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
   struct PartIntegral2 {
     typedef UndefinedIntegral type;
     GET(RATIO_S(A, B), type());
diff --git a/TopQuarkAnalysis/TopEventSelection/interface/TtFullHadSignalSel.h b/TopQuarkAnalysis/TopEventSelection/interface/TtFullHadSignalSel.h
@@ -56,16 +56,19 @@ class TtFullHadSignalSel {
   double pt(unsigned short i) const { return (pts_.size() >= i) ? pts_.at(i - 1) : -1.; }
 
   double EtSin2Theta(unsigned short i, bool boosted = false) const {
-    return boosted ? ((EtStars_.size() >= i) ? EtStars_.at(i - 1) : -1.)
-                   : (EtSin2Thetas_.size() >= i) ? EtSin2Thetas_.at(i - 1) : -1.;
+    return boosted                       ? ((EtStars_.size() >= i) ? EtStars_.at(i - 1) : -1.)
+           : (EtSin2Thetas_.size() >= i) ? EtSin2Thetas_.at(i - 1)
+                                         : -1.;
   }
   double theta(unsigned short i, bool boosted = false) const {
-    return boosted ? ((thetaStars_.size() >= i) ? thetaStars_.at(i - 1) : -1.)
-                   : (thetas_.size() >= i) ? thetas_.at(i - 1) : -1.;
+    return boosted                 ? ((thetaStars_.size() >= i) ? thetaStars_.at(i - 1) : -1.)
+           : (thetas_.size() >= i) ? thetas_.at(i - 1)
+                                   : -1.;
   }
   double sinTheta(unsigned short i, bool boosted = false) const {
-    return boosted ? ((thetaStars_.size() >= i) ? sin(thetaStars_.at(i - 1)) : -1.)
-                   : (thetas_.size() >= i) ? sin(thetas_.at(i - 1)) : -1.;
+    return boosted                 ? ((thetaStars_.size() >= i) ? sin(thetaStars_.at(i - 1)) : -1.)
+           : (thetas_.size() >= i) ? sin(thetas_.at(i - 1))
+                                   : -1.;
   }
 
   double EtSin2Theta3jet(bool boosted = false) const { return boosted ? EtStar3jet_ : EtSin2Theta3jet_; }
@@ -78,15 +81,18 @@ class TtFullHadSignalSel {
 
   double jet_etaetaMoment(unsigned short i, bool noB = false) const {
     return noB ? ((etaetaMomentsNoB_.size() >= i) ? etaetaMomentsNoB_.at(etaetaMomentsNoB_.size() - i) : -100.)
-               : (etaetaMoments_.size() >= i) ? etaetaMoments_.at(etaetaMoments_.size() - i) : -100.;
+           : (etaetaMoments_.size() >= i) ? etaetaMoments_.at(etaetaMoments_.size() - i)
+                                          : -100.;
   }
   double jet_etaphiMoment(unsigned short i, bool noB = false) const {
     return noB ? ((etaphiMomentsNoB_.size() >= i) ? etaphiMomentsNoB_.at(etaphiMomentsNoB_.size() - i) : -100.)
-               : (etaphiMoments_.size() >= i) ? etaphiMoments_.at(etaphiMoments_.size() - i) : -100.;
+           : (etaphiMoments_.size() >= i) ? etaphiMoments_.at(etaphiMoments_.size() - i)
+                                          : -100.;
   }
   double jet_phiphiMoment(unsigned short i, bool noB = false) const {
     return noB ? ((phiphiMomentsNoB_.size() >= i) ? phiphiMomentsNoB_.at(phiphiMomentsNoB_.size() - i) : -100.)
-               : (phiphiMoments_.size() >= i) ? phiphiMoments_.at(phiphiMoments_.size() - i) : -100.;
+           : (phiphiMoments_.size() >= i) ? phiphiMoments_.at(phiphiMoments_.size() - i)
+                                          : -100.;
   }
 
   double jet_etaetaMomentMoment(unsigned short i) const {
diff --git a/TopQuarkAnalysis/TopKinFitter/plugins/TtFullLepKinSolutionProducer.h b/TopQuarkAnalysis/TopKinFitter/plugins/TtFullLepKinSolutionProducer.h
@@ -408,6 +408,7 @@ void TtFullLepKinSolutionProducer::produce(edm::Event& evt, const edm::EventSetu
   if (weightsV.empty()) {
     //create dmummy vector
     std::vector<int> idcs;
+    idcs.reserve(6);
     for (int i = 0; i < 6; ++i)
       idcs.push_back(-1);
 
