Merge pull request cms-sw#34043 from smuzaffar/12_0-code-checks-GENERATORS

cmsbuild · web-flow · commit ee8ff605d316 · 2021-06-10T14:27:19.000+02:00
[GENERATORS] Apply code-checks/format with misc-definitions-in-headers
diff --git a/GeneratorInterface/Core/bin/externalGenerator.cc b/GeneratorInterface/Core/bin/externalGenerator.cc
@@ -83,9 +83,10 @@ int main(int argc, char* argv[]) {
   boost::program_options::options_description desc(descString);
 
   desc.add_options()(kHelpCommandOpt, "produce help message")(
-      kMemoryNameCommandOpt, boost::program_options::value<std::string>(), "memory name")(
-      kUniqueIDCommandOpt, boost::program_options::value<std::string>(), "unique id")(kVerboseCommandOpt,
-                                                                                      "verbose output");
+      kMemoryNameCommandOpt,
+      boost::program_options::value<std::string>(),
+      "memory name")(kUniqueIDCommandOpt, boost::program_options::value<std::string>(), "unique id")(kVerboseCommandOpt,
+                                                                                                     "verbose output");
 
   boost::program_options::positional_options_description p;
   p.add(kMemoryNameOpt, 1);
diff --git a/GeneratorInterface/Core/interface/ConcurrentHadronizerFilter.h b/GeneratorInterface/Core/interface/ConcurrentHadronizerFilter.h
@@ -266,7 +266,7 @@ namespace edm {
       std::unique_ptr<GenEventInfoProduct> genEventInfo(cache->hadronizer_.getGenEventInfo());
       if (!genEventInfo.get()) {
         // create GenEventInfoProduct from HepMC event in case hadronizer didn't provide one
-        genEventInfo.reset(new GenEventInfoProduct(event.get()));
+        genEventInfo = std::make_unique<GenEventInfoProduct>(event.get());
       }
 
       //if HepMCFilter was specified, test event
diff --git a/GeneratorInterface/Core/interface/HadronizerFilter.h b/GeneratorInterface/Core/interface/HadronizerFilter.h
@@ -245,7 +245,7 @@ namespace edm {
       std::unique_ptr<GenEventInfoProduct> genEventInfo(hadronizer_.getGenEventInfo());
       if (!genEventInfo.get()) {
         // create GenEventInfoProduct from HepMC event in case hadronizer didn't provide one
-        genEventInfo.reset(new GenEventInfoProduct(event.get()));
+        genEventInfo = std::make_unique<GenEventInfoProduct>(event.get());
       }
 
       //if HepMCFilter was specified, test event
diff --git a/GeneratorInterface/GenFilters/plugins/PythiaFilterIsolatedTrack.h b/GeneratorInterface/GenFilters/plugins/PythiaFilterIsolatedTrack.h
@@ -46,7 +46,7 @@ class PythiaFilterIsolatedTrack : public edm::stream::EDFilter<edm::GlobalCache<
   ~PythiaFilterIsolatedTrack() override;
 
   static std::unique_ptr<PythiaFilterIsoTracks::Counters> initializeGlobalCache(edm::ParameterSet const&) {
-    return std::unique_ptr<PythiaFilterIsoTracks::Counters>(new PythiaFilterIsoTracks::Counters());
+    return std::make_unique<PythiaFilterIsoTracks::Counters>();
   }
 
   bool filter(edm::Event&, edm::EventSetup const&) override;
diff --git a/GeneratorInterface/LHEInterface/src/LH5Reader.cc b/GeneratorInterface/LHEInterface/src/LH5Reader.cc
@@ -1,12 +1,14 @@
 #include <algorithm>
 #include <iomanip>
 #include <iostream>
-#include <sstream>
-#include <fstream>
+#include <memory>
+
+#include <cstdio>
 #include <cstring>
+#include <fstream>
+#include <sstream>
 #include <string>
 #include <vector>
-#include <cstdio>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -179,13 +181,13 @@ namespace lhef {
       if (!curDoc) {
         if (!fileURLs.empty()) {
           logFileAction("  Initiating request to open LHE file ", fileURLs[curIndex]);
-          curSource.reset(new FileSource(fileURLs[curIndex]));
+          curSource = std::make_unique<FileSource>(fileURLs[curIndex]);
           logFileAction("  Successfully opened LHE file ", fileURLs[curIndex]);
           if (newFileOpened != nullptr)
             *newFileOpened = true;
           ++curIndex;
         } else if (!strName.empty()) {
-          curSource.reset(new StringSource(strName));
+          curSource = std::make_unique<StringSource>(strName);
         }
         // New "doc" has been opened.    This is the same as a new source.
         curDoc = true;
diff --git a/GeneratorInterface/LHEInterface/src/lheh5.cc b/GeneratorInterface/LHEInterface/src/lheh5.cc
@@ -17,19 +17,19 @@ namespace lheh5 {
   }
 
   Particle Events::mkParticle(size_t idx) const {
-    return {std::move(_vid[idx]),
-            std::move(_vstatus[idx]),
-            std::move(_vmother1[idx]),
-            std::move(_vmother2[idx]),
-            std::move(_vcolor1[idx]),
-            std::move(_vcolor2[idx]),
-            std::move(_vpx[idx]),
-            std::move(_vpy[idx]),
-            std::move(_vpz[idx]),
-            std::move(_ve[idx]),
-            std::move(_vm[idx]),
-            std::move(_vlifetime[idx]),
-            std::move(_vspin[idx])};
+    return {_vid[idx],
+            _vstatus[idx],
+            _vmother1[idx],
+            _vmother2[idx],
+            _vcolor1[idx],
+            _vcolor2[idx],
+            _vpx[idx],
+            _vpy[idx],
+            _vpz[idx],
+            _ve[idx],
+            _vm[idx],
+            _vlifetime[idx],
+            _vspin[idx]};
   }
 
   std::vector<Particle> Events::mkEvent(size_t ievent) const {
@@ -50,17 +50,17 @@ namespace lheh5 {
 
   EventHeader Events::mkEventHeader(int iev) const {
     return {
-        std::move(_vnparticles[iev]),
-        std::move(_vpid[iev]),
-        std::move(_vweight[iev]),
-        std::move(_vtrials[iev]),
-        std::move(_vscale[iev]),
-        std::move(_vrscale[iev]),
-        std::move(_vfscale[iev]),
-        std::move(_vaqed[iev]),
-        std::move(_vaqcd[iev]),
-        std::move(_vnpLO[iev]),
-        std::move(_vnpNLO[iev]),
+        _vnparticles[iev],
+        _vpid[iev],
+        _vweight[iev],
+        _vtrials[iev],
+        _vscale[iev],
+        _vrscale[iev],
+        _vfscale[iev],
+        _vaqed[iev],
+        _vaqcd[iev],
+        _vnpLO[iev],
+        _vnpNLO[iev],
     };
   }
 
@@ -195,19 +195,19 @@ namespace lheh5 {
   }
 
   Particle Events2::mkParticle(size_t idx) const {
-    return {std::move(_vid[idx]),
-            std::move(_vstatus[idx]),
-            std::move(_vmother1[idx]),
-            std::move(_vmother2[idx]),
-            std::move(_vcolor1[idx]),
-            std::move(_vcolor2[idx]),
-            std::move(_vpx[idx]),
-            std::move(_vpy[idx]),
-            std::move(_vpz[idx]),
-            std::move(_ve[idx]),
-            std::move(_vm[idx]),
-            std::move(_vlifetime[idx]),
-            std::move(_vspin[idx])};
+    return {_vid[idx],
+            _vstatus[idx],
+            _vmother1[idx],
+            _vmother2[idx],
+            _vcolor1[idx],
+            _vcolor2[idx],
+            _vpx[idx],
+            _vpy[idx],
+            _vpz[idx],
+            _ve[idx],
+            _vm[idx],
+            _vlifetime[idx],
+            _vspin[idx]};
   }
 
   std::vector<Particle> Events2::mkEvent(size_t ievent) const {
@@ -230,15 +230,15 @@ namespace lheh5 {
 
   EventHeader Events2::mkEventHeader(int iev) const {
     return {
-        std::move(_vnparticles[iev]),
-        std::move(_vpid[iev]),
-        std::move(_vweight[iev]),
-        std::move(_vtrials[iev]),
-        std::move(_vscale[iev]),
-        std::move(_vrscale[iev]),
-        std::move(_vfscale[iev]),
-        std::move(_vaqed[iev]),
-        std::move(_vaqcd[iev]),
+        _vnparticles[iev],
+        _vpid[iev],
+        _vweight[iev],
+        _vtrials[iev],
+        _vscale[iev],
+        _vrscale[iev],
+        _vfscale[iev],
+        _vaqed[iev],
+        _vaqcd[iev],
         npLO,
         npNLO,
     };
diff --git a/GeneratorInterface/Pythia8Interface/plugins/JetMatchingHook.cc b/GeneratorInterface/Pythia8Interface/plugins/JetMatchingHook.cc
@@ -27,11 +27,11 @@ JetMatchingHook::JetMatchingHook(const edm::ParameterSet& ps, const Info* info)
       fRunBlock(nullptr),
       fEventBlock(nullptr),
       fEventNumber(0),
-//      fInfoPtr(info),
+      //      fInfoPtr(info),
       fJetMatching(nullptr),
       fJetInputFill(nullptr),
       fIsInitialized(false) {
-//  assert(fInfoPtr);
+  //  assert(fInfoPtr);
 
   std::string scheme = ps.getParameter<std::string>("scheme");
 
diff --git a/GeneratorInterface/Pythia8Interface/plugins/Py8MassGun.cc b/GeneratorInterface/Pythia8Interface/plugins/Py8MassGun.cc
@@ -1,4 +1,6 @@
 
+#include <memory>
+
 #include "GeneratorInterface/Core/interface/GeneratorFilter.h"
 #include "GeneratorInterface/ExternalDecays/interface/ExternalDecayDriver.h"
 
@@ -106,7 +108,7 @@ namespace gen {
     if (!fMasterGen->next())
       return false;
 
-    event().reset(new HepMC::GenEvent);
+    event() = std::make_unique<HepMC::GenEvent>();
     return toHepMC.fill_next_event(fMasterGen->event, event().get());
   }
 
diff --git a/SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h b/SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h
@@ -27,7 +27,7 @@ class LHEEventProduct {
 
   ~LHEEventProduct() = default;
 
-  void setPDF(const PDF &pdf) { pdf_.reset(new PDF(pdf)); }
+  void setPDF(const PDF &pdf) { pdf_ = std::make_unique<PDF>(pdf); }
   void addWeight(const WGT &wgt) { weights_.push_back(wgt); }
   void addComment(const std::string &line) { comments_.push_back(line); }
 
diff --git a/SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h b/SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h
@@ -503,7 +503,7 @@ namespace HTXS {
   template <class Vvec4>
   inline TLVs MakeTLVs(Vvec4 const &rivet_jets) {
     TLVs jets;
-    for (auto jet : rivet_jets)
+    for (const auto &jet : rivet_jets)
       jets.push_back(MakeTLV(jet));
     return jets;
   }

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ namespace edm {`
`266`	`266`	`std::unique_ptr<GenEventInfoProduct> genEventInfo(cache->hadronizer_.getGenEventInfo());`
`267`	`267`	`if (!genEventInfo.get()) {`
`268`	`268`	`// create GenEventInfoProduct from HepMC event in case hadronizer didn't provide one`
`269`		`- genEventInfo.reset(new GenEventInfoProduct(event.get()));`
	`269`	`+ genEventInfo = std::make_unique<GenEventInfoProduct>(event.get());`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`//if HepMCFilter was specified, test event`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ namespace edm {`
`245`	`245`	`std::unique_ptr<GenEventInfoProduct> genEventInfo(hadronizer_.getGenEventInfo());`
`246`	`246`	`if (!genEventInfo.get()) {`
`247`	`247`	`// create GenEventInfoProduct from HepMC event in case hadronizer didn't provide one`
`248`		`- genEventInfo.reset(new GenEventInfoProduct(event.get()));`
	`248`	`+ genEventInfo = std::make_unique<GenEventInfoProduct>(event.get());`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`//if HepMCFilter was specified, test event`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class PythiaFilterIsolatedTrack : public edm::stream::EDFilter<edm::GlobalCache<`
`46`	`46`	`~PythiaFilterIsolatedTrack() override;`
`47`	`47`
`48`	`48`	`static std::unique_ptr<PythiaFilterIsoTracks::Counters> initializeGlobalCache(edm::ParameterSet const&) {`
`49`		`- return std::unique_ptr<PythiaFilterIsoTracks::Counters>(new PythiaFilterIsoTracks::Counters());`
	`49`	`+ return std::make_unique<PythiaFilterIsoTracks::Counters>();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`bool filter(edm::Event&, edm::EventSetup const&) override;`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ namespace HTXS {`
`503`	`503`	`template <class Vvec4>`
`504`	`504`	`inline TLVs MakeTLVs(Vvec4 const &rivet_jets) {`
`505`	`505`	`TLVs jets;`
`506`		`- for (auto jet : rivet_jets)`
	`506`	`+ for (const auto &jet : rivet_jets)`
`507`	`507`	`jets.push_back(MakeTLV(jet));`
`508`	`508`	`return jets;`
`509`	`509`	`}`