Bug correction

OpenGATE · Apr 19, 2024 · 66a46a7 · 66a46a7
1 parent 01041fa
commit 66a46a7
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/core/opengate_core/opengate_lib/GateKillNonInteractingParticleActor.cpp b/core/opengate_core/opengate_lib/GateKillNonInteractingParticleActor.cpp
@@ -40,6 +40,16 @@ void GateKillNonInteractingParticleActor::PreUserTrackingAction(const G4Track* t
 
 void GateKillNonInteractingParticleActor::SteppingAction(G4Step *step) {
 
+  G4String logNameMotherVolume = G4LogicalVolumeStore::GetInstance()->GetVolume(fMotherVolumeName)->GetName();
+   G4String physicalVolumeNamePreStep = step->GetPreStepPoint()->GetPhysicalVolume()->GetName();
+    if ((step->GetTrack()->GetLogicalVolumeAtVertex()->GetName()  != logNameMotherVolume) && (fIsFirstStep)){
+      if ((fPassedByTheMotherVolume == false) && (physicalVolumeNamePreStep == fMotherVolumeName) && (step->GetPreStepPoint()->GetStepStatus() == 1)){
+        fPassedByTheMotherVolume =true;
+        fKineticEnergyAtTheEntrance = step->GetPreStepPoint()->GetKineticEnergy();
+        ftrackIDAtTheEntrance = step->GetTrack()->GetTrackID();
+    }
+  }
+
   G4String logicalVolumeNamePostStep = step->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName();
   if ((fPassedByTheMotherVolume) && (step->GetPostStepPoint()->GetStepStatus() == 1)){
     if (std::find(fListOfVolumeAncestor.begin(), fListOfVolumeAncestor.end(),logicalVolumeNamePostStep  ) !=fListOfVolumeAncestor.end()){
@@ -50,16 +60,6 @@ void GateKillNonInteractingParticleActor::SteppingAction(G4Step *step) {
     }
   }
 }
-
-   G4String logNameMotherVolume = G4LogicalVolumeStore::GetInstance()->GetVolume(fMotherVolumeName)->GetName();
-   G4String physicalVolumeNamePreStep = step->GetPreStepPoint()->GetPhysicalVolume()->GetName();
-    if ((step->GetTrack()->GetLogicalVolumeAtVertex()->GetName()  != logNameMotherVolume) && (fIsFirstStep)){
-      if ((fPassedByTheMotherVolume == false) && (physicalVolumeNamePreStep == fMotherVolumeName) && (step->GetPreStepPoint()->GetStepStatus() == 1)){
-        fPassedByTheMotherVolume =true;
-        fKineticEnergyAtTheEntrance = step->GetPreStepPoint()->GetKineticEnergy();
-        ftrackIDAtTheEntrance = step->GetTrack()->GetTrackID();
-    }
-  }
 
   fIsFirstStep = false;
 }