Clean-up destructors

This commit is contained in:
wollra_j committed 2026-09-30 15:06:40 +02:00
1 parent 5c2088844f
commit 620d2b191a
46 files changed
+43 -113

No files matched your search

+7 -2
View File
@@ -34,11 +34,16 @@
#define F04FieldMessenger_h 1
#include "globals.hh"
#include "G4UImessenger.hh"
#include "G4UIcommand.hh"
#include "G4UIdirectory.hh"
#include "G4UIcmdWithAnInteger.hh"
#include "G4UIcmdWithADoubleAndUnit.hh"
#include "G4UIcmdWithoutParameter.hh"
class F04GlobalField;
class G4UIdirectory;
class G4UIcmdWithAString;
class G4UIcmdWithAnInteger;
class G4UIcmdWithADoubleAndUnit;
class G4UIcmdWithoutParameter;
@@ -46,7 +51,7 @@ class G4UIcmdWithoutParameter;
class F04FieldMessenger : public G4UImessenger {
public:
F04FieldMessenger(F04GlobalField *);
~F04FieldMessenger();
virtual ~F04FieldMessenger() = default;
void SetNewValue(G4UIcommand *, G4String);
void SetNewValue(G4UIcommand *, G4int);
+1 -1
View File
@@ -73,7 +73,7 @@ private:
F04GlobalField(const F04GlobalField&);
public:
~F04GlobalField();
virtual ~F04GlobalField() = default;
private:
F04GlobalField& operator=(const F04GlobalField&);
+1 -1
View File
@@ -57,7 +57,7 @@ class MuDecayChannel :public G4VDecayChannel
MuDecayChannel(const G4String& theParentName,
G4double theBR);
// Destructor
virtual ~MuDecayChannel();
virtual ~MuDecayChannel() = default;
public: // With Description
virtual G4DecayProducts *DecayIt(G4double);
+1 -1
View File
@@ -58,7 +58,7 @@ public: // With Description
MuDecayChannelWithSpin(const G4String& theParentName,
G4double theBR);
// Destructor
virtual ~MuDecayChannelWithSpin();
virtual ~MuDecayChannelWithSpin() = default;
public: // With Description
+1 -1
View File
@@ -70,7 +70,7 @@ class meyer
{
public:
meyer();
~meyer();
virtual ~meyer() = default;
void GFunctions(double*, double*, double);
void Get_F_Function_Meyer(double tau, double Ekin, double Z1, double Z2, double m1, double m2);
+1 -1
View File
@@ -52,7 +52,7 @@ class musrSteppingAction;
class musrDetectorConstruction : public G4VUserDetectorConstruction {
public:
musrDetectorConstruction(G4String steeringFileName);
~musrDetectorConstruction();
virtual ~musrDetectorConstruction() = default;
G4VPhysicalVolume *Construct();
+5 -4
View File
@@ -26,22 +26,23 @@
#include "globals.hh"
#include "G4UImessenger.hh"
#include "G4UIdirectory.hh"
#include "G4UIcmdWithAString.hh"
#include "G4UIcmdWithAnInteger.hh"
#include "G4UIcmdWithoutParameter.hh"
class musrDetectorConstruction;
class G4UIdirectory;
class G4UIcmdWithAString;
class G4UIcmdWithADoubleAndUnit;
class G4UIcmdWithAnInteger;
class G4UIcmdWithoutParameter;
class G4UIcmdWith3Vector;
class G4UIcmdWith3VectorAndUnit;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
class musrDetectorMessenger : public G4UImessenger {
public:
musrDetectorMessenger(musrDetectorConstruction *);
~musrDetectorMessenger();
virtual ~musrDetectorMessenger() = default;
virtual void SetNewValue(G4UIcommand *, G4String);
+1 -1
View File
@@ -37,7 +37,7 @@ typedef struct
class musrErrorMessage {
public:
musrErrorMessage();
~musrErrorMessage();
virtual ~musrErrorMessage() = default;
static musrErrorMessage* GetInstance();
void musrError(SEVERITY severity, G4String message, G4bool silent);
void PrintErrorSummary();
+1 -1
View File
@@ -38,7 +38,7 @@ class musrEventAction : public G4UserEventAction
{
public:
musrEventAction();
~musrEventAction();
virtual ~musrEventAction() = default;
public:
void BeginOfEventAction(const G4Event*);
+1 -1
View File
@@ -51,7 +51,7 @@ class musrMuEnergyLossLandau : public G4VDiscreteProcess
musrMuEnergyLossLandau(const G4String& name = "MuEnergyLossLandau", // process description
G4ProcessType aType = fElectromagnetic);
~musrMuEnergyLossLandau();
virtual ~musrMuEnergyLossLandau() = default;
//! - Main method. muon energy loss process is executed at the END of a step. */
G4VParticleChange* PostStepDoIt(
+1 -1
View File
@@ -54,7 +54,7 @@ class musrMuFormation : public G4VDiscreteProcess
musrMuFormation(const G4String& name = "MuFormation", // process description
G4ProcessType aType = fElectromagnetic);
~musrMuFormation();
virtual ~musrMuFormation() = default;
//! - Main method. Muonium formation process is executed at the END of a step. */
G4VParticleChange* PostStepDoIt(
+1 -1
View File
@@ -45,7 +45,7 @@ class musrMuScatter : public G4VDiscreteProcess {
musrMuScatter(const G4String &name = "MuScatt", // process description
G4ProcessType aType = fGeneral);
~musrMuScatter();
virtual ~musrMuScatter() = default;
//! \mm The actions are taken at the end of the step.
G4VParticleChange *PostStepDoIt(const G4Track &, const G4Step &);
+1 -1
View File
@@ -29,7 +29,7 @@
class musrParameters {
public:
musrParameters(G4String steeringFileName);
~musrParameters();
virtual ~musrParameters() = default;
static musrParameters* GetInstance();
+1 -1
View File
@@ -36,7 +36,7 @@ class musrPhysicsList: public G4VUserPhysicsList
{
public:
musrPhysicsList();
~musrPhysicsList();
virtual ~musrPhysicsList() = default;
protected:
// Construct particle and physics
+8 -2
View File
@@ -24,8 +24,14 @@
#ifndef musrPrimaryGeneratorMessenger_h
#define musrPrimaryGeneratorMessenger_h 1
#include "G4UImessenger.hh"
#include "globals.hh"
#include "G4UImessenger.hh"
#include "G4UIcmdWithAString.hh"
#include "G4UIcmdWithADoubleAndUnit.hh"
#include "G4UIcmdWithADouble.hh"
#include "G4UIcmdWithAnInteger.hh"
#include "G4UIcmdWith3VectorAndUnit.hh"
#include "G4UIcmdWith3Vector.hh"
class musrPrimaryGeneratorAction;
class G4UIcmdWithAString;
@@ -40,7 +46,7 @@ class G4UIcmdWith3Vector;
class musrPrimaryGeneratorMessenger : public G4UImessenger {
public:
musrPrimaryGeneratorMessenger(musrPrimaryGeneratorAction *);
~musrPrimaryGeneratorMessenger();
virtual ~musrPrimaryGeneratorMessenger() = default;
void SetNewValue(G4UIcommand *, G4String);
+1 -1
View File
@@ -49,7 +49,7 @@
class musrRootOutput {
public:
musrRootOutput();
~musrRootOutput();
virtual ~musrRootOutput() = default;
static musrRootOutput* GetRootInstance();
public:
+1 -1
View File
@@ -36,7 +36,7 @@ class musrRunAction : public G4UserRunAction
{
public:
musrRunAction();
~musrRunAction();
virtual ~musrRunAction() = default;
public:
void BeginOfRunAction(const G4Run*);
+1 -1
View File
@@ -42,7 +42,7 @@ class musrScintHit : public G4VHit
public:
musrScintHit();
~musrScintHit();
virtual ~musrScintHit() = default;
musrScintHit(const musrScintHit&);
const musrScintHit& operator=(const musrScintHit&);
G4int operator==(const musrScintHit&) const;
+3 -2
View File
@@ -39,7 +39,8 @@ class APDidClass {
APDcellID = xAPDcellID;
APDcellNphot = xAPDcellNphot;
}
~APDidClass() {}
virtual ~APDidClass() = default;
G4int GetAPDcellID() const {return APDcellID;}
G4int GetAPDcellNphot() const {return APDcellNphot;}
void IncreaseAPDcellNphot() {APDcellNphot++;}
@@ -107,7 +108,7 @@ class musrScintSD : public G4VSensitiveDetector
public:
static musrScintSD* GetInstance();
musrScintSD(G4String);
~musrScintSD();
virtual ~musrScintSD() = default;
void Initialize(G4HCofThisEvent*);
G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+2 -1
View File
@@ -31,7 +31,8 @@ class musrStackingAction : public G4UserStackingAction
{
public:
musrStackingAction();
~musrStackingAction();
virtual ~musrStackingAction() = default;
G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track* aTrack);
void NewStage();
void PrepareNewEvent();
+1 -1
View File
@@ -40,7 +40,7 @@ class musrSteppingAction : public G4UserSteppingAction
static musrSteppingAction* GetInstance();
musrSteppingAction();
~musrSteppingAction();
virtual ~musrSteppingAction() = default;
void UserSteppingAction(const G4Step *theStep);
void DoAtTheBeginningOfEvent();
+1 -1
View File
@@ -35,7 +35,7 @@ class musrSteppingVerbose : public G4SteppingVerbose
public:
musrSteppingVerbose();
~musrSteppingVerbose();
virtual ~musrSteppingVerbose() = default;
void StepInfo();
void TrackingStarted();
+1 -1
View File
@@ -46,7 +46,7 @@ class Yields
public:
Yields(); // Class constructor
~Yields(); // Class destructor
virtual ~Yields() = default; // Class destructor
void GetYields(double E, double mass, double yvector[]);
-2
View File
@@ -91,8 +91,6 @@ F04FieldMessenger::F04FieldMessenger(F04GlobalField *pEMfield) : fGlobalField(pE
fEpsMaxCMD->AvailableForStates(G4State_PreInit, G4State_Idle);
}
F04FieldMessenger::~F04FieldMessenger() {}
void F04FieldMessenger::SetNewValue(G4UIcommand *command, G4String newValue)
{
if (command == fStepperCMD.get()) {
-4
View File
@@ -66,10 +66,6 @@ F04GlobalField::F04GlobalField() : G4ElectroMagneticField(),
}
F04GlobalField::~F04GlobalField()
{
}
void F04GlobalField::updateField()
{
first = true;
-4
View File
@@ -78,10 +78,6 @@ MuDecayChannel::MuDecayChannel(const G4String& theParentName,
}
}
MuDecayChannel::~MuDecayChannel()
{
}
G4DecayProducts *MuDecayChannel::DecayIt(G4double)
{
// this version neglects muon polarization,and electron mass
-4
View File
@@ -55,10 +55,6 @@ MuDecayChannelWithSpin::MuDecayChannelWithSpin(const G4String& theParentName,
{
}
MuDecayChannelWithSpin::~MuDecayChannelWithSpin()
{
}
G4DecayProducts *MuDecayChannelWithSpin::DecayIt(G4double)
{
// This version assumes V-A coupling with 1st order radiative correctons,
-3
View File
@@ -66,9 +66,6 @@ using namespace std;
meyer::meyer()
{;}
meyer::~meyer()
{;}
void meyer::GFunctions(double* g1,double* g2, double tau)
{
-4
View File
@@ -99,10 +99,6 @@ musrDetectorConstruction::musrDetectorConstruction(G4String steeringFileName) :
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrDetectorConstruction::~musrDetectorConstruction() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "G4LogicalVolumeStore.hh"
G4VPhysicalVolume *musrDetectorConstruction::Construct()
{
-4
View File
@@ -95,10 +95,6 @@ musrDetectorMessenger::musrDetectorMessenger(musrDetectorConstruction *myDet) :
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrDetectorMessenger::~musrDetectorMessenger() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void musrDetectorMessenger::SetNewValue(G4UIcommand *command, G4String newValue)
{
if (command == UpdateCmd.get()) {
-2
View File
@@ -32,8 +32,6 @@ musrErrorMessage::musrErrorMessage():nErrors(1)
severityWord[FATAL]="FATAL";
}
musrErrorMessage::~musrErrorMessage() {}
musrErrorMessage* musrErrorMessage::pointerToErrors=nullptr;
musrErrorMessage* musrErrorMessage::GetInstance() {
return pointerToErrors;
-6
View File
@@ -54,12 +54,6 @@ musrEventAction* musrEventAction::GetInstance() {
return pointer;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrEventAction::~musrEventAction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void musrEventAction::BeginOfEventAction(const G4Event* evt) {
-2
View File
@@ -39,8 +39,6 @@ musrMuEnergyLossLandau::musrMuEnergyLossLandau(const G4String& name, G4ProcessTy
random = new TRandom();
}
musrMuEnergyLossLandau::~musrMuEnergyLossLandau(){}
double musrMuEnergyLossLandau::landauMPV = 0.1;
double musrMuEnergyLossLandau::landauSigma = 0.1;
-2
View File
@@ -35,8 +35,6 @@ using namespace std;
musrMuFormation::musrMuFormation(const G4String& name, G4ProcessType aType)
: G4VDiscreteProcess(name, aType){}
musrMuFormation::~musrMuFormation(){}
G4VParticleChange* musrMuFormation::PostStepDoIt(const G4Track& trackData,
const G4Step& aStep)
{ // Initialize ParticleChange (by setting all its members equal to
-2
View File
@@ -35,8 +35,6 @@ using namespace std;
musrMuScatter::musrMuScatter(const G4String &name, G4ProcessType aType) : G4VDiscreteProcess(name, aType) {}
musrMuScatter::~musrMuScatter() {}
// At the end of the step, the current volume is checked and if Muonium is in a solid
// material (except for the carbon foil where it is generated), it is stopped immediately.
G4VParticleChange *musrMuScatter::PostStepDoIt(const G4Track &trackData, const G4Step &aStep)
-2
View File
@@ -135,8 +135,6 @@ musrParameters::musrParameters(G4String steeringFileName)
steeringFile.close();
}
musrParameters::~musrParameters() {}
musrParameters* musrParameters::pointerToParameters=nullptr;
musrParameters* musrParameters::GetInstance() {
return pointerToParameters;
-4
View File
@@ -67,10 +67,6 @@ musrPhysicsList::musrPhysicsList() : G4VUserPhysicsList()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrPhysicsList::~musrPhysicsList() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void musrPhysicsList::ConstructParticle()
{
ConstructBosons();
-4
View File
@@ -194,10 +194,6 @@ musrPrimaryGeneratorMessenger::musrPrimaryGeneratorMessenger(musrPrimaryGenerato
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
musrPrimaryGeneratorMessenger::~musrPrimaryGeneratorMessenger() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void musrPrimaryGeneratorMessenger::SetNewValue(G4UIcommand *command, G4String newValue)
{
if (command == setPrimaryParticleCmd.get()) {
-4
View File
@@ -59,10 +59,6 @@ musrRootOutput::musrRootOutput() {
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrRootOutput::~musrRootOutput() {}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrRootOutput* musrRootOutput::pointerToRoot=0;
musrRootOutput* musrRootOutput::GetRootInstance() {
return pointerToRoot;
-6
View File
@@ -37,12 +37,6 @@ musrRunAction::musrRunAction() {
timer = std::make_unique<G4Timer>();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrRunAction::~musrRunAction() {
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void musrRunAction::BeginOfRunAction(const G4Run* aRun) {
-8
View File
@@ -58,14 +58,6 @@ G4int musrScintHit::verboseLevel=0;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrScintHit::~musrScintHit() {
//save the Tree header. The file will be automatically closed
//when going out of the function scope
// rootTree->Write();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrScintHit::musrScintHit(const musrScintHit& right)
: G4VHit()
{
-2
View File
@@ -118,8 +118,6 @@ musrScintSD::musrScintSD(G4String name)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrScintSD::~musrScintSD(){ }
musrScintSD* musrScintSD::pointer=nullptr;
musrScintSD* musrScintSD::GetInstance() {return pointer;}
-6
View File
@@ -40,12 +40,6 @@ musrStackingAction::musrStackingAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrStackingAction::~musrStackingAction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4ClassificationOfNewTrack musrStackingAction::ClassifyNewTrack(const G4Track * aTrack) {
if (aTrack->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition()) {
opticalPhotonCounter++;
-3
View File
@@ -48,9 +48,6 @@ musrSteppingAction::musrSteppingAction() {
}
}
musrSteppingAction::~musrSteppingAction() {
}
musrSteppingAction* musrSteppingAction::pointer=0;
musrSteppingAction* musrSteppingAction::GetInstance()
-5
View File
@@ -33,11 +33,6 @@ musrSteppingVerbose::musrSteppingVerbose()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
musrSteppingVerbose::~musrSteppingVerbose()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void musrSteppingVerbose::StepInfo()
{
CopyState();
-1
View File
@@ -46,7 +46,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
Yields:: Yields(){;}
Yields::~Yields(){;}
void Yields::GetYields(
double E, // kinetic energy in keV