Merge pull request #48488 from civanch/clean_up_custom_physics

[SIM] Clean up custom physics sub-library

Author: cmsbuild

SimG4Core/CustomPhysics/interface/APrimePhysics.h

@@ -15,7 +15,7 @@ class APrimePhysics : public G4VPhysicsConstructor {
   /**
        * Class destructor.
        */
-  ~APrimePhysics() override;
+  ~APrimePhysics() override = default;
 
   /**
        * Construct particles.

SimG4Core/CustomPhysics/interface/CMSAPrime.h

@@ -0,0 +1,41 @@
+/**
+ * @file CMSAPrime.h
+ * @brief Class creating the A' particle in Geant.
+ * @author Michael Revering, University of Minnesota
+ */
+
+#ifndef CMSAPrime_h
+#define CMSAPrime_h
+
+// Geant
+#include "G4ParticleDefinition.hh"
+
+class CMSAPrime : public G4ParticleDefinition {
+private:
+  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);
+
+  ~CMSAPrime() override = default;
+
+public:
+  static CMSAPrime* APrime(double apmass = 1000);
+};
+
+#endif

SimG4Core/CustomPhysics/interface/CMSAntiSIMP.h

@@ -8,8 +8,8 @@
 class CMSAntiSIMP : public G4ParticleDefinition {
 private:
   static CMSAntiSIMP* theInstance;
-  CMSAntiSIMP() {}
-  ~CMSAntiSIMP() override {}
+  CMSAntiSIMP() = default;
+  ~CMSAntiSIMP() override = default;
 
 public:
   static CMSAntiSIMP* Definition(double mass);

SimG4Core/CustomPhysics/interface/CMSAntiSQ.h

@@ -12,8 +12,8 @@
 class CMSAntiSQ : public G4ParticleDefinition {
 private:
   static CMSAntiSQ* theInstance;
-  CMSAntiSQ() {}
-  ~CMSAntiSQ() {}
+  CMSAntiSQ() = default;
+  ~CMSAntiSQ() override = default;
 
 public:
   static CMSAntiSQ* Definition(double mass);

SimG4Core/CustomPhysics/interface/CMSDarkPairProduction.h

@@ -22,7 +22,7 @@ class CMSDarkPairProduction : public G4PairProductionRelModel {
                         G4double df = 1.0,
                         const G4String& nam = "BetheHeitlerLPM");
 
-  ~CMSDarkPairProduction() override;
+  ~CMSDarkPairProduction() override = default;
 
   G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
                                       G4double kinEnergy,

SimG4Core/CustomPhysics/interface/CMSDarkPairProductionProcess.h

@@ -25,7 +25,7 @@ class CMSDarkPairProductionProcess : public G4VEmProcess
                                const G4String& processName = "conv",
                                G4ProcessType type = fElectromagnetic);
 
-  ~CMSDarkPairProductionProcess() override;
+  ~CMSDarkPairProductionProcess() override = default;
 
   // true for Gamma only.
   G4bool IsApplicable(const G4ParticleDefinition&) override;

SimG4Core/CustomPhysics/interface/CMSSIMPInelasticProcess.h

@@ -9,7 +9,7 @@ class CMSSIMPInelasticProcess : public G4HadronicProcess {
 public:
   CMSSIMPInelasticProcess(const G4String& processName = "SIMPInelastic");
 
-  ~CMSSIMPInelasticProcess() override;
+  ~CMSSIMPInelasticProcess() override = default;
 
   G4bool IsApplicable(const G4ParticleDefinition& aParticleType) override;
 

SimG4Core/CustomPhysics/interface/CMSSIMPInelasticXS.h

@@ -10,7 +10,7 @@ class CMSSIMPInelasticXS : public G4VCrossSectionDataSet {
 public:
   CMSSIMPInelasticXS();
 
-  ~CMSSIMPInelasticXS() override;
+  ~CMSSIMPInelasticXS() override = default;
 
   G4bool IsElementApplicable(const G4DynamicParticle*, G4int Z, const G4Material*) override;
 

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);

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);