Import Geant4 10.6.0 source tree

2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
@@ -47,6 +47,7 @@ GFlashHitMaker::GFlashHitMaker()
  fTouchableHandle   = new G4TouchableHistory(); // talk to ?@@@
  fpNavigator        = new G4Navigator();
  fNaviSetup         = false;
+  fWorldWithSdName   = "";
 }

 GFlashHitMaker::~GFlashHitMaker()
@@ -59,9 +60,14 @@ void GFlashHitMaker::make(GFlashEnergySpot * aSpot, const G4FastTrack * aT)
  // Locate the spot
  if (!fNaviSetup)
  {
-    fpNavigator->
-      SetWorldVolume(G4TransportationManager::GetTransportationManager()->
-                     GetNavigatorForTracking()->GetWorldVolume() );
+    // Choose the world volume that contains the sensitive detector based on its name (empty name for mass geometry)
+    G4VPhysicalVolume* worldWithSD = nullptr;
+    if(fWorldWithSdName.empty()) {
+      worldWithSD = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
+      } else {
+      worldWithSD = G4TransportationManager::GetTransportationManager()->GetParallelWorld(fWorldWithSdName);
+    }
+    fpNavigator->SetWorldVolume(worldWithSD);
    fpNavigator->
      LocateGlobalPointAndUpdateTouchable(aSpot->GetPosition(),
                                          fTouchableHandle(), false);