Merge pull request cms-sw#34048 from smuzaffar/12_0-code-checks-L1

[L1] Apply code-checks/format with misc-definitions-in-headers

Author: cmsbuild

L1Trigger/GlobalMuonTrigger/src/L1MuGMTLUT.h

@@ -179,7 +179,7 @@ class L1MuGMTLUT {
       // decode std::string of style "phi(2) eta(4)"
       L1MuGMTLUTHelpers::Tokenizer tok(" ", input);
       for (unsigned int i = 0; i < tok.size(); i++) {
-        size_type obrace = tok[i].find("("), cbrace = tok[i].find(")");
+        size_type obrace = tok[i].find('('), cbrace = tok[i].find(')');
         if (obrace != std::string::npos && cbrace != std::string::npos)
           push_back(
               port(tok[i].substr(0, obrace), (unsigned)atoi(tok[i].substr(obrace + 1, cbrace - obrace - 1).c_str())));

L1Trigger/GlobalMuonTrigger/src/L1MuGMTMIAUPhiPro1LUT.cc

@@ -115,17 +115,25 @@ unsigned L1MuGMTMIAUPhiPro1LUT::TheLookupFunction(
   if (charge == 0 && calophi < 0.) {  // plus charge
     edm::LogWarning("LUTMismatch")
         << "warning: calo offset goes into wrong direction. charge is plus and calophi < 0deg" << endl
-        << "SYS=" << (isys == 0 ? "DT" : isys == 1 ? "CSC" : isys == 2 ? "BRPC" : "FRPC") << " ISO = " << isISO
-        << " etabin = " << eta << " pval = "
+        << "SYS="
+        << (isys == 0   ? "DT"
+            : isys == 1 ? "CSC"
+            : isys == 2 ? "BRPC"
+                        : "FRPC")
+        << " ISO = " << isISO << " etabin = " << eta << " pval = "
         << theTriggerPtScale->getPtScale()->getLowEdge(pt)
         // << " pval = " << theTriggerScales->getPtScale()->getLowEdge(pt)
         << " charge = " << (charge == 0 ? "pos" : "neg") << " phi_fine = " << phi_fine
         << " calophi(deg) = " << calophi * 180. / M_PI << endl;
   } else if (charge == 1 && calophi > 20. / 180. * M_PI) {  // neg charge
     edm::LogWarning("LUTMismatch")
         << "warning: calo offset goes into wrong direction. charge is minus and calophi > 20deg" << endl
-        << "SYS=" << (isys == 0 ? "DT" : isys == 1 ? "CSC" : isys == 2 ? "BRPC" : "FRPC") << " ISO = " << isISO
-        << " etabin = " << eta << " pval = "
+        << "SYS="
+        << (isys == 0   ? "DT"
+            : isys == 1 ? "CSC"
+            : isys == 2 ? "BRPC"
+                        : "FRPC")
+        << " ISO = " << isISO << " etabin = " << eta << " pval = "
         << theTriggerPtScale->getPtScale()->getLowEdge(pt)
         // << " pval = " << theTriggerScales->getPtScale()->getLowEdge(pt)
         << " charge = " << (charge == 0 ? "pos" : "neg") << " phi_fine = " << phi_fine

L1Trigger/GlobalTriggerAnalyzer/interface/L1GtUtils.h

@@ -508,7 +508,7 @@ L1GtUtils::L1GtUtils(edm::ParameterSet const& pset,
                      T& module,
                      UseEventSetupIn useEventSetupIn)
     : L1GtUtils(iC, useEventSetupIn) {
-  m_l1GtUtilsHelper.reset(new L1GtUtilsHelper(pset, iC, useL1GtTriggerMenuLite, module));
+  m_l1GtUtilsHelper = std::make_unique<L1GtUtilsHelper>(pset, iC, useL1GtTriggerMenuLite, module);
 }
 
 template <typename T>
@@ -539,13 +539,13 @@ L1GtUtils::L1GtUtils(edm::ParameterSet const& pset,
                      edm::InputTag const& l1GtTriggerMenuLiteInputTag,
                      UseEventSetupIn useEventSetupIn)
     : L1GtUtils(iC, useEventSetupIn) {
-  m_l1GtUtilsHelper.reset(new L1GtUtilsHelper(pset,
-                                              iC,
-                                              useL1GtTriggerMenuLite,
-                                              module,
-                                              l1GtRecordInputTag,
-                                              l1GtReadoutRecordInputTag,
-                                              l1GtTriggerMenuLiteInputTag));
+  m_l1GtUtilsHelper = std::make_unique<L1GtUtilsHelper>(pset,
+                                                        iC,
+                                                        useL1GtTriggerMenuLite,
+                                                        module,
+                                                        l1GtRecordInputTag,
+                                                        l1GtReadoutRecordInputTag,
+                                                        l1GtTriggerMenuLiteInputTag);
 }
 
 #endif /*GlobalTriggerAnalyzer_L1GtUtils_h*/

L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h

@@ -494,6 +494,7 @@ namespace l1t {
     std::vector<int> minimumBiasThresholds() const {
       if (pnode_[hiCentrality].version_ == 1 && pnode_[hiCentrality].iparams_.size() == 5) {
         std::vector<int> newVec;
+        newVec.reserve(4);
         for (int i = 0; i < 4; i++) {
           newVec.push_back(pnode_[hiCentrality].iparams_.at(i + 1));
         }

L1TriggerConfig/L1TConfigProducers/src/CaloParamsHelperO2O.h

@@ -516,6 +516,7 @@ namespace l1t {
     std::vector<int> minimumBiasThresholds() const {
       if (pnode_[hiCentrality].version_ == 1 && pnode_[hiCentrality].iparams_.size() == 5) {
         std::vector<int> newVec;
+        newVec.reserve(4);
         for (int i = 0; i < 4; i++) {
           newVec.push_back(pnode_[hiCentrality].iparams_.at(i + 1));
         }