Last set of minor refactors

Author: EinarElen

include/SimCore/DetectorConstruction.h

@@ -46,7 +46,7 @@ class DetectorConstruction : public G4VUserDetectorConstruction {
   /**
    * Class destructor.
    */
-  ~DetectorConstruction() = default;
+  virtual ~DetectorConstruction() = default;
 
   /**
    * Construct the detector.

include/SimCore/UserPrimaryParticleInformation.h

@@ -22,12 +22,12 @@ class UserPrimaryParticleInformation
   /**
    * Class Constructor.
    */
-  UserPrimaryParticleInformation() { ; }
+  UserPrimaryParticleInformation() = default;
 
   /**
    * Class destructor.
    */
-  virtual ~UserPrimaryParticleInformation() { ; }
+  virtual ~UserPrimaryParticleInformation() = default;
 
   /**
    * Set the HEP event status (generator status) e.g. from an LHE particle.

include/SimCore/UserRegionInformation.h

@@ -26,7 +26,7 @@ class UserRegionInformation : public G4VUserRegionInformation {
  public:
   UserRegionInformation(bool storeSecondaries);
 
-  virtual ~UserRegionInformation();
+  virtual ~UserRegionInformation() = default;
 
   void Print() const;
 

include/SimCore/UserTrackInformation.h

@@ -18,11 +18,12 @@ class UserTrackInformation : public G4VUserTrackInformation {
   /// Constructor
   UserTrackInformation() = default;
 
+  virtual ~UserTrackInformation() = default;
   /**
    * get
    *
    * A static helper function for getting the track information
-   * from the passed G4Track. If the track doesn't have an 
+   * from the passed G4Track. If the track doesn't have an
    * information attached, a new one is created.
    *
    * @note The return value of this pointer is never NULL.

src/SimCore/BiasOperators/DarkBrem.cxx

@@ -22,7 +22,7 @@ G4VBiasingOperation* DarkBrem::ProposeOccurenceBiasingOperation(
       callingProcess->GetWrappedProcess()->GetProcessName();
   if (currentProcess.compare(this->getProcessToBias()) == 0) {
     // bias only the primary particle if we don't want to bias all particles
-    if (not bias_all_ and track->GetParentID() != 0) return 0;
+    if (not bias_all_ and track->GetParentID() != 0) return nullptr;
 
     G4double interactionLength =
         callingProcess->GetWrappedProcess()->GetCurrentInteractionLength();
@@ -37,8 +37,8 @@ G4VBiasingOperation* DarkBrem::ProposeOccurenceBiasingOperation(
     }
 
     return BiasedXsec(dbXsecBiased);
-  } else
-    return nullptr;
+  }
+  return nullptr;
 }
 
 void DarkBrem::RecordConfig(ldmx::RunHeader& h) const {

src/SimCore/RunManager.cxx

@@ -168,8 +168,7 @@ void RunManager::TerminateOneEvent() {
   // reactivate any process that contains the G4DarkBremmstrahlung name
   // this covers both cases where the process is biased and not
   static auto reactivate_dark_brem = [](G4ProcessManager* pman) {
-    for (std::size_t i_proc{0}; i_proc < pman->GetProcessList()->size();
-         i_proc++) {
+    for (int i_proc{0}; i_proc < pman->GetProcessList()->size(); i_proc++) {
       G4VProcess* p{(*(pman->GetProcessList()))[i_proc]};
       if (p->GetProcessName().contains(G4DarkBremsstrahlung::PROCESS_NAME)) {
         pman->SetProcessActivation(p, true);

src/SimCore/UserRegionInformation.cxx

@@ -5,8 +5,6 @@ namespace simcore {
 UserRegionInformation::UserRegionInformation(bool aStoreSecondaries)
     : storeSecondaries_(aStoreSecondaries) {}
 
-UserRegionInformation::~UserRegionInformation() {}
-
 bool UserRegionInformation::getStoreSecondaries() const {
   return storeSecondaries_;
 }