Import Geant4 11.2.0 source tree
This commit is contained in:
@@ -53,7 +53,7 @@ Par02ActionInitialization::Par02ActionInitialization( const G4String aOutName )
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02ActionInitialization::~Par02ActionInitialization() {}
|
||||
Par02ActionInitialization::~Par02ActionInitialization() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -38,11 +38,11 @@
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02DetectorConstruction::Par02DetectorConstruction() {}
|
||||
Par02DetectorConstruction::Par02DetectorConstruction() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02DetectorConstruction::~Par02DetectorConstruction() {}
|
||||
Par02DetectorConstruction::~Par02DetectorConstruction() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -33,11 +33,11 @@
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02DetectorParametrisation::Par02DetectorParametrisation() {}
|
||||
Par02DetectorParametrisation::Par02DetectorParametrisation() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02DetectorParametrisation::~Par02DetectorParametrisation() {}
|
||||
Par02DetectorParametrisation::~Par02DetectorParametrisation() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ Par02EventAction::Par02EventAction( G4bool aSmear ) :
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02EventAction::~Par02EventAction() {}
|
||||
Par02EventAction::~Par02EventAction() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ Par02EventInformation::Par02EventInformation( G4bool aSmear ): fDoSmearing( aSme
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02EventInformation::~Par02EventInformation() {}
|
||||
Par02EventInformation::~Par02EventInformation() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ Par02FastSimModelEMCal::Par02FastSimModelEMCal( G4String aModelName ) :
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02FastSimModelEMCal::~Par02FastSimModelEMCal() {}
|
||||
Par02FastSimModelEMCal::~Par02FastSimModelEMCal() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -99,7 +99,7 @@ void Par02FastSimModelEMCal::DoIt( const G4FastTrack& aFastTrack,
|
||||
// Consider only primary tracks (do nothing else for secondary e-, e+, gammas)
|
||||
G4ThreeVector Pos = aFastTrack.GetPrimaryTrack()->GetPosition();
|
||||
if ( ! aFastTrack.GetPrimaryTrack()->GetParentID() ) {
|
||||
Par02EventInformation* info = (Par02EventInformation*)
|
||||
auto info = (Par02EventInformation*)
|
||||
G4EventManager::GetEventManager()->GetUserInformation();
|
||||
if ( info->GetDoSmearing() ) {
|
||||
// Smearing according to the electromagnetic calorimeter resolution
|
||||
|
||||
@@ -63,7 +63,7 @@ Par02FastSimModelHCal::Par02FastSimModelHCal( G4String aModelName ) :
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02FastSimModelHCal::~Par02FastSimModelHCal() {}
|
||||
Par02FastSimModelHCal::~Par02FastSimModelHCal() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -101,7 +101,7 @@ void Par02FastSimModelHCal::DoIt( const G4FastTrack& aFastTrack,
|
||||
// Consider only primary tracks (do nothing else for secondary hadrons)
|
||||
G4ThreeVector Pos = aFastTrack.GetPrimaryTrack()->GetPosition();
|
||||
if ( ! aFastTrack.GetPrimaryTrack()->GetParentID() ) {
|
||||
Par02EventInformation* info = (Par02EventInformation*)
|
||||
auto info = (Par02EventInformation*)
|
||||
G4EventManager::GetEventManager()->GetUserInformation();
|
||||
if ( info->GetDoSmearing() ) {
|
||||
// Smearing according to the hadronic calorimeter resolution
|
||||
@@ -117,7 +117,7 @@ void Par02FastSimModelHCal::DoIt( const G4FastTrack& aFastTrack,
|
||||
SmearEnergy( aFastTrack.GetPrimaryTrack(), res ) );
|
||||
Par02Output::Instance()->FillHistogram( 2, (Esm/MeV) / (Edep/MeV) );
|
||||
// Setting the values of Pos, Esm, res and eff
|
||||
Par02PrimaryParticleInformation* primaryInfo=
|
||||
auto primaryInfo=
|
||||
static_cast<Par02PrimaryParticleInformation*>(
|
||||
( aFastTrack.GetPrimaryTrack()->GetDynamicParticle()->GetPrimaryParticle() )->
|
||||
GetUserInformation() ) ;
|
||||
|
||||
@@ -71,7 +71,7 @@ Par02FastSimModelTracker::Par02FastSimModelTracker( G4String aModelName ) :
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02FastSimModelTracker::~Par02FastSimModelTracker() {}
|
||||
Par02FastSimModelTracker::~Par02FastSimModelTracker() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -123,7 +123,7 @@ void Par02FastSimModelTracker::DoIt( const G4FastTrack& aFastTrack,
|
||||
// Consider only primary tracks (do nothing else for secondary charged particles)
|
||||
G4ThreeVector Porg = aFastTrack.GetPrimaryTrack()->GetMomentum();
|
||||
if ( ! aFastTrack.GetPrimaryTrack()->GetParentID() ) {
|
||||
Par02EventInformation* info = (Par02EventInformation*)
|
||||
auto info = (Par02EventInformation*)
|
||||
G4EventManager::GetEventManager()->GetUserInformation();
|
||||
if ( info->GetDoSmearing() ) {
|
||||
// Smearing according to the tracking detector resolution
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02Output* Par02Output::fPar02Output = 0;
|
||||
Par02Output* Par02Output::fPar02Output = nullptr;
|
||||
G4ThreadLocal G4int Par02Output::fCurrentNtupleId = 0;
|
||||
G4ThreadLocal G4int Par02Output::fCurrentID = 0;
|
||||
|
||||
@@ -50,8 +50,7 @@ Par02Output::Par02Output() : fFileNameWithRunNo( false ) {
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02Output::~Par02Output() {
|
||||
}
|
||||
Par02Output::~Par02Output() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ Par02PhysicsList::Par02PhysicsList() : G4VUserPhysicsList() {
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02PhysicsList::~Par02PhysicsList() {}
|
||||
Par02PhysicsList::~Par02PhysicsList() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -144,7 +144,7 @@ void Par02PhysicsList::AddTransportation() {
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
void Par02PhysicsList::ConstructGeneral() {
|
||||
G4Decay* theDecayProcess = new G4Decay();
|
||||
auto theDecayProcess = new G4Decay();
|
||||
auto particleIterator=GetParticleIterator();
|
||||
particleIterator->reset();
|
||||
while ( (*particleIterator)() ) {
|
||||
|
||||
@@ -40,7 +40,7 @@ Par02PrimaryParticleInformation::Par02PrimaryParticleInformation(
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02PrimaryParticleInformation::~Par02PrimaryParticleInformation() {}
|
||||
Par02PrimaryParticleInformation::~Par02PrimaryParticleInformation() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02Smearer* Par02Smearer::fPar02Smearer = 0;
|
||||
Par02Smearer* Par02Smearer::fPar02Smearer = nullptr;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -51,7 +51,7 @@ Par02Smearer::Par02Smearer() {
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02Smearer::~Par02Smearer() {}
|
||||
Par02Smearer::~Par02Smearer() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ Par02TrackingAction::Par02TrackingAction() : G4UserTrackingAction() {}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Par02TrackingAction::~Par02TrackingAction() {}
|
||||
Par02TrackingAction::~Par02TrackingAction() = default;
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -65,7 +65,7 @@ void Par02TrackingAction::PreUserTrackingAction( const G4Track* aTrack ) {
|
||||
|
||||
void Par02TrackingAction::PostUserTrackingAction( const G4Track* aTrack ) {
|
||||
if ( aTrack->GetTrackStatus() == fStopAndKill && aTrack->GetParentID() == 0 ) {
|
||||
Par02PrimaryParticleInformation* info = (Par02PrimaryParticleInformation*)
|
||||
auto info = (Par02PrimaryParticleInformation*)
|
||||
aTrack->GetDynamicParticle()->GetPrimaryParticle()->GetUserInformation();
|
||||
//info->Print();
|
||||
Par02Output::Instance()->SaveTrack( Par02Output::eSaveMC,
|
||||
|
||||
Reference in New Issue
Block a user