Merge pull request cms-sw#34055 from smuzaffar/12_0-code-checks-XPOG

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

Author: cmsbuild

PhysicsTools/NanoAOD/plugins/BTagSFProducer.cc

@@ -198,7 +198,7 @@ void BTagSFProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
         bdisc = 0.;
 
         if (op == BTagEntry::OP_RESHAPING) {
-          for (string inBranch :
+          for (const string& inBranch :
                inBranchNames[iDisc]) {  //sum up the discriminator values if multiple, e.g. DeepCSV b+bb
             bdisc += jet.bDiscriminator(inBranch);
           }

PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc

@@ -7,9 +7,11 @@
 #include "DataFormats/NanoAOD/interface/FlatTable.h"
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 
+#include <memory>
+
+#include <numeric>
 #include <regex>
 #include <sstream>
-#include <numeric>
 
 namespace {
   std::string replaceStringsToColumGets(const std::string &expr, const nanoaod::FlatTable &table) {
@@ -171,7 +173,7 @@ class NanoAODDQM : public DQMEDAnalyzer {
         std::fill(out.begin(), out.end(), true);
       } else {
         if (!cutptr) {
-          cutptr.reset(new Selector(replaceStringsToColumGets(cutstr, table)));
+          cutptr = std::make_unique<Selector>(replaceStringsToColumGets(cutstr, table));
         }
         for (unsigned int i = 0, n = table.size(); i < n; ++i) {
           out[i] = (*cutptr)(table.row(i));