Import Geant4 10.6.2 source tree

examples/extended/exoticphysics/monopole/src/G4MonopolePhysics.cc

@@ -90,7 +90,11 @@ G4MonopolePhysics::~G4MonopolePhysics()
 
 void G4MonopolePhysics::ConstructParticle()
 {
-  fMpl = G4Monopole::MonopoleDefinition(fMonopoleMass, fMagCharge, fElCharge);
+  if(!fMpl) { 
+    fMpl = G4Monopole::MonopoleDefinition(fMonopoleMass, fMagCharge, fElCharge);
+  } else {
+    G4Monopole::Monopole();
+  }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/exoticphysics/monopole/src/G4MonopoleTransportation.cc

@@ -414,9 +414,6 @@ AlongStepGetPhysicalInteractionLength( const G4Track&  track,
 G4VParticleChange* G4MonopoleTransportation::AlongStepDoIt( 
                    const G4Track& track, const G4Step&  stepData )
 {
-  const G4ParticleDefinition* fOpticalPhoton =
-           G4ParticleTable::GetParticleTable()->FindParticle("opticalphoton");
-
   ++noCalls;
 
   fParticleChange.Initialize(track) ;
@@ -445,14 +442,7 @@ G4VParticleChange* G4MonopoleTransportation::AlongStepDoIt(
      G4double stepLength      = track.GetStepLength() ;
 
      deltaTime= 0.0;  // in case initialVelocity = 0 
-     const G4DynamicParticle* fpDynamicParticle = track.GetDynamicParticle();
-     if (fpDynamicParticle->GetDefinition()== fOpticalPhoton)
-     {
-        //  A photon is in the medium of the final point
-        //  during the step, so it has the final velocity.
-        deltaTime = stepLength/finalVelocity ;
-     }
-     else if (finalVelocity > 0.0)
+     if (finalVelocity > 0.0)
      {
         G4double meanInverseVelocity ;
         // deltaTime = stepLength/finalVelocity ;
@@ -464,7 +454,7 @@ G4VParticleChange* G4MonopoleTransportation::AlongStepDoIt(
      {
         deltaTime = stepLength/initialVelocity ;
      }
-     fCandidateEndGlobalTime   = startTime + deltaTime ;
+     fCandidateEndGlobalTime = startTime + deltaTime ;
   }
   else
   {