Changeset 1347 for trunk/source/geometry/navigation/src/G4TransportationManager.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/geometry/navigation/src/G4TransportationManager.cc (modified) (5 diffs)

trunk/source/geometry/navigation/src/G4TransportationManager.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4TransportationManager.cc,v 1.15 2007/04/12 11:51:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4TransportationManager.cc,v 1.16 2010/07/13 15:59:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 //
@@ -56 +56 @@
 G4TransportationManager::G4TransportationManager() 
 { 
-  if (!fTransportationManager)
-  {
-    // Create the navigator for tracking and activate it; add to collections
-    //
-    G4Navigator* trackingNavigator = new G4Navigator();
-    trackingNavigator->Activate(true);
-    fNavigators.push_back(trackingNavigator);
-    fActiveNavigators.push_back(trackingNavigator);
-    fWorlds.push_back(trackingNavigator->GetWorldVolume()); // NULL registered
-
-    fGeomMessenger     = new G4GeometryMessenger(this);
-    fFieldManager      = new G4FieldManager();
-    fPropagatorInField = new G4PropagatorInField(trackingNavigator,
-                                                 fFieldManager);
-    fSafetyHelper      = new G4SafetyHelper();
-  }
-  else
+  if (fTransportationManager)
   {
     G4cerr << "Only ONE instance of G4TransportationManager is allowed!"
@@ -80 +64 @@
                 "Only ONE instance of G4TransportationManager is allowed!");
   }
+
+  // Create the navigator for tracking and activate it; add to collections
+  //
+  G4Navigator* trackingNavigator = new G4Navigator();
+  trackingNavigator->Activate(true);
+  fNavigators.push_back(trackingNavigator);
+  fActiveNavigators.push_back(trackingNavigator);
+  fWorlds.push_back(trackingNavigator->GetWorldVolume()); // NULL registered
+
+  fGeomMessenger    = new G4GeometryMessenger(this);
+  fFieldManager     = new G4FieldManager();
+  fPropagatorInField= new G4PropagatorInField(trackingNavigator,fFieldManager);
+  fSafetyHelper     = new G4SafetyHelper();
 } 
 
@@ -329 +326 @@
    std::vector<G4Navigator*>::iterator pNav =
      std::find(fNavigators.begin(), fNavigators.end(), aNavigator);
-   if (pNav == fNavigators.end())
+   if (pNav != fNavigators.end())
+   {
+      (*pNav)->Activate(false);
+   }
+   else
    {
       G4String message
@@ -337 +338 @@
                   "NoEffect", JustWarning, message);
    }
-   else
-   {
-      (*pNav)->Activate(false);
-   }
+
    std::vector<G4Navigator*>::iterator pActiveNav =
      std::find(fActiveNavigators.begin(), fActiveNavigators.end(), aNavigator);