Import Geant4 10.5.0 source tree

source/track/src/G4FieldTrackUpdator.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4FieldTrackUpdator.cc 90644 2015-06-05 13:19:36Z gcosmo $
 //
 //   M. Asai - first implementation Apr/28/2006
 //

source/track/src/G4ParticleChange.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParticleChange.cc 92776 2015-09-16 06:57:55Z gcosmo $
 //
 // 
 // --------------------------------------------------------------

source/track/src/G4ParticleChangeForDecay.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParticleChangeForDecay.cc 93028 2015-09-30 16:09:00Z gcosmo $
 //
 // 
 // --------------------------------------------------------------

source/track/src/G4ParticleChangeForGamma.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParticleChangeForGamma.cc 68795 2013-04-05 13:24:46Z gcosmo $
 //
 //
 // --------------------------------------------------------------

source/track/src/G4ParticleChangeForLoss.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParticleChangeForLoss.cc 68795 2013-04-05 13:24:46Z gcosmo $
 //
 //
 // --------------------------------------------------------------

source/track/src/G4ParticleChangeForMSC.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParticleChangeForMSC.cc 68795 2013-04-05 13:24:46Z gcosmo $
 //
 // 
 // --------------------------------------------------------------

source/track/src/G4ParticleChangeForTransport.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParticleChangeForTransport.cc 87698 2014-12-17 09:41:28Z gcosmo $
 //
 // 
 // --------------------------------------------------------------

source/track/src/G4Step.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4Step.cc 68795 2013-04-05 13:24:46Z gcosmo $
 //
 //
 //---------------------------------------------------------------
@@ -57,9 +56,9 @@ G4Step::G4Step()
      fpSteppingControlFlag(NormalCondition),
      fFirstStepInVolume(false),
      fLastStepInVolume(false),
-     fSecondary(0),
-     nSecondaryByLastStep(0), secondaryInCurrentStep(),
-     fpVectorOfAuxiliaryPointsPointer(0)
+     fSecondary(nullptr),
+     nSecondaryByLastStep(0), secondaryInCurrentStep(nullptr),
+     fpVectorOfAuxiliaryPointsPointer(nullptr)
 {
   fpPreStepPoint  = new G4StepPoint();
   fpPostStepPoint = new G4StepPoint();
@@ -72,15 +71,19 @@ G4Step::~G4Step()
 /////////////////
 {
   delete fpPreStepPoint;
+  fpPreStepPoint = nullptr;
   delete fpPostStepPoint;
+  fpPostStepPoint = nullptr;
 
   secondaryInCurrentStep->clear();
   delete secondaryInCurrentStep;
+  secondaryInCurrentStep = nullptr;
 
-  if (fSecondary !=0 ) {
+  if (fSecondary != nullptr ) {
     fSecondary->clear();
     delete fSecondary;
   }
+  fSecondary = nullptr;
 }
 
 // Copy Counstructor and assignment operator
@@ -99,22 +102,24 @@ G4Step::G4Step(const G4Step& right)
      secondaryInCurrentStep(right.secondaryInCurrentStep),
      fpVectorOfAuxiliaryPointsPointer(right.fpVectorOfAuxiliaryPointsPointer)
 {
-  if (right.fpPreStepPoint !=0) {
+  if (right.fpPreStepPoint != nullptr) {
     fpPreStepPoint  = new G4StepPoint(*(right.fpPreStepPoint));
   } else {
     fpPreStepPoint  = new G4StepPoint();
   }
-  if (right.fpPostStepPoint !=0) {
+  if (right.fpPostStepPoint != nullptr) {
     fpPostStepPoint  = new G4StepPoint(*(right.fpPostStepPoint));
   } else {
     fpPostStepPoint  = new G4StepPoint();
   }
-
-  if (right.fSecondary !=0) {
+ 
+  if (right.fSecondary != nullptr) {
     fSecondary = new G4TrackVector(*(right.fSecondary));
   } else {
     fSecondary = new G4TrackVector();
   }
+
+  // secondaryInCurrentStep is cleared 
   secondaryInCurrentStep = new std::vector<CT>;
 }
 
@@ -134,24 +139,36 @@ G4Step& G4Step::operator=(const G4Step & right)
     secondaryInCurrentStep = right.secondaryInCurrentStep;
     fpVectorOfAuxiliaryPointsPointer = right.fpVectorOfAuxiliaryPointsPointer;
 
-    if (fpPreStepPoint !=0 ) delete fpPreStepPoint;
-    if (right.fpPreStepPoint !=0) {
+    if (fpPreStepPoint != nullptr ) delete fpPreStepPoint;
+    if (right.fpPreStepPoint != nullptr) {
       fpPreStepPoint  = new G4StepPoint(*(right.fpPreStepPoint));
     } else {
       fpPreStepPoint  = new G4StepPoint();
     }
-    if (fpPostStepPoint !=0 ) delete fpPostStepPoint;
-    if (right.fpPostStepPoint !=0) {
+    if (fpPostStepPoint !=nullptr ) delete fpPostStepPoint;
+    if (right.fpPostStepPoint != nullptr) {
       fpPostStepPoint  = new G4StepPoint(*(right.fpPostStepPoint));
     } else {
       fpPostStepPoint  = new G4StepPoint();
     }
-    if (right.fSecondary !=0) {
+    
+    if (fSecondary != nullptr ) {
+      fSecondary->clear();
+      delete fSecondary;
+    }
+    if (right.fSecondary != nullptr) {
       fSecondary = new G4TrackVector(*(right.fSecondary));
     } else {
       fSecondary = new G4TrackVector();
     }
-  }
+    
+    // secondaryInCurrentStep is not copied 
+    if ( secondaryInCurrentStep != nullptr ) {
+      secondaryInCurrentStep->clear();
+      delete secondaryInCurrentStep;
+    }
+    secondaryInCurrentStep = new std::vector<CT>;
+   }
   return *this;
 }
 

source/track/src/G4StepPoint.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4StepPoint.cc 68795 2013-04-05 13:24:46Z gcosmo $
 //
 //
 //---------------------------------------------------------------
@@ -48,9 +47,11 @@
 G4StepPoint::G4StepPoint()
 //////////////////////////
   : fGlobalTime(0.), fLocalTime(0.), fProperTime(0.),
-    fKineticEnergy(0.), fVelocity(0.), fpTouchable(0), fpMaterial(0),
-    fpMaterialCutsCouple(0), fpSensitiveDetector(0), fSafety(0.),
-    fStepStatus(fUndefined),fpProcessDefinedStep(0), 
+    fKineticEnergy(0.), fVelocity(0.), 
+    fpTouchable(0), fpMaterial(nullptr), fpMaterialCutsCouple(nullptr), 
+    fpSensitiveDetector(nullptr), 
+    fSafety(0.),
+    fStepStatus(fUndefined), fpProcessDefinedStep(nullptr), 
     fMass(0.), fCharge(0.), fMagneticMoment(0.),
     fWeight(0.)
 {

source/track/src/G4Track.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4Track.cc 110263 2018-05-17 14:28:14Z gcosmo $
 //
 //
 //---------------------------------------------------------------
@@ -75,19 +74,19 @@ G4Track::G4Track(G4DynamicParticle* apValueDynamicParticle,
     fTrackStatus(fAlive),
     fBelowThreshold(false),   fGoodForTracking(false),
     fStepLength(0.0),         fWeight(1.0),
-    fpStep(0),
+    fpStep(nullptr),
     fVtxKineticEnergy(0.0),
-    fpLVAtVertex(0),          fpCreatorProcess(0),
+    fpLVAtVertex(nullptr),          fpCreatorProcess(nullptr),
     fCreatorModelIndex(-1),
-    fpUserInformation(0),
-    prev_mat(0),  groupvel(0),
+    fpUserInformation(nullptr),
+    prev_mat(nullptr),  groupvel(nullptr),
     prev_velocity(0.0), prev_momentum(0.0),
     is_OpticalPhoton(false),
     useGivenVelocity(false),
-    fpAuxiliaryTrackInformationMap(0)
+    fpAuxiliaryTrackInformationMap(nullptr)
 {
   static G4ThreadLocal G4bool isFirstTime = true;
-  static G4ThreadLocal G4ParticleDefinition* fOpticalPhoton =0;
+  static G4ThreadLocal G4ParticleDefinition* fOpticalPhoton = nullptr;
   if ( isFirstTime ) {
     isFirstTime = false;
     // set  fOpticalPhoton
@@ -96,7 +95,7 @@ G4Track::G4Track(G4DynamicParticle* apValueDynamicParticle,
   // check if the particle type is Optical Photon
   is_OpticalPhoton = (fpDynamicParticle->GetDefinition() == fOpticalPhoton);
 
-  if (velTable() ==0 ) velTable() = G4VelocityTable::GetVelocityTable();
+  if (velTable() == nullptr ) velTable() = G4VelocityTable::GetVelocityTable();
 
   fVelocity = CalculateVelocity();
 
@@ -110,20 +109,20 @@ G4Track::G4Track()
     fTrackLength(0.),
     fParentID(0),             fTrackID(0),
     fVelocity(c_light),
-    fpDynamicParticle(0),
+    fpDynamicParticle(nullptr),
     fTrackStatus(fAlive),
     fBelowThreshold(false),   fGoodForTracking(false),
     fStepLength(0.0),         fWeight(1.0),
-    fpStep(0),
+    fpStep(nullptr),
     fVtxKineticEnergy(0.0),
-    fpLVAtVertex(0),          fpCreatorProcess(0),
+    fpLVAtVertex(nullptr),          fpCreatorProcess(nullptr),
     fCreatorModelIndex(-1),
-    fpUserInformation(0),
-    prev_mat(0),  groupvel(0),
+    fpUserInformation(nullptr),
+    prev_mat(nullptr),  groupvel(nullptr),
     prev_velocity(0.0), prev_momentum(0.0),
     is_OpticalPhoton(false),
     useGivenVelocity(false),
-    fpAuxiliaryTrackInformationMap(0)
+    fpAuxiliaryTrackInformationMap(nullptr)
 {
 }
 
@@ -135,20 +134,20 @@ G4Track::G4Track(const G4Track& right)
     fTrackLength(0.),
     fParentID(0),             fTrackID(0),
     fVelocity(c_light),
-    fpDynamicParticle(0),
+    fpDynamicParticle(nullptr),
     fTrackStatus(fAlive),
     fBelowThreshold(false),   fGoodForTracking(false),
     fStepLength(0.0),         fWeight(1.0),
-    fpStep(0),
+    fpStep(nullptr),
     fVtxKineticEnergy(0.0),
-    fpLVAtVertex(0),          fpCreatorProcess(0),
+    fpLVAtVertex(nullptr),          fpCreatorProcess(nullptr),
     fCreatorModelIndex(-1),
-    fpUserInformation(0),
-    prev_mat(0),  groupvel(0),
+    fpUserInformation(nullptr),
+    prev_mat(nullptr),  groupvel(nullptr),
     prev_velocity(0.0), prev_momentum(0.0),
     is_OpticalPhoton(false),
     useGivenVelocity(false),
-    fpAuxiliaryTrackInformationMap(0)
+    fpAuxiliaryTrackInformationMap(nullptr)
 {
   *this = right;
 }
@@ -158,7 +157,9 @@ G4Track::~G4Track()
 ///////////////////
 {
    delete fpDynamicParticle;
+   fpDynamicParticle = nullptr;
    delete fpUserInformation;
+   fpUserInformation = nullptr;
    ClearAuxiliaryTrackInformation();
 }
 
@@ -184,7 +185,8 @@ G4Track & G4Track::operator=(const G4Track &right)
    // velocity information 
    fVelocity = right.fVelocity;
 
-   // dynamic particle information 
+   // dynamic particle information
+   if (  fpDynamicParticle != nullptr ) delete fpDynamicParticle;
    fpDynamicParticle = new G4DynamicParticle(*(right.fpDynamicParticle));
  
    // track status and flags for tracking  
@@ -194,7 +196,7 @@ G4Track & G4Track::operator=(const G4Track &right)
    
    // Step information (Step Length, Step Number, pointer to the Step,) 
    // are not copied
-   fpStep=0;
+   fpStep = nullptr;
 
    // vertex information
    fVtxPosition = right.fVtxPosition;
@@ -203,8 +205,9 @@ G4Track & G4Track::operator=(const G4Track &right)
    fVtxMomentumDirection = right.fVtxMomentumDirection;
 
    // CreatorProcess and UserInformation are not copied 
-   fpCreatorProcess = 0;
-   fpUserInformation = 0;
+   fpCreatorProcess = nullptr;
+   if ( fpUserInformation != nullptr ) delete fpUserInformation;
+   fpUserInformation = nullptr;
 
    prev_mat = right.prev_mat;
    groupvel = right.groupvel;
@@ -214,7 +217,8 @@ G4Track & G4Track::operator=(const G4Track &right)
    is_OpticalPhoton = right.is_OpticalPhoton;
    useGivenVelocity = right.useGivenVelocity; 
 
-   fpAuxiliaryTrackInformationMap = 0;
+   ClearAuxiliaryTrackInformation();
+
   }
   return *this;
 }
@@ -267,7 +271,7 @@ G4double G4Track::CalculateVelocityForOpticalPhoton() const
   G4double velocity = c_light ;
   
 
-  G4Material* mat=0; 
+  G4Material* mat = nullptr; 
   G4bool update_groupvel = false;
   if ( fpStep !=0  ){
     mat= this->GetMaterial();         //   Fix for repeated volumes
@@ -278,15 +282,15 @@ G4double G4Track::CalculateVelocityForOpticalPhoton() const
   }
   // check if previous step is in the same volume
     //  and get new GROUPVELOCITY table if necessary 
-  if ((mat != 0) && ((mat != prev_mat)||(groupvel==0))) {
-    groupvel = 0;
-    if(mat->GetMaterialPropertiesTable() != 0)
+  if ((mat != nullptr) && ((mat != prev_mat)||(groupvel==nullptr))) {
+    groupvel = nullptr;
+    if(mat->GetMaterialPropertiesTable() != nullptr)
       groupvel = mat->GetMaterialPropertiesTable()->GetProperty("GROUPVEL");
     update_groupvel = true;
   }
   prev_mat = mat;
   
-  if  (groupvel != 0 ) {
+  if  (groupvel != nullptr ) {
     // light velocity = c/(rindex+d(rindex)/d(log(E_phot)))
     // values stored in GROUPVEL material properties vector
     velocity =  prev_velocity;
@@ -348,10 +352,10 @@ void G4Track::SetAuxiliaryTrackInformation(G4int idx, G4VAuxiliaryTrackInformati
 G4VAuxiliaryTrackInformation* G4Track::GetAuxiliaryTrackInformation(G4int idx) const
 ///////////////////
 {
-  if(!fpAuxiliaryTrackInformationMap) return 0;
+  if(!fpAuxiliaryTrackInformationMap) return nullptr;
   std::map<G4int,G4VAuxiliaryTrackInformation*>::iterator itr
    = fpAuxiliaryTrackInformationMap->find(idx);
-  if(itr==fpAuxiliaryTrackInformationMap->end()) return 0;
+  if(itr==fpAuxiliaryTrackInformationMap->end()) return nullptr;
   else return (*itr).second;
 }
 
@@ -359,16 +363,17 @@ G4VAuxiliaryTrackInformation* G4Track::GetAuxiliaryTrackInformation(G4int idx) c
 void G4Track::RemoveAuxiliaryTrackInformation(G4int idx)
 ///////////////////
 {
-  if(fpAuxiliaryTrackInformationMap && idx>=0 && idx<G4PhysicsModelCatalog::Entries())
-      fpAuxiliaryTrackInformationMap->erase(idx);
+  if(   fpAuxiliaryTrackInformationMap != nullptr
+     && idx>=0 && idx<G4PhysicsModelCatalog::Entries()){
+    fpAuxiliaryTrackInformationMap->erase(idx);
+  }
 }
 
 ///////////////////
 void G4Track::RemoveAuxiliaryTrackInformation(G4String& name)
 ///////////////////
 {
-  if(fpAuxiliaryTrackInformationMap) 
-  {
+  if(fpAuxiliaryTrackInformationMap != nullptr) {
     G4int idx = G4PhysicsModelCatalog::GetIndex(name);
     RemoveAuxiliaryTrackInformation(idx);
   }
@@ -378,12 +383,12 @@ void G4Track::RemoveAuxiliaryTrackInformation(G4String& name)
 void G4Track::ClearAuxiliaryTrackInformation()
 ///////////////////
 {
-  if(!fpAuxiliaryTrackInformationMap) return;
+  if( fpAuxiliaryTrackInformationMap == nullptr) return;
   for(std::map<G4int,G4VAuxiliaryTrackInformation*>::iterator itr=fpAuxiliaryTrackInformationMap->begin();
       itr!=fpAuxiliaryTrackInformationMap->end(); itr++)
   { delete (*itr).second; }
   delete fpAuxiliaryTrackInformationMap;
-  fpAuxiliaryTrackInformationMap = 0;
+  fpAuxiliaryTrackInformationMap = nullptr;
 }
 
 

source/track/src/G4VAuxiliaryTrackInformation.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4VAuxiliaryTrackInformation.cc 66241 2012-12-13 18:34:42Z gunter $
 //
 // 
 // --------------------------------------------------------------

source/track/src/G4VParticleChange.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4VParticleChange.cc 92776 2015-09-16 06:57:55Z gcosmo $
 //
 // 
 // --------------------------------------------------------------

source/track/src/G4VUserTrackInformation.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4VUserTrackInformation.cc 68795 2013-04-05 13:24:46Z gcosmo $
 //
 // 
 // --------------------------------------------------------------

source/track/src/G4VelocityTable.cc

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-// $Id: G4VelocityTable.cc 107603 2017-11-27 07:21:59Z gcosmo $
 //
 //
 //---------------------------------------------------------------