Import Geant4 1.0.0 source tree

source/geometry/volumes/src/G4TransportationManager.cc

@@ -1,12 +1,12 @@
 // This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
+// the GEANT4 collaboration.
 //
 // By copying, distributing or modifying the Program (or any work
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4TransportationManager.cc,v 1.2 1999/07/02 15:47:28 gunter Exp $
-// GEANT4 tag $Name: geant4-00-01 $
+// $Id: G4TransportationManager.cc,v 1.4.2.1 1999/12/07 20:48:44 gunter Exp $
+// GEANT4 tag $Name: geant4-01-00 $
 //
 //
 //  G4TransportationManager 
@@ -25,14 +25,26 @@
 G4Allocator<G4NavigationLevel>     aNavigationLevelAllocator;
 G4Allocator<G4NavigationLevelRep>  aNavigLevelRepAllocator;
 
-G4TransportationManager  G4TransportationManager::fTransportationManager;
+// Ditto: correct order initialisation of class (class) data members
+const G4double G4PropagatorInField::fDefault_Delta_Intersection_Val= 0.1 * mm;
+const G4double G4PropagatorInField::fDefault_Delta_One_Step_Value = 0.25 * mm;
+
+
+G4TransportationManager* G4TransportationManager::fTransportationManager=0;
 
 G4TransportationManager::G4TransportationManager() 
 { 
-  fNavigatorForTracking= new G4Navigator() ;
-  fFieldManager=         new G4FieldManager() ;
-  fPropagatorInField=    new G4PropagatorInField( fNavigatorForTracking,
+  if (!fTransportationManager)
+  {
+    fNavigatorForTracking= new G4Navigator() ;
+    fFieldManager=         new G4FieldManager() ;
+    fPropagatorInField=    new G4PropagatorInField( fNavigatorForTracking,
                                                     fFieldManager);
+  }
+  else
+  {
+    G4Exception("Only ONE instance of G4TransportationManager is allowed!");
+  }
 } 
 
 
@@ -42,3 +54,13 @@ G4TransportationManager::~G4TransportationManager()
   delete fPropagatorInField;
   delete fFieldManager; 
 }
+
+
+G4TransportationManager* G4TransportationManager::GetTransportationManager()
+{
+   static G4TransportationManager theInstance;
+   if (!fTransportationManager)
+     fTransportationManager = &theInstance;
+   
+   return fTransportationManager;
+}