Merge pull request #45899 from smuzaffar/generators-llvm18-clang-format

cmsbuild · web-flow · commit 7cd33bb1ae12 · 2024-09-08T10:10:43.000+02:00
[GENERATORS] Changes suggested by new llvm18 clang-format
diff --git a/GeneratorInterface/AlpgenInterface/src/AlpgenHeader.cc b/GeneratorInterface/AlpgenInterface/src/AlpgenHeader.cc
@@ -112,8 +112,7 @@ bool AlpgenHeader::parse(const std::vector<std::string>::const_iterator &begin,
 
 // create human-readable representation for all Alpgen parameter indices
 
-#define DEFINE_ALPGEN_PARAMETER(x) \
-  { AlpgenHeader::x, #x }
+#define DEFINE_ALPGEN_PARAMETER(x) {AlpgenHeader::x, #x}
 
 namespace {
   struct AlpgenParameterName {
diff --git a/GeneratorInterface/Core/plugins/ExternalGeneratorFilter.cc b/GeneratorInterface/Core/plugins/ExternalGeneratorFilter.cc
@@ -71,8 +71,9 @@ namespace externalgen {
     }
 
     template <typename SERIAL>
-    auto doTransition(SERIAL& iDeserializer, edm::Transition iTrans, unsigned long long iTransitionID)
-        -> decltype(iDeserializer.deserialize()) {
+    auto doTransition(SERIAL& iDeserializer,
+                      edm::Transition iTrans,
+                      unsigned long long iTransitionID) -> decltype(iDeserializer.deserialize()) {
       decltype(iDeserializer.deserialize()) value;
       if (not channel_.doTransition(
               [&value, &iDeserializer]() { value = iDeserializer.deserialize(); }, iTrans, iTransitionID)) {
diff --git a/GeneratorInterface/CosmicMuonGenerator/src/CMSCGEN.cc b/GeneratorInterface/CosmicMuonGenerator/src/CMSCGEN.cc
@@ -335,7 +335,7 @@ int CMSCGEN::generate() {
         break;
 
     }  //end of CMSCGEN energy-dependence
-  }    //end of while
+  }  //end of while
 
   pq = e;
 
diff --git a/GeneratorInterface/EvtGenInterface/interface/DataCardFileWriter.h b/GeneratorInterface/EvtGenInterface/interface/DataCardFileWriter.h
@@ -20,9 +20,9 @@ namespace gen {
   class DataCardFileWriter : public edm::stream::EDAnalyzer<> {
   public:
     DataCardFileWriter(const edm::ParameterSet&);
-    ~DataCardFileWriter() override{};
+    ~DataCardFileWriter() override {}
 
-    void analyze(const edm::Event&, const edm::EventSetup&) override{};
+    void analyze(const edm::Event&, const edm::EventSetup&) override {}
   };
 
 };  // namespace gen
diff --git a/GeneratorInterface/EvtGenInterface/interface/EvtGenInterfaceBase.h b/GeneratorInterface/EvtGenInterface/interface/EvtGenInterfaceBase.h
@@ -13,11 +13,11 @@ namespace CLHEP {
 namespace gen {
   class EvtGenInterfaceBase {
   public:
-    EvtGenInterfaceBase(){};
-    virtual ~EvtGenInterfaceBase(){};
+    EvtGenInterfaceBase() {}
+    virtual ~EvtGenInterfaceBase() {}
 
-    virtual void SetPhotosDecayRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine){};
-    virtual void init(){};
+    virtual void SetPhotosDecayRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine) {}
+    virtual void init() {}
     virtual const std::vector<int>& operatesOnParticles() { return m_PDGs; }
     virtual const std::vector<std::string>& specialSettings() { return fSpecialSettings; }
     virtual HepMC::GenEvent* decay(HepMC::GenEvent* evt) { return evt; }
diff --git a/GeneratorInterface/ExhumeInterface/interface/Particle.h b/GeneratorInterface/ExhumeInterface/interface/Particle.h
@@ -17,7 +17,7 @@ namespace Exhume {
         const CLHEP::HepLorentzVector& _p, const CLHEP::HepLorentzVector& _vtx, int _id, int _Colour, int _AntiColour)
         : p(_p), vtx(_vtx), id(_id), Colour(_Colour), AntiColour(_AntiColour) {}
 
-    ~Particle(){};
+    ~Particle() {}
     //should make these private??????
     CLHEP::HepLorentzVector p;
     CLHEP::HepLorentzVector vtx;
diff --git a/GeneratorInterface/ExhumeInterface/interface/Weight.h b/GeneratorInterface/ExhumeInterface/interface/Weight.h
@@ -14,7 +14,7 @@ namespace Exhume {
   class Weight {
   public:
     Weight() { NPoints = 1000; };
-    virtual ~Weight(){};
+    virtual ~Weight() {}
     inline std::map<double, double> GetFuncMap() { return (FuncMap); };
     inline double GetTotalIntegral() { return (TotalIntegral); };
 
diff --git a/GeneratorInterface/GenFilters/plugins/HerwigMaxPtPartonFilter.cc b/GeneratorInterface/GenFilters/plugins/HerwigMaxPtPartonFilter.cc
@@ -137,7 +137,7 @@ bool HerwigMaxPtPartonFilter::filter(edm::Event& iEvent, const edm::EventSetup&)
             isFSQuark = true;
           }
         }  //end if FS Quark criterion
-      }    //End "Garbage" Cut
+      }  //End "Garbage" Cut
 
       if (isFSQuark) {
         hFSPartons_JS_PtWgting.Fill(
@@ -155,7 +155,7 @@ bool HerwigMaxPtPartonFilter::filter(edm::Event& iEvent, const edm::EventSetup&)
       accepted = true;  //Accept the Event
 
     }  //End Filtering
-  }    //end processId if statement
+  }  //end processId if statement
 
   else {
     accepted = true;
diff --git a/GeneratorInterface/GenFilters/plugins/MCMultiParticleFilter.cc b/GeneratorInterface/GenFilters/plugins/MCMultiParticleFilter.cc
@@ -204,7 +204,7 @@ bool MCMultiParticleFilter::filter(edm::StreamID, edm::Event& iEvent, const edm:
 
     if (acceptMore_ && nFound == numRequired_)
       break;  // stop looking if we don't mind having more
-  }           // loop over particles
+  }  // loop over particles
 
   if (nFound == numRequired_) {
     return true;
diff --git a/GeneratorInterface/GenFilters/plugins/MCPdgIndexFilter.h b/GeneratorInterface/GenFilters/plugins/MCPdgIndexFilter.h
@@ -24,7 +24,7 @@ namespace edm {
 class MCPdgIndexFilter : public edm::global::EDFilter<> {
 public:
   explicit MCPdgIndexFilter(const edm::ParameterSet&);
-  ~MCPdgIndexFilter() override{};
+  ~MCPdgIndexFilter() override {}
 
   bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
 
diff --git a/GeneratorInterface/GenFilters/plugins/ZgammaMassFilter.cc b/GeneratorInterface/GenFilters/plugins/ZgammaMassFilter.cc
@@ -103,14 +103,14 @@ bool ZgammaMassFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Even
       if (LeptP.Pt() > minLeptonPt) {
         Lepton.push_back(LeptP);
       }  // if pt
-    }    // if lepton
+    }  // if lepton
 
     if (abs((*p)->pdg_id()) == 22 && (*p)->status() == 1) {
       TLorentzVector PhotP((*p)->momentum().px(), (*p)->momentum().py(), (*p)->momentum().pz(), (*p)->momentum().e());
       if (PhotP.Pt() > minPhotonPt) {
         Photon.push_back(PhotP);
       }  // if pt
-    }    // if photon
+    }  // if photon
 
   }  // loop over particles
 
diff --git a/GeneratorInterface/Hydjet2Interface/test/Hydjet2Analyzer.cc b/GeneratorInterface/Hydjet2Interface/test/Hydjet2Analyzer.cc
@@ -453,7 +453,7 @@ Hydjet2Analyzer::Hydjet2Analyzer(const edm::ParameterSet &iConfig) {
         }
       }
     }  //user histo
-  }    //do histo
+  }  //do histo
 }
 Hydjet2Analyzer::~Hydjet2Analyzer() {}
 
@@ -747,7 +747,7 @@ void Hydjet2Analyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &i
                 dhv2eta_ch->Fill(eta, v2);
                 dheta_ch->Fill(eta);
               }  //ch
-            }    //status 1
+            }  //status 1
 
             //user histos
             if (userHistos_ && ((uStatus_ == 3) || (((*it)->status() < 10) && (uStatus_ == 1)) ||
@@ -913,7 +913,7 @@ void Hydjet2Analyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &i
       dhet_K_sum->Fill(et_K_sum);
       dhet_K_barrel_sum->Fill(et_K_barrel_sum);
 
-    }       //not mixing
+    }  //not mixing
   } else {  // not HepMC
     edm::Handle<reco::GenParticleCollection> parts;
     iEvent.getByLabel(genParticleSrc_, parts);
diff --git a/GeneratorInterface/HydjetInterface/test/HydjetAnalyzer.cc b/GeneratorInterface/HydjetInterface/test/HydjetAnalyzer.cc
@@ -400,7 +400,7 @@ HydjetAnalyzer::HydjetAnalyzer(const edm::ParameterSet &iConfig) {
         }
       }
     }  //user histo
-  }    //do histo
+  }  //do histo
 }
 HydjetAnalyzer::~HydjetAnalyzer() {}
 
@@ -584,7 +584,7 @@ void HydjetAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iS
                 dhv2eta->Fill(eta, v2);
                 dheta_ch->Fill(eta);
               }  //ch
-            }    //status 1
+            }  //status 1
 
             //user histos
             if (userHistos_ && ((uStatus_ == 3) || (((*it)->status() < 10) && (uStatus_ == 1)) ||
diff --git a/GeneratorInterface/PhotosInterface/interface/PhotosInterfaceBase.h b/GeneratorInterface/PhotosInterface/interface/PhotosInterfaceBase.h
@@ -13,19 +13,19 @@
 namespace gen {
   class PhotosInterfaceBase {
   public:
-    PhotosInterfaceBase(){};
-    PhotosInterfaceBase(const edm::ParameterSet&){};
-    virtual ~PhotosInterfaceBase(){};
+    PhotosInterfaceBase() {}
+    PhotosInterfaceBase(const edm::ParameterSet&) {}
+    virtual ~PhotosInterfaceBase() {}
 
-    virtual void SetDecayRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine){};
+    virtual void SetDecayRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine) {}
     virtual void init() = 0;
     virtual const std::vector<std::string>& specialSettings() { return fSpecialSettings; }
     virtual HepMC::GenEvent* apply(HepMC::GenEvent* evt) { return evt; }
     virtual void avoidTauLeptonicDecays() = 0;
     ;
     virtual void configureOnlyFor(int) = 0;
     virtual void setRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine) = 0;
-    virtual void statistics(){};
+    virtual void statistics() {}
 
   protected:
     std::vector<std::string> fSpecialSettings;
diff --git a/GeneratorInterface/Pythia6Interface/interface/PtYDistributor.h b/GeneratorInterface/Pythia6Interface/interface/PtYDistributor.h
@@ -13,11 +13,11 @@ namespace CLHEP {
 namespace gen {
   class PtYDistributor {
   public:
-    PtYDistributor(){};
+    PtYDistributor() {}
     //PtYDistributor(std::string inputfile, CLHEP::HepRandomEngine& fRandomEngine, double ptmax, double ptmin, double ymax, double ymin, int ptbins, int ybins);
     PtYDistributor(
         const edm::FileInPath& fip, double ptmax, double ptmin, double ymax, double ymin, int ptbins, int ybins);
-    virtual ~PtYDistributor(){};
+    virtual ~PtYDistributor() {}
 
     double fireY(CLHEP::HepRandomEngine*);
     double firePt(CLHEP::HepRandomEngine*);
diff --git a/GeneratorInterface/Pythia8Interface/plugins/EmissionVetoHook1.cc b/GeneratorInterface/Pythia8Interface/plugins/EmissionVetoHook1.cc
@@ -230,9 +230,9 @@ double EmissionVetoHook1::pTcalc(const Pythia8::Event &e, int i, int j, int k, i
               }  // for (rNow)
 
             }  // for (kNow)
-          }    // if (!FSR)
-        }      // if (pTdefMode)
-      }        // for (j)
+          }  // if (!FSR)
+        }  // if (pTdefMode)
+      }  // for (j)
     }
   }  // for (xSR)
 
diff --git a/GeneratorInterface/Pythia8Interface/plugins/Py8toJetInput.cc b/GeneratorInterface/Pythia8Interface/plugins/Py8toJetInput.cc
@@ -108,8 +108,8 @@ const std::vector<fastjet::PseudoJet> Py8toJetInput::fillJetAlgoInput(const Even
         idx = event[idx].mother1();
 
       }  // if (iType)
-    }    // while (true)
-  }      // for (i)
+    }  // while (true)
+  }  // for (i)
 
   // For jetMatch = 2, insert ghost particles corresponding to
   // each hard parton in the original process
diff --git a/GeneratorInterface/RivetInterface/interface/DQMRivetClient.h b/GeneratorInterface/RivetInterface/interface/DQMRivetClient.h
@@ -18,9 +18,9 @@ class DQMRivetClient : public edm::one::EDAnalyzer<edm::one::SharedResources, ed
   };
 
   DQMRivetClient(const edm::ParameterSet& pset);
-  ~DQMRivetClient() override{};
+  ~DQMRivetClient() override {}
 
-  void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override{};
+  void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override {}
 
   void endJob() override;
 
diff --git a/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h b/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h
@@ -215,7 +215,7 @@ namespace Rivet {
     };
 
     // Do nothing here
-    void finalize() override{};
+    void finalize() override {}
 
     std::string status() const override { return "VALIDATED"; }
   };
diff --git a/GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverter.cc b/GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverter.cc
@@ -31,7 +31,7 @@ using namespace std;
 class GenParticles2HepMCConverter : public edm::stream::EDProducer<> {
 public:
   explicit GenParticles2HepMCConverter(const edm::ParameterSet& pset);
-  ~GenParticles2HepMCConverter() override{};
+  ~GenParticles2HepMCConverter() override {}
 
   void beginRun(edm::Run const& iRun, edm::EventSetup const&) override;
   void produce(edm::Event& event, const edm::EventSetup& eventSetup) override;
diff --git a/GeneratorInterface/RivetInterface/plugins/MergedGenParticleProducer.hh b/GeneratorInterface/RivetInterface/plugins/MergedGenParticleProducer.hh
@@ -11,7 +11,7 @@
 class MergedGenParticleProducer : public edm::stream::EDProducer<> {
 public:
   MergedGenParticleProducer(const edm::ParameterSet& pset);
-  ~MergedGenParticleProducer() override{};
+  ~MergedGenParticleProducer() override {}
 
 private:
   void produce(edm::Event& event, const edm::EventSetup&) override;
diff --git a/GeneratorInterface/TauolaInterface/interface/TauSpinnerCMS.h b/GeneratorInterface/TauolaInterface/interface/TauSpinnerCMS.h
@@ -48,7 +48,7 @@
 class TauSpinnerCMS : public edm::one::EDProducer<edm::one::SharedResources> {
 public:
   explicit TauSpinnerCMS(const edm::ParameterSet &);
-  ~TauSpinnerCMS() override{};  // no need to delete ROOT stuff
+  ~TauSpinnerCMS() override {}  // no need to delete ROOT stuff
 
   void produce(edm::Event &, const edm::EventSetup &) final;
   void beginJob() final;
diff --git a/GeneratorInterface/TauolaInterface/interface/TauSpinnerFilter.h b/GeneratorInterface/TauolaInterface/interface/TauSpinnerFilter.h
@@ -22,7 +22,7 @@
 class TauSpinnerFilter : public edm::stream::EDFilter<> {
 public:
   TauSpinnerFilter(const edm::ParameterSet&);
-  ~TauSpinnerFilter() override{};
+  ~TauSpinnerFilter() override {}
 
   bool filter(edm::Event& e, edm::EventSetup const& es) override;
   void setRandomEngine(CLHEP::HepRandomEngine* v) { fRandomEngine = v; }
diff --git a/GeneratorInterface/TauolaInterface/interface/TauolaInterfaceBase.h b/GeneratorInterface/TauolaInterface/interface/TauolaInterfaceBase.h
@@ -18,19 +18,19 @@
 namespace gen {
   class TauolaInterfaceBase {
   public:
-    TauolaInterfaceBase(){};
-    TauolaInterfaceBase(const edm::ParameterSet&){};
-    virtual ~TauolaInterfaceBase(){};
+    TauolaInterfaceBase() {}
+    TauolaInterfaceBase(const edm::ParameterSet&) {}
+    virtual ~TauolaInterfaceBase() {}
 
-    virtual void SetDecayRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine){};
-    virtual void enablePolarization(){};
-    virtual void disablePolarization(){};
-    virtual void init(const edm::EventSetup&){};
+    virtual void SetDecayRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine) {}
+    virtual void enablePolarization() {}
+    virtual void disablePolarization() {}
+    virtual void init(const edm::EventSetup&) {}
     virtual const std::vector<int>& operatesOnParticles() { return fPDGs; }
     virtual HepMC::GenEvent* decay(HepMC::GenEvent* evt) { return evt; }
-    virtual void statistics(){};
+    virtual void statistics() {}
     virtual void setRandomEngine(CLHEP::HepRandomEngine* v) = 0;
-    virtual void SetLHE(lhef::LHEEvent* l){};
+    virtual void SetLHE(lhef::LHEEvent* l) {}
 
   protected:
     std::vector<int> fPDGs;
diff --git a/GeneratorInterface/TauolaInterface/plugins/TauSpinner/TauSpinnerCMS.cc b/GeneratorInterface/TauolaInterface/plugins/TauSpinner/TauSpinnerCMS.cc
@@ -50,8 +50,8 @@ TauSpinnerCMS::TauSpinnerCMS(const ParameterSet &pset)
   }
 }
 
-void TauSpinnerCMS::beginJob(){};
-void TauSpinnerCMS::endJob(){};
+void TauSpinnerCMS::beginJob() {}
+void TauSpinnerCMS::endJob() {}
 
 void TauSpinnerCMS::initialize() {
   // Now for Tauola and TauSpinner
diff --git a/IOMC/ParticleGuns/src/MultiParticleInConeGunProducer.cc b/IOMC/ParticleGuns/src/MultiParticleInConeGunProducer.cc
@@ -165,7 +165,7 @@ void MultiParticleInConeGunProducer::produce(Event& e, const EventSetup& es) {
         Vtx->add_particle_out(PartIc);
         break;
       }  //try many times while not in acceptance
-    }    //loop over the particle Ids in the cone
+    }  //loop over the particle Ids in the cone
   }
 
   fEvt->add_vertex(Vtx);
diff --git a/SimDataFormats/GeneratorProducts/interface/GenLumiInfoHeader.h b/SimDataFormats/GeneratorProducts/interface/GenLumiInfoHeader.h
@@ -11,7 +11,7 @@
 
 class GenLumiInfoHeader {
 public:
-  GenLumiInfoHeader() : randomConfigIndex_(-1){};
+  GenLumiInfoHeader() : randomConfigIndex_(-1) {}
 
   int randomConfigIndex() const { return randomConfigIndex_; }
   void setRandomConfigIndex(int idx) { randomConfigIndex_ = idx; }
