diff --git a/include/F04FieldMessenger.hh b/include/F04FieldMessenger.hh index 4ab77b2..83ac342 100644 --- a/include/F04FieldMessenger.hh +++ b/include/F04FieldMessenger.hh @@ -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); diff --git a/include/F04GlobalField.hh b/include/F04GlobalField.hh index 3fe7fba..4e6dcf5 100644 --- a/include/F04GlobalField.hh +++ b/include/F04GlobalField.hh @@ -73,7 +73,7 @@ private: F04GlobalField(const F04GlobalField&); public: - ~F04GlobalField(); + virtual ~F04GlobalField() = default; private: F04GlobalField& operator=(const F04GlobalField&); diff --git a/include/MuDecayChannel.hh b/include/MuDecayChannel.hh index 90acbf5..4985904 100644 --- a/include/MuDecayChannel.hh +++ b/include/MuDecayChannel.hh @@ -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); diff --git a/include/MuDecayChannelWithSpin.hh b/include/MuDecayChannelWithSpin.hh index 94c96e1..0e144d7 100644 --- a/include/MuDecayChannelWithSpin.hh +++ b/include/MuDecayChannelWithSpin.hh @@ -58,7 +58,7 @@ public: // With Description MuDecayChannelWithSpin(const G4String& theParentName, G4double theBR); // Destructor - virtual ~MuDecayChannelWithSpin(); + virtual ~MuDecayChannelWithSpin() = default; public: // With Description diff --git a/include/meyer.hh b/include/meyer.hh index 20e754d..03634ca 100644 --- a/include/meyer.hh +++ b/include/meyer.hh @@ -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); diff --git a/include/musrDetectorConstruction.hh b/include/musrDetectorConstruction.hh index bae31ef..897b30b 100644 --- a/include/musrDetectorConstruction.hh +++ b/include/musrDetectorConstruction.hh @@ -52,7 +52,7 @@ class musrSteppingAction; class musrDetectorConstruction : public G4VUserDetectorConstruction { public: musrDetectorConstruction(G4String steeringFileName); - ~musrDetectorConstruction(); + virtual ~musrDetectorConstruction() = default; G4VPhysicalVolume *Construct(); diff --git a/include/musrDetectorMessenger.hh b/include/musrDetectorMessenger.hh index f4be30c..66f35cc 100644 --- a/include/musrDetectorMessenger.hh +++ b/include/musrDetectorMessenger.hh @@ -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); diff --git a/include/musrErrorMessage.hh b/include/musrErrorMessage.hh index 8124381..2f43e69 100644 --- a/include/musrErrorMessage.hh +++ b/include/musrErrorMessage.hh @@ -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(); diff --git a/include/musrEventAction.hh b/include/musrEventAction.hh index 8aa7e02..768d74d 100644 --- a/include/musrEventAction.hh +++ b/include/musrEventAction.hh @@ -38,7 +38,7 @@ class musrEventAction : public G4UserEventAction { public: musrEventAction(); - ~musrEventAction(); + virtual ~musrEventAction() = default; public: void BeginOfEventAction(const G4Event*); diff --git a/include/musrMuEnergyLossLandau.hh b/include/musrMuEnergyLossLandau.hh index e58c170..d986fb2 100644 --- a/include/musrMuEnergyLossLandau.hh +++ b/include/musrMuEnergyLossLandau.hh @@ -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( diff --git a/include/musrMuFormation.hh b/include/musrMuFormation.hh index 4358027..9ed0e8c 100644 --- a/include/musrMuFormation.hh +++ b/include/musrMuFormation.hh @@ -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( diff --git a/include/musrMuScatter.hh b/include/musrMuScatter.hh index ced1d0e..bc4d70d 100644 --- a/include/musrMuScatter.hh +++ b/include/musrMuScatter.hh @@ -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 &); diff --git a/include/musrParameters.hh b/include/musrParameters.hh index eecfeee..1ccae4f 100644 --- a/include/musrParameters.hh +++ b/include/musrParameters.hh @@ -29,7 +29,7 @@ class musrParameters { public: musrParameters(G4String steeringFileName); - ~musrParameters(); + virtual ~musrParameters() = default; static musrParameters* GetInstance(); diff --git a/include/musrPhysicsList.hh b/include/musrPhysicsList.hh index 1cee884..0adc0a6 100644 --- a/include/musrPhysicsList.hh +++ b/include/musrPhysicsList.hh @@ -36,7 +36,7 @@ class musrPhysicsList: public G4VUserPhysicsList { public: musrPhysicsList(); - ~musrPhysicsList(); + virtual ~musrPhysicsList() = default; protected: // Construct particle and physics diff --git a/include/musrPrimaryGeneratorMessenger.hh b/include/musrPrimaryGeneratorMessenger.hh index 13c4c9e..89b7636 100644 --- a/include/musrPrimaryGeneratorMessenger.hh +++ b/include/musrPrimaryGeneratorMessenger.hh @@ -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); diff --git a/include/musrRootOutput.hh b/include/musrRootOutput.hh index 887c3e6..56fb4b8 100644 --- a/include/musrRootOutput.hh +++ b/include/musrRootOutput.hh @@ -49,7 +49,7 @@ class musrRootOutput { public: musrRootOutput(); - ~musrRootOutput(); + virtual ~musrRootOutput() = default; static musrRootOutput* GetRootInstance(); public: diff --git a/include/musrRunAction.hh b/include/musrRunAction.hh index 41d4a33..4ee55e8 100644 --- a/include/musrRunAction.hh +++ b/include/musrRunAction.hh @@ -36,7 +36,7 @@ class musrRunAction : public G4UserRunAction { public: musrRunAction(); - ~musrRunAction(); + virtual ~musrRunAction() = default; public: void BeginOfRunAction(const G4Run*); diff --git a/include/musrScintHit.hh b/include/musrScintHit.hh index d11bc11..6a94215 100644 --- a/include/musrScintHit.hh +++ b/include/musrScintHit.hh @@ -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; diff --git a/include/musrScintSD.hh b/include/musrScintSD.hh index d68f6f1..81ba198 100644 --- a/include/musrScintSD.hh +++ b/include/musrScintSD.hh @@ -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*); diff --git a/include/musrStackingAction.hh b/include/musrStackingAction.hh index 25cc3f5..b652d00 100644 --- a/include/musrStackingAction.hh +++ b/include/musrStackingAction.hh @@ -31,7 +31,8 @@ class musrStackingAction : public G4UserStackingAction { public: musrStackingAction(); - ~musrStackingAction(); + virtual ~musrStackingAction() = default; + G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track* aTrack); void NewStage(); void PrepareNewEvent(); diff --git a/include/musrSteppingAction.hh b/include/musrSteppingAction.hh index 9f2a29a..7030642 100644 --- a/include/musrSteppingAction.hh +++ b/include/musrSteppingAction.hh @@ -40,7 +40,7 @@ class musrSteppingAction : public G4UserSteppingAction static musrSteppingAction* GetInstance(); musrSteppingAction(); - ~musrSteppingAction(); + virtual ~musrSteppingAction() = default; void UserSteppingAction(const G4Step *theStep); void DoAtTheBeginningOfEvent(); diff --git a/include/musrSteppingVerbose.hh b/include/musrSteppingVerbose.hh index 4a1ae2e..2b7518e 100644 --- a/include/musrSteppingVerbose.hh +++ b/include/musrSteppingVerbose.hh @@ -35,7 +35,7 @@ class musrSteppingVerbose : public G4SteppingVerbose public: musrSteppingVerbose(); - ~musrSteppingVerbose(); + virtual ~musrSteppingVerbose() = default; void StepInfo(); void TrackingStarted(); diff --git a/include/yields.hh b/include/yields.hh index c47f3f5..4f63c04 100644 --- a/include/yields.hh +++ b/include/yields.hh @@ -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[]); diff --git a/src/F04FieldMessenger.cc b/src/F04FieldMessenger.cc index 761f0c1..7d93e0e 100644 --- a/src/F04FieldMessenger.cc +++ b/src/F04FieldMessenger.cc @@ -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()) { diff --git a/src/F04GlobalField.cc b/src/F04GlobalField.cc index 877baba..255faed 100644 --- a/src/F04GlobalField.cc +++ b/src/F04GlobalField.cc @@ -66,10 +66,6 @@ F04GlobalField::F04GlobalField() : G4ElectroMagneticField(), } -F04GlobalField::~F04GlobalField() -{ -} - void F04GlobalField::updateField() { first = true; diff --git a/src/MuDecayChannel.cc b/src/MuDecayChannel.cc index 66527c0..3d57ad4 100644 --- a/src/MuDecayChannel.cc +++ b/src/MuDecayChannel.cc @@ -78,10 +78,6 @@ MuDecayChannel::MuDecayChannel(const G4String& theParentName, } } -MuDecayChannel::~MuDecayChannel() -{ -} - G4DecayProducts *MuDecayChannel::DecayIt(G4double) { // this version neglects muon polarization,and electron mass diff --git a/src/MuDecayChannelWithSpin.cc b/src/MuDecayChannelWithSpin.cc index 80e6894..95e5c9c 100644 --- a/src/MuDecayChannelWithSpin.cc +++ b/src/MuDecayChannelWithSpin.cc @@ -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, diff --git a/src/meyer.cc b/src/meyer.cc index 3202698..0381904 100644 --- a/src/meyer.cc +++ b/src/meyer.cc @@ -66,9 +66,6 @@ using namespace std; meyer::meyer() {;} -meyer::~meyer() -{;} - void meyer::GFunctions(double* g1,double* g2, double tau) { diff --git a/src/musrDetectorConstruction.cc b/src/musrDetectorConstruction.cc index df30a72..940526b 100644 --- a/src/musrDetectorConstruction.cc +++ b/src/musrDetectorConstruction.cc @@ -99,10 +99,6 @@ musrDetectorConstruction::musrDetectorConstruction(G4String steeringFileName) : //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -musrDetectorConstruction::~musrDetectorConstruction() {} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - #include "G4LogicalVolumeStore.hh" G4VPhysicalVolume *musrDetectorConstruction::Construct() { diff --git a/src/musrDetectorMessenger.cc b/src/musrDetectorMessenger.cc index 9077f0f..2e816f7 100644 --- a/src/musrDetectorMessenger.cc +++ b/src/musrDetectorMessenger.cc @@ -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()) { diff --git a/src/musrErrorMessage.cc b/src/musrErrorMessage.cc index fa3f0a0..be4efa7 100644 --- a/src/musrErrorMessage.cc +++ b/src/musrErrorMessage.cc @@ -32,8 +32,6 @@ musrErrorMessage::musrErrorMessage():nErrors(1) severityWord[FATAL]="FATAL"; } -musrErrorMessage::~musrErrorMessage() {} - musrErrorMessage* musrErrorMessage::pointerToErrors=nullptr; musrErrorMessage* musrErrorMessage::GetInstance() { return pointerToErrors; diff --git a/src/musrEventAction.cc b/src/musrEventAction.cc index 4ac27f8..4653757 100644 --- a/src/musrEventAction.cc +++ b/src/musrEventAction.cc @@ -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) { diff --git a/src/musrMuEnergyLossLandau.cc b/src/musrMuEnergyLossLandau.cc index 1b40530..5883e18 100644 --- a/src/musrMuEnergyLossLandau.cc +++ b/src/musrMuEnergyLossLandau.cc @@ -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; diff --git a/src/musrMuFormation.cc b/src/musrMuFormation.cc index c77864d..759ef50 100644 --- a/src/musrMuFormation.cc +++ b/src/musrMuFormation.cc @@ -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 diff --git a/src/musrMuScatter.cc b/src/musrMuScatter.cc index 3386b0f..4b911eb 100644 --- a/src/musrMuScatter.cc +++ b/src/musrMuScatter.cc @@ -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) diff --git a/src/musrParameters.cc b/src/musrParameters.cc index d4c4e51..f5c2218 100644 --- a/src/musrParameters.cc +++ b/src/musrParameters.cc @@ -135,8 +135,6 @@ musrParameters::musrParameters(G4String steeringFileName) steeringFile.close(); } -musrParameters::~musrParameters() {} - musrParameters* musrParameters::pointerToParameters=nullptr; musrParameters* musrParameters::GetInstance() { return pointerToParameters; diff --git a/src/musrPhysicsList.cc b/src/musrPhysicsList.cc index f9bb4f2..502c3e5 100644 --- a/src/musrPhysicsList.cc +++ b/src/musrPhysicsList.cc @@ -67,10 +67,6 @@ musrPhysicsList::musrPhysicsList() : G4VUserPhysicsList() //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -musrPhysicsList::~musrPhysicsList() {} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - void musrPhysicsList::ConstructParticle() { ConstructBosons(); diff --git a/src/musrPrimaryGeneratorMessenger.cc b/src/musrPrimaryGeneratorMessenger.cc index 25cd037..f8f6f99 100644 --- a/src/musrPrimaryGeneratorMessenger.cc +++ b/src/musrPrimaryGeneratorMessenger.cc @@ -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()) { diff --git a/src/musrRootOutput.cc b/src/musrRootOutput.cc index 8f42c85..c1d2303 100644 --- a/src/musrRootOutput.cc +++ b/src/musrRootOutput.cc @@ -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; diff --git a/src/musrRunAction.cc b/src/musrRunAction.cc index 3653c35..a3a9853 100644 --- a/src/musrRunAction.cc +++ b/src/musrRunAction.cc @@ -37,12 +37,6 @@ musrRunAction::musrRunAction() { timer = std::make_unique(); } - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -musrRunAction::~musrRunAction() { -} - //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... void musrRunAction::BeginOfRunAction(const G4Run* aRun) { diff --git a/src/musrScintHit.cc b/src/musrScintHit.cc index da7bba6..9bc3366 100644 --- a/src/musrScintHit.cc +++ b/src/musrScintHit.cc @@ -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() { diff --git a/src/musrScintSD.cc b/src/musrScintSD.cc index 711483f..86067b4 100644 --- a/src/musrScintSD.cc +++ b/src/musrScintSD.cc @@ -118,8 +118,6 @@ musrScintSD::musrScintSD(G4String name) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -musrScintSD::~musrScintSD(){ } - musrScintSD* musrScintSD::pointer=nullptr; musrScintSD* musrScintSD::GetInstance() {return pointer;} diff --git a/src/musrStackingAction.cc b/src/musrStackingAction.cc index 867c5c2..962b507 100644 --- a/src/musrStackingAction.cc +++ b/src/musrStackingAction.cc @@ -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++; diff --git a/src/musrSteppingAction.cc b/src/musrSteppingAction.cc index 7189df5..3b5e206 100644 --- a/src/musrSteppingAction.cc +++ b/src/musrSteppingAction.cc @@ -48,9 +48,6 @@ musrSteppingAction::musrSteppingAction() { } } -musrSteppingAction::~musrSteppingAction() { -} - musrSteppingAction* musrSteppingAction::pointer=0; musrSteppingAction* musrSteppingAction::GetInstance() diff --git a/src/musrSteppingVerbose.cc b/src/musrSteppingVerbose.cc index 31d733f..39d97eb 100644 --- a/src/musrSteppingVerbose.cc +++ b/src/musrSteppingVerbose.cc @@ -33,11 +33,6 @@ musrSteppingVerbose::musrSteppingVerbose() //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -musrSteppingVerbose::~musrSteppingVerbose() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - void musrSteppingVerbose::StepInfo() { CopyState(); diff --git a/src/yields.cc b/src/yields.cc index f4c5179..4fa2789 100644 --- a/src/yields.cc +++ b/src/yields.cc @@ -46,7 +46,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ Yields:: Yields(){;} -Yields::~Yields(){;} void Yields::GetYields( double E, // kinetic energy in keV