Import Geant4 11.2.0 source tree
This commit is contained in:
@@ -40,14 +40,14 @@ class DetectorConstruction;
|
||||
class ActionInitialization : public G4VUserActionInitialization
|
||||
{
|
||||
public:
|
||||
ActionInitialization(DetectorConstruction* detector);
|
||||
virtual ~ActionInitialization();
|
||||
ActionInitialization(DetectorConstruction* );
|
||||
~ActionInitialization() override = default;
|
||||
|
||||
virtual void BuildForMaster() const;
|
||||
virtual void Build() const;
|
||||
void BuildForMaster() const override;
|
||||
void Build() const override;
|
||||
|
||||
private:
|
||||
DetectorConstruction* fDetector;
|
||||
DetectorConstruction* fDetector = nullptr;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
/// \brief Definition of the DetectorConstruction class
|
||||
//
|
||||
//
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -48,11 +47,11 @@ class DetectorConstruction : public G4VUserDetectorConstruction
|
||||
public:
|
||||
|
||||
DetectorConstruction();
|
||||
~DetectorConstruction();
|
||||
~DetectorConstruction() override;
|
||||
|
||||
public:
|
||||
|
||||
virtual G4VPhysicalVolume* Construct();
|
||||
G4VPhysicalVolume* Construct() override;
|
||||
|
||||
G4Material*
|
||||
MaterialWithSingleIsotope(G4String, G4String, G4double, G4int, G4int);
|
||||
@@ -77,18 +76,18 @@ class DetectorConstruction : public G4VUserDetectorConstruction
|
||||
|
||||
private:
|
||||
|
||||
G4double fAbsorRadius, fAbsorLength;
|
||||
G4Material* fAbsorMaterial;
|
||||
G4LogicalVolume* fLAbsor;
|
||||
G4double fAbsorRadius = 0., fAbsorLength = 0.;
|
||||
G4Material* fAbsorMaterial = nullptr;
|
||||
G4LogicalVolume* fLAbsor = nullptr;
|
||||
|
||||
G4double fContainThickness;
|
||||
G4Material* fContainMaterial;
|
||||
G4LogicalVolume* fLContain;
|
||||
G4double fContainThickness = 0.;
|
||||
G4Material* fContainMaterial = nullptr;
|
||||
G4LogicalVolume* fLContain = nullptr;
|
||||
|
||||
G4Material* fWorldMaterial;
|
||||
G4VPhysicalVolume* fPWorld;
|
||||
G4Material* fWorldMaterial = nullptr;
|
||||
G4VPhysicalVolume* fPWorld = nullptr;
|
||||
|
||||
DetectorMessenger* fDetectorMessenger;
|
||||
DetectorMessenger* fDetectorMessenger = nullptr;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -50,22 +50,22 @@ class DetectorMessenger: public G4UImessenger
|
||||
public:
|
||||
|
||||
DetectorMessenger(DetectorConstruction* );
|
||||
~DetectorMessenger();
|
||||
~DetectorMessenger() override;
|
||||
|
||||
virtual void SetNewValue(G4UIcommand*, G4String);
|
||||
void SetNewValue(G4UIcommand*, G4String) override;
|
||||
|
||||
private:
|
||||
|
||||
DetectorConstruction* fDetector;
|
||||
DetectorConstruction* fDetector = nullptr;
|
||||
|
||||
G4UIdirectory* fTesthadrDir;
|
||||
G4UIdirectory* fDetDir;
|
||||
G4UIcmdWithAString* fMaterCmd1;
|
||||
G4UIcmdWithAString* fMaterCmd2;
|
||||
G4UIcmdWithADoubleAndUnit* fSizeCmd1;
|
||||
G4UIcmdWithADoubleAndUnit* fSizeCmd2;
|
||||
G4UIcmdWithADoubleAndUnit* fSizeCmd3;
|
||||
G4UIcommand* fIsotopeCmd;
|
||||
G4UIdirectory* fTesthadrDir = nullptr;
|
||||
G4UIdirectory* fDetDir = nullptr;
|
||||
G4UIcmdWithAString* fMaterCmd1 = nullptr;
|
||||
G4UIcmdWithAString* fMaterCmd2 = nullptr;
|
||||
G4UIcmdWithADoubleAndUnit* fSizeCmd1 = nullptr;
|
||||
G4UIcmdWithADoubleAndUnit* fSizeCmd2 = nullptr;
|
||||
G4UIcmdWithADoubleAndUnit* fSizeCmd3 = nullptr;
|
||||
G4UIcommand* fIsotopeCmd = nullptr;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -42,7 +42,7 @@ class ElectromagneticPhysics : public G4VPhysicsConstructor
|
||||
{
|
||||
public:
|
||||
ElectromagneticPhysics(const G4String& name = "standard");
|
||||
~ElectromagneticPhysics() override;
|
||||
~ElectromagneticPhysics() override = default;
|
||||
|
||||
public:
|
||||
// This method is dummy for physics
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
/// \brief Definition of the EventAction class
|
||||
//
|
||||
//
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -42,19 +41,19 @@
|
||||
class EventAction : public G4UserEventAction
|
||||
{
|
||||
public:
|
||||
EventAction();
|
||||
~EventAction();
|
||||
EventAction() = default;
|
||||
~EventAction() override = default;
|
||||
|
||||
public:
|
||||
virtual void BeginOfEventAction(const G4Event*);
|
||||
virtual void EndOfEventAction(const G4Event*);
|
||||
void BeginOfEventAction(const G4Event*) override;
|
||||
void EndOfEventAction(const G4Event*) override;
|
||||
|
||||
void AddEdep (G4double Edep);
|
||||
void AddEflow(G4double Eflow);
|
||||
|
||||
private:
|
||||
G4double fTotalEnergyDeposit;
|
||||
G4double fTotalEnergyFlow;
|
||||
G4double fTotalEnergyDeposit = 0.;
|
||||
G4double fTotalEnergyFlow = 0.;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -42,13 +42,13 @@ class GammaNuclearPhysics : public G4VPhysicsConstructor
|
||||
{
|
||||
public:
|
||||
GammaNuclearPhysics(const G4String& name="gamma");
|
||||
~GammaNuclearPhysics() override;
|
||||
~GammaNuclearPhysics() override = default;
|
||||
|
||||
public:
|
||||
void ConstructParticle() override { };
|
||||
void ConstructProcess() override;
|
||||
void ConstructProcess() override;
|
||||
};
|
||||
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
#endif
|
||||
|
||||
@@ -42,11 +42,11 @@ class GammaNuclearPhysicsLEND : public G4VPhysicsConstructor
|
||||
{
|
||||
public:
|
||||
GammaNuclearPhysicsLEND(const G4String& name="gamma");
|
||||
~GammaNuclearPhysicsLEND() override;
|
||||
~GammaNuclearPhysicsLEND() override = default;
|
||||
|
||||
public:
|
||||
void ConstructParticle() override { };
|
||||
void ConstructProcess() override;
|
||||
void ConstructProcess() override;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -52,8 +52,8 @@ class HadronElasticPhysicsHP : public G4HadronElasticPhysics
|
||||
private:
|
||||
void DefineCommands();
|
||||
|
||||
G4GenericMessenger* fMessenger;
|
||||
G4bool fThermal;
|
||||
G4GenericMessenger* fMessenger = nullptr;
|
||||
G4bool fThermal = false;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -42,11 +42,11 @@ class HistoManager
|
||||
{
|
||||
public:
|
||||
HistoManager();
|
||||
~HistoManager();
|
||||
~HistoManager() = default;
|
||||
|
||||
private:
|
||||
void Book();
|
||||
G4String fFileName;
|
||||
G4String fFileName = "NeutronSource";
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -40,21 +40,21 @@ class PhysicsList: public G4VModularPhysicsList
|
||||
{
|
||||
public:
|
||||
PhysicsList();
|
||||
~PhysicsList() override;
|
||||
~PhysicsList() override = default;
|
||||
|
||||
public:
|
||||
void ConstructProcess() override;
|
||||
void SetCuts()override;
|
||||
|
||||
private:
|
||||
G4VPhysicsConstructor* fHadronElastic;
|
||||
G4VPhysicsConstructor* fHadronInelastic;
|
||||
G4VPhysicsConstructor* fIonElastic;
|
||||
G4VPhysicsConstructor* fIonInelastic;
|
||||
G4VPhysicsConstructor* fGammaNuclear;
|
||||
G4VPhysicsConstructor* fElectromagnetic;
|
||||
G4VPhysicsConstructor* fDecay;
|
||||
G4VPhysicsConstructor* fRadioactiveDecay;
|
||||
G4VPhysicsConstructor* fHadronElastic = nullptr;
|
||||
G4VPhysicsConstructor* fHadronInelastic = nullptr;
|
||||
G4VPhysicsConstructor* fIonElastic = nullptr;
|
||||
G4VPhysicsConstructor* fIonInelastic = nullptr;
|
||||
G4VPhysicsConstructor* fGammaNuclear = nullptr;
|
||||
G4VPhysicsConstructor* fElectromagnetic = nullptr;
|
||||
G4VPhysicsConstructor* fDecay = nullptr;
|
||||
G4VPhysicsConstructor* fRadioactiveDecay = nullptr;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -27,9 +27,6 @@
|
||||
/// \brief Definition of the PrimaryGeneratorAction class
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -49,15 +46,15 @@ class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
|
||||
{
|
||||
public:
|
||||
PrimaryGeneratorAction(DetectorConstruction*);
|
||||
~PrimaryGeneratorAction();
|
||||
~PrimaryGeneratorAction() override;
|
||||
|
||||
public:
|
||||
virtual void GeneratePrimaries(G4Event*);
|
||||
void GeneratePrimaries(G4Event*) override;
|
||||
G4ParticleGun* GetParticleGun() {return fParticleGun;};
|
||||
|
||||
private:
|
||||
G4ParticleGun* fParticleGun;
|
||||
DetectorConstruction* fDetector;
|
||||
G4ParticleGun* fParticleGun = nullptr;
|
||||
DetectorConstruction* fDetector = nullptr;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -38,11 +38,11 @@ class RadioactiveDecayPhysics : public G4VPhysicsConstructor
|
||||
{
|
||||
public:
|
||||
RadioactiveDecayPhysics(const G4String& name = "radioactiveDecay");
|
||||
~RadioactiveDecayPhysics() override;
|
||||
~RadioactiveDecayPhysics() override = default;
|
||||
|
||||
public:
|
||||
void ConstructParticle() override;
|
||||
void ConstructProcess() override;
|
||||
void ConstructProcess() override;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ class Run : public G4Run
|
||||
{
|
||||
public:
|
||||
Run(DetectorConstruction*);
|
||||
~Run();
|
||||
~Run() override = default;
|
||||
|
||||
public:
|
||||
void SetPrimary(G4ParticleDefinition* particle, G4double energy);
|
||||
@@ -75,12 +75,12 @@ class Run : public G4Run
|
||||
};
|
||||
|
||||
private:
|
||||
DetectorConstruction* fDetector;
|
||||
G4ParticleDefinition* fParticle;
|
||||
G4double fEkin;
|
||||
DetectorConstruction* fDetector = nullptr;
|
||||
G4ParticleDefinition* fParticle = nullptr;
|
||||
G4double fEkin = 0.;
|
||||
|
||||
G4double fEnergyDeposit, fEnergyDeposit2;
|
||||
G4double fEnergyFlow, fEnergyFlow2;
|
||||
G4double fEnergyDeposit = 0., fEnergyDeposit2 = 0.;
|
||||
G4double fEnergyFlow = 0., fEnergyFlow2 = 0.;
|
||||
std::map<G4String,G4int> fProcCounter;
|
||||
std::map<G4String,ParticleData> fParticleDataMap1;
|
||||
std::map<G4String,ParticleData> fParticleDataMap2;
|
||||
|
||||
@@ -49,18 +49,18 @@ class RunAction : public G4UserRunAction
|
||||
{
|
||||
public:
|
||||
RunAction(DetectorConstruction*, PrimaryGeneratorAction*);
|
||||
~RunAction();
|
||||
~RunAction() override;
|
||||
|
||||
public:
|
||||
virtual G4Run* GenerateRun();
|
||||
virtual void BeginOfRunAction(const G4Run*);
|
||||
virtual void EndOfRunAction(const G4Run*);
|
||||
G4Run* GenerateRun() override;
|
||||
void BeginOfRunAction(const G4Run*) override;
|
||||
void EndOfRunAction(const G4Run*) override;
|
||||
|
||||
private:
|
||||
DetectorConstruction* fDetector;
|
||||
PrimaryGeneratorAction* fPrimary;
|
||||
Run* fRun;
|
||||
HistoManager* fHistoManager;
|
||||
DetectorConstruction* fDetector = nullptr;
|
||||
PrimaryGeneratorAction* fPrimary = nullptr;
|
||||
Run* fRun = nullptr;
|
||||
HistoManager* fHistoManager = nullptr;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -44,12 +44,12 @@ class SteppingAction : public G4UserSteppingAction
|
||||
{
|
||||
public:
|
||||
SteppingAction(EventAction*);
|
||||
~SteppingAction();
|
||||
~SteppingAction() override = default;
|
||||
|
||||
virtual void UserSteppingAction(const G4Step*);
|
||||
void UserSteppingAction(const G4Step*) override;
|
||||
|
||||
private:
|
||||
EventAction* fEventAction;
|
||||
EventAction* fEventAction = nullptr;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -44,13 +44,13 @@ class TrackingAction : public G4UserTrackingAction {
|
||||
|
||||
public:
|
||||
TrackingAction(EventAction*);
|
||||
~TrackingAction() {};
|
||||
~TrackingAction() override = default;
|
||||
|
||||
virtual void PreUserTrackingAction(const G4Track*);
|
||||
virtual void PostUserTrackingAction(const G4Track*);
|
||||
void PreUserTrackingAction(const G4Track*) override;
|
||||
void PostUserTrackingAction(const G4Track*) override;
|
||||
|
||||
private:
|
||||
EventAction* fEventAction;
|
||||
EventAction* fEventAction = nullptr;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Reference in New Issue
Block a user