Changeset 1347 for trunk/source/geometry/navigation/src/G4MultiNavigator.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/G4MultiNavigator.cc (modified) (8 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4MultiNavigator.cc,v 1.8 2008/10/24 14:00:03 gcosmo Exp $
+// $Id: G4MultiNavigator.cc,v 1.11 2010/09/06 09:49:15 gcosmo Exp $
 // GEANT4 tag $ Name:  $
 // 
@@ -48 +48 @@
 //
 G4MultiNavigator::G4MultiNavigator() 
-  : G4Navigator()
+  : G4Navigator(), fLastMassWorld(0)
 {
   fNoActiveNavigators= 0; 
-  G4ThreeVector Big3Vector( DBL_MAX, DBL_MAX, DBL_MAX ); 
+  G4ThreeVector Big3Vector( kInfinity, kInfinity, kInfinity ); 
   fLastLocatedPosition = Big3Vector;
   fSafetyLocation  = Big3Vector;
@@ -58 +58 @@
   fMinSafety_PreStepPt=  -1.0; 
   fMinSafety_atSafLocation= -1.0; 
-  fMinSafety= -DBL_MAX;  
-  fMinStep=   -DBL_MAX;  
-
-  for(register int num=0; num<= fMaxNav; ++num )
+  fMinSafety= -kInfinity;  
+  fTrueMinStep= fMinStep= -kInfinity;  
+
+  for(register int num=0; num< fMaxNav; ++num )
   {
     fpNavigator[num] =  0;   
     fLimitTruth[num] = false;
     fLimitedStep[num] = kUndefLimited;
-    fCurrentStepSize[num] = -1.0; 
+    fCurrentStepSize[num] = fNewSafety[num] = -1.0; 
     fLocatedVolume[num] = 0; 
   }
@@ -94 +94 @@
 {
   G4double safety= 0.0, step=0.0;
-  G4double minSafety= DBL_MAX, minStep= DBL_MAX;
+  G4double minSafety= kInfinity, minStep= kInfinity;
 
 #ifdef G4DEBUG_NAVIGATION
@@ -115 +115 @@
   for( register int num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num )
   {
-     safety= DBL_MAX;
+     safety= kInfinity;
 
      step= (*pNavigatorIter)->ComputeStep( initialPosition, 
@@ -189 +189 @@
                                    ELimited &limitedStep) 
 {
-  G4int navigatorNo=-1; 
-
-  if( navigatorId <= fNoActiveNavigators )
-  {
-     navigatorNo= navigatorId;
-  }
-  else
+  if( navigatorId > fNoActiveNavigators )
   { 
      G4cerr << "ERROR - G4MultiNavigator::ObtainFinalStep()"
@@ -206 +200 @@
 
   // Prepare the information to return
-  pNewSafety  = fNewSafety[ navigatorNo ]; 
-  limitedStep = fLimitedStep[ navigatorNo ];
+  //
+  pNewSafety  = fNewSafety[ navigatorId ]; 
+  limitedStep = fLimitedStep[ navigatorId ];
   minStep= fMinStep; 
 
-  // if( (minStep==kInfinity) || (fVerbose > 1) ){ 
-#ifdef G4DEBUG_NAVIGATION
-  if( fVerbose > 1 ){ 
-     G4cout << " G4MultiNavigator::ComputeStep returns " << fCurrentStepSize[ navigatorNo ]
-            << " for Navigator " << navigatorNo << " Limited step = " << limitedStep 
+#ifdef G4DEBUG_NAVIGATION
+  if( fVerbose > 1 )
+  { 
+     G4cout << " G4MultiNavigator::ComputeStep returns "
+            << fCurrentStepSize[ navigatorId ]
+            << " for Navigator " << navigatorId
+            << " Limited step = " << limitedStep 
             << " Safety(mm) = " << pNewSafety / mm << G4endl; 
   }
 #endif
 
-  return fCurrentStepSize[ navigatorNo ];
+  return fCurrentStepSize[ navigatorId ];
 }
 
@@ -428 +425 @@
     // Recompute safety for the relevant point
 
-    G4double minSafety = DBL_MAX, safety = DBL_MAX;
+    G4double minSafety = kInfinity, safety = kInfinity;
   
     std::vector<G4Navigator*>::iterator pNavigatorIter;