code-format

civanch · civanch · commit 4a85dd520a50 · 2025-07-06T14:06:09.000+02:00
diff --git a/SimG4Core/CustomPhysics/interface/CMSAPrime.h b/SimG4Core/CustomPhysics/interface/CMSAPrime.h
@@ -15,22 +15,22 @@ class CMSAPrime : public G4ParticleDefinition {
   static CMSAPrime* theAPrime;
 
   CMSAPrime(const G4String& Name,
-	    G4double mass,
-	    G4double width,
-	    G4double charge,
-	    G4int iSpin,
-	    G4int iParity,
-	    G4int iConjugation,
-	    G4int iIsospin,
-	    G4int iIsospin3,
-	    G4int gParity,
-	    const G4String& pType,
-	    G4int lepton,
-	    G4int baryon,
-	    G4int encoding,
-	    G4bool stable,
-	    G4double lifetime,
-	    G4DecayTable* decaytable);
+            G4double mass,
+            G4double width,
+            G4double charge,
+            G4int iSpin,
+            G4int iParity,
+            G4int iConjugation,
+            G4int iIsospin,
+            G4int iIsospin3,
+            G4int gParity,
+            const G4String& pType,
+            G4int lepton,
+            G4int baryon,
+            G4int encoding,
+            G4bool stable,
+            G4double lifetime,
+            G4DecayTable* decaytable);
 
   ~CMSAPrime() override = default;
 
diff --git a/SimG4Core/CustomPhysics/interface/CMSAntiSQ.h b/SimG4Core/CustomPhysics/interface/CMSAntiSQ.h
@@ -13,7 +13,7 @@ class CMSAntiSQ : public G4ParticleDefinition {
 private:
   static CMSAntiSQ* theInstance;
   CMSAntiSQ() = default;
-  ~CMSAntiSQ() = default;
+  ~CMSAntiSQ() override = default;
 
 public:
   static CMSAntiSQ* Definition(double mass);
diff --git a/SimG4Core/CustomPhysics/interface/CMSSQ.h b/SimG4Core/CustomPhysics/interface/CMSSQ.h
@@ -13,8 +13,9 @@
 class CMSSQ : public G4ParticleDefinition {
 private:
   static CMSSQ* theInstance;
-  CMSSQ() {}
-  ~CMSSQ() {}
+  CMSSQ() = default;
+  ;
+  ~CMSSQ() override = default;
 
 public:
   static CMSSQ* Definition(double mass);
diff --git a/SimG4Core/CustomPhysics/interface/CMSSQInelasticCrossSection.h b/SimG4Core/CustomPhysics/interface/CMSSQInelasticCrossSection.h
@@ -13,11 +13,11 @@ class CMSSQInelasticCrossSection : public G4VCrossSectionDataSet {
 public:
   CMSSQInelasticCrossSection(double mass);
 
-  ~CMSSQInelasticCrossSection();
+  ~CMSSQInelasticCrossSection() override = default;
 
-  virtual G4bool IsElementApplicable(const G4DynamicParticle* aPart, G4int Z, const G4Material*);
+  G4bool IsElementApplicable(const G4DynamicParticle* aPart, G4int Z, const G4Material*) override;
 
-  virtual G4double GetElementCrossSection(const G4DynamicParticle*, G4int Z, const G4Material*);
+  G4double GetElementCrossSection(const G4DynamicParticle*, G4int Z, const G4Material*) override;
 
   G4double GetSQCrossSection(G4double kineticEnergy, G4int Z);
 
diff --git a/SimG4Core/CustomPhysics/interface/CMSSQLoopProcess.h b/SimG4Core/CustomPhysics/interface/CMSSQLoopProcess.h
@@ -12,28 +12,25 @@ class G4ParticleDefinition;
 class CMSSQLoopProcess : public G4VContinuousProcess {
 public:
   CMSSQLoopProcess(const G4String& name = "SQLooper", G4ProcessType type = fUserDefined);
-  virtual ~CMSSQLoopProcess();
+  ~CMSSQLoopProcess() override;
 
-public:
-  virtual G4VParticleChange* AlongStepDoIt(const G4Track&, const G4Step&);
-  virtual G4double AlongStepGetPhysicalInteractionLength(const G4Track& track,
-                                                         G4double previousStepSize,
-                                                         G4double currentMinimumStep,
-                                                         G4double& proposedSafety,
-                                                         G4GPILSelection* selection);
-  virtual void StartTracking(G4Track* aTrack);
+  G4VParticleChange* AlongStepDoIt(const G4Track&, const G4Step&) override;
+  G4double AlongStepGetPhysicalInteractionLength(const G4Track& track,
+                                                 G4double previousStepSize,
+                                                 G4double currentMinimumStep,
+                                                 G4double& proposedSafety,
+                                                 G4GPILSelection* selection) override;
+  void StartTracking(G4Track* aTrack) override;
 
-protected:
-  virtual G4double GetContinuousStepLimit(const G4Track& track,
-                                          G4double previousStepSize,
-                                          G4double currentMinimumStep,
-                                          G4double& currentSafety);
-
-private:
-  CMSSQLoopProcess(CMSSQLoopProcess&);
-  CMSSQLoopProcess& operator=(const CMSSQLoopProcess& right);
+  CMSSQLoopProcess(CMSSQLoopProcess&) = delete;
+  CMSSQLoopProcess& operator=(const CMSSQLoopProcess& right) = delete;
 
 protected:
+  G4double GetContinuousStepLimit(const G4Track& track,
+                                  G4double previousStepSize,
+                                  G4double currentMinimumStep,
+                                  G4double& currentSafety) override;
+
   G4ParticleChange* fParticleChange;
 
 private:
diff --git a/SimG4Core/CustomPhysics/interface/CMSSQLoopProcessDiscr.h b/SimG4Core/CustomPhysics/interface/CMSSQLoopProcessDiscr.h
@@ -15,20 +15,19 @@ class G4ParticleDefinition;
 class CMSSQLoopProcessDiscr : public G4VDiscreteProcess {
 public:
   CMSSQLoopProcessDiscr(double mass, const G4String& name = "SQLooper", G4ProcessType type = fUserDefined);
-  virtual ~CMSSQLoopProcessDiscr();
+  ~CMSSQLoopProcessDiscr() override;
 
 public:
-  virtual G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&);
-  virtual G4double PostStepGetPhysicalInteractionLength(const G4Track& track,
-                                                        G4double previousStepSize,
-                                                        G4ForceCondition* condition);
-  virtual G4double GetMeanFreePath(const G4Track&, G4double, G4ForceCondition*);
+  G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&) override;
+  G4double PostStepGetPhysicalInteractionLength(const G4Track& track,
+                                                G4double previousStepSize,
+                                                G4ForceCondition* condition) override;
+  G4double GetMeanFreePath(const G4Track&, G4double, G4ForceCondition*) override;
   void SetTimeLimit(G4double);
-  virtual void StartTracking(G4Track* aTrack);
+  void StartTracking(G4Track* aTrack) override;
 
-private:
-  CMSSQLoopProcessDiscr(CMSSQLoopProcessDiscr&);
-  CMSSQLoopProcessDiscr& operator=(const CMSSQLoopProcessDiscr& right);
+  CMSSQLoopProcessDiscr(CMSSQLoopProcessDiscr&) = delete;
+  CMSSQLoopProcessDiscr& operator=(const CMSSQLoopProcessDiscr& right) = delete;
 
 protected:
   G4ParticleChange* fParticleChange;
diff --git a/SimG4Core/CustomPhysics/interface/CMSmuDarkBremsstrahlungModel.h b/SimG4Core/CustomPhysics/interface/CMSmuDarkBremsstrahlungModel.h
@@ -36,9 +36,9 @@ class G4ParticleChangeForLoss;
 class CMSmuDarkBremsstrahlungModel : public G4VEmModel {
 public:
   CMSmuDarkBremsstrahlungModel(const G4String& scalefile,
-                              const G4double biasFactor,
-                              const G4ParticleDefinition* p = nullptr,
-                              const G4String& nam = "eDBrem");
+                               const G4double biasFactor,
+                               const G4ParticleDefinition* p = nullptr,
+                               const G4String& nam = "eDBrem");
 
   ~CMSmuDarkBremsstrahlungModel() override;
 
diff --git a/SimG4Core/CustomPhysics/interface/CustomPhysicsList.h b/SimG4Core/CustomPhysics/interface/CustomPhysicsList.h
@@ -12,7 +12,7 @@ class CustomParticleFactory;
 class CustomPhysicsList : public G4VPhysicsConstructor {
 public:
   CustomPhysicsList(const std::string& name, const edm::ParameterSet& p, bool useuni = false);
-  ~CustomPhysicsList() override;
+  ~CustomPhysicsList() override = default;
 
   void ConstructParticle() override;
   void ConstructProcess() override;
diff --git a/SimG4Core/CustomPhysics/interface/CustomPhysicsListSS.h b/SimG4Core/CustomPhysics/interface/CustomPhysicsListSS.h
@@ -11,7 +11,7 @@ class CustomParticleFactory;
 class CustomPhysicsListSS : public G4VPhysicsConstructor {
 public:
   CustomPhysicsListSS(const std::string& name, const edm::ParameterSet& p, bool useuni = false);
-  ~CustomPhysicsListSS() override;
+  ~CustomPhysicsListSS() override = default;
 
   void ConstructParticle() override;
   void ConstructProcess() override;
diff --git a/SimG4Core/CustomPhysics/interface/FullModelHadronicProcess.h b/SimG4Core/CustomPhysics/interface/FullModelHadronicProcess.h
@@ -10,11 +10,11 @@
 
 #include "SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h"
 
-class G4ProcessHelper;
+class CustomProcessHelper;
 
 class FullModelHadronicProcess : public G4VDiscreteProcess {
 public:
-  FullModelHadronicProcess(G4ProcessHelper *aHelper, const G4String &processName = "FullModelHadronicProcess");
+  FullModelHadronicProcess(CustomProcessHelper *aHelper, const G4String &processName = "FullModelHadronicProcess");
 
   ~FullModelHadronicProcess() override = default;
 
@@ -23,11 +23,9 @@ class FullModelHadronicProcess : public G4VDiscreteProcess {
   G4VParticleChange *PostStepDoIt(const G4Track &aTrack, const G4Step &aStep) override;
 
 protected:
-  
-  G4double GetMeanFreePath(const G4Track &aTrack, G4double, G4ForceCondition*) override;
+  G4double GetMeanFreePath(const G4Track &aTrack, G4double, G4ForceCondition *) override;
 
 private:
-
   void CalculateMomenta(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
                         G4int &vecLen,
                         const G4HadProjectile *originalIncident,
@@ -46,9 +44,9 @@ class FullModelHadronicProcess : public G4VDiscreteProcess {
 
   void Rotate(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec, G4int &vecLen);
 
-  G4ProcessHelper* theHelper;
-  const G4ParticleDefinition* theParticle{nullptr};
-  G4ParticleDefinition* newParticle{nullptr};
+  CustomProcessHelper *theHelper;
+  const G4ParticleDefinition *theParticle{nullptr};
+  G4ParticleDefinition *newParticle{nullptr};
 
   G4Nucleus targetNucleus;
   FullModelReactionDynamics theReactionDynamics;
diff --git a/SimG4Core/CustomPhysics/src/APrimePhysics.cc b/SimG4Core/CustomPhysics/src/APrimePhysics.cc
@@ -15,15 +15,12 @@ APrimePhysics::APrimePhysics(double APMass, const G4String& scalefile, const G4d
   biasFactor = cxBias;
 }
 
-APrimePhysics::~APrimePhysics() {}
-
 void APrimePhysics::ConstructParticle() {
   /**
         * Insert A-prime into the Geant4 particle table.
         * For now we flag it as stable.
         */
   aprimeDef_ = CMSAPrime::APrime(apmass);
-  //aprimeDef->SetProcessManager(new G4ProcessManager(aprimeDef));
 }
 
 void APrimePhysics::ConstructProcess() {
diff --git a/SimG4Core/CustomPhysics/src/CMSAPrime.cc b/SimG4Core/CustomPhysics/src/CMSAPrime.cc
@@ -4,22 +4,22 @@
 CMSAPrime* CMSAPrime::theAPrime = nullptr;
 
 CMSAPrime::CMSAPrime(const G4String& aName,
-                   G4double mass,
-                   G4double width,
-                   G4double charge,
-                   G4int iSpin,
-                   G4int iParity,
-                   G4int iConjugation,
-                   G4int iIsospin,
-                   G4int iIsospin3,
-                   G4int gParity,
-                   const G4String& pType,
-                   G4int lepton,
-                   G4int baryon,
-                   G4int encoding,
-                   G4bool stable,
-                   G4double lifetime,
-                   G4DecayTable* decaytable)
+                     G4double mass,
+                     G4double width,
+                     G4double charge,
+                     G4int iSpin,
+                     G4int iParity,
+                     G4int iConjugation,
+                     G4int iIsospin,
+                     G4int iIsospin3,
+                     G4int gParity,
+                     const G4String& pType,
+                     G4int lepton,
+                     G4int baryon,
+                     G4int encoding,
+                     G4bool stable,
+                     G4double lifetime,
+                     G4DecayTable* decaytable)
     : G4ParticleDefinition(aName,
                            mass,
                            width,
diff --git a/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc b/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc
@@ -15,8 +15,6 @@ using namespace std;
 CMSDarkPairProduction::CMSDarkPairProduction(const G4ParticleDefinition* p, G4double df, const G4String& nam)
     : G4PairProductionRelModel(p, nam), dark_factor(df) {}
 
-CMSDarkPairProduction::~CMSDarkPairProduction() {}
-
 G4double CMSDarkPairProduction::ComputeCrossSectionPerAtom(
     const G4ParticleDefinition* p, G4double e, G4double Z, G4double e1, G4double e2, G4double e3) {
   return dark_factor * G4PairProductionRelModel::ComputeCrossSectionPerAtom(p, e, Z, e1, e2, e3);
diff --git a/SimG4Core/CustomPhysics/src/CMSDarkPairProductionProcess.cc b/SimG4Core/CustomPhysics/src/CMSDarkPairProductionProcess.cc
@@ -24,8 +24,6 @@ CMSDarkPairProductionProcess::CMSDarkPairProductionProcess(G4double df, const G4
   SetLambdaBinning(220);
 }
 
-CMSDarkPairProductionProcess::~CMSDarkPairProductionProcess() {}
-
 G4bool CMSDarkPairProductionProcess::IsApplicable(const G4ParticleDefinition& p) {
   G4int pdg = std::abs(p.GetPDGEncoding());
   return (pdg == 1023 || pdg == 1072000);
diff --git a/SimG4Core/CustomPhysics/src/CMSSQInelasticCrossSection.cc b/SimG4Core/CustomPhysics/src/CMSSQInelasticCrossSection.cc
@@ -13,8 +13,6 @@ CMSSQInelasticCrossSection::CMSSQInelasticCrossSection(double mass) : G4VCrossSe
   theAntiSQ = CMSAntiSQ::AntiSQ(mass);
 }
 
-CMSSQInelasticCrossSection::~CMSSQInelasticCrossSection() {}
-
 G4bool CMSSQInelasticCrossSection::IsElementApplicable(const G4DynamicParticle* aPart, G4int Z, const G4Material*) {
   return true;
 }
diff --git a/SimG4Core/CustomPhysics/src/CMSmuDarkBremsstrahlung.cc b/SimG4Core/CustomPhysics/src/CMSmuDarkBremsstrahlung.cc
@@ -10,8 +10,8 @@
 using namespace std;
 
 CMSmuDarkBremsstrahlung::CMSmuDarkBremsstrahlung(const G4String& scalefile,
-                                               const G4double biasFactor,
-                                               const G4String& name)
+                                                 const G4double biasFactor,
+                                                 const G4String& name)
     : G4VEmProcess(name), isInitialised(false), mgfile(scalefile), cxBias(biasFactor) {
   G4int subtype = 40;
   SetProcessSubType(subtype);
diff --git a/SimG4Core/CustomPhysics/src/CMSmuDarkBremsstrahlungModel.cc b/SimG4Core/CustomPhysics/src/CMSmuDarkBremsstrahlungModel.cc
@@ -14,16 +14,15 @@
 #include "TFile.h"
 #include "TTree.h"
 //gsl
-/*
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_integration.h>
-*/
+
 using namespace std;
 
 CMSmuDarkBremsstrahlungModel::CMSmuDarkBremsstrahlungModel(const G4String& scalefile,
-                                                         const G4double biasFactor,
-                                                         const G4ParticleDefinition* p,
-                                                         const G4String& nam)
+                                                           const G4double biasFactor,
+                                                           const G4ParticleDefinition* p,
+                                                           const G4String& nam)
     : G4VEmModel(nam),
       mgfile(scalefile),
       cxBias(biasFactor),
@@ -37,7 +36,7 @@ CMSmuDarkBremsstrahlungModel::CMSmuDarkBremsstrahlungModel(const G4String& scale
     SetParticle(p);
   }  //Verify that the particle is a muon.
   theAPrime = CMSAPrime::APrime();
-  MA = CMSAPrime::APrime()->GetPDGMass() / CLHEP::GeV;                        //Get the A' mass.
+  MA = CMSAPrime::APrime()->GetPDGMass() / CLHEP::GeV;                       //Get the A' mass.
   muonMass = G4MuonMinus::MuonMinusDefinition()->GetPDGMass() / CLHEP::GeV;  //Get the muon mass
   highKinEnergy = HighEnergyLimit();
   lowKinEnergy = LowEnergyLimit();
@@ -287,8 +286,8 @@ G4double CMSmuDarkBremsstrahlungModel::ComputeCrossSectionPerAtom(
 }
 
 G4DataVector* CMSmuDarkBremsstrahlungModel::ComputePartialSumSigma(const G4Material* material,
-                                                                  G4double kineticEnergy,
-                                                                  G4double cut)
+                                                                   G4double kineticEnergy,
+                                                                   G4double cut)
 
 // Build the table of cross section per element.
 //The table is built for MATERIALS.
@@ -310,10 +309,10 @@ G4DataVector* CMSmuDarkBremsstrahlungModel::ComputePartialSumSigma(const G4Mater
 }
 
 void CMSmuDarkBremsstrahlungModel::SampleSecondaries(std::vector<G4DynamicParticle*>* vdp,
-                                                    const G4MaterialCutsCouple* couple,
-                                                    const G4DynamicParticle* dp,
-                                                    G4double tmin,
-                                                    G4double maxEnergy)
+                                                     const G4MaterialCutsCouple* couple,
+                                                     const G4DynamicParticle* dp,
+                                                     G4double tmin,
+                                                     G4double maxEnergy)
 //Simulates the emission of a dark photon + electron. Gets an energy fraction and Pt from madgraph files. Scales the energy so that the fraction of kinectic energy is constant, keeps the Pt constant. If the Pt is larger than the new energy, that event is skipped, and a new one is taken from the file.
 {
   //Deactivate the process after one dark brem. Needs to be reactivated in the end of event action. If this is in the stepping action instead, more than one brem can occur within each step.
diff --git a/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc b/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc
diff --git a/SimG4Core/CustomPhysics/src/CustomPhysicsListSS.cc b/SimG4Core/CustomPhysics/src/CustomPhysicsListSS.cc
diff --git a/SimG4Core/CustomPhysics/src/CustomProcessHelper.cc b/SimG4Core/CustomPhysics/src/CustomProcessHelper.cc
diff --git a/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc b/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc
