Changeset 921 for trunk/source/geometry/navigation/src/G4PathFinder.cc

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/source/geometry/navigation/src/G4PathFinder.cc (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PathFinder.cc,v 1.59 2008/04/29 15:32:54 gcosmo Exp $
+// $Id: G4PathFinder.cc,v 1.61 2008/11/13 12:59:26 gcosmo Exp $
 // GEANT4 tag $ Name:  $
 // 
@@ -581 +581 @@
   if( (!fNewTrack) && ( longMoveEnd && longMoveSaf ) )
   {  
-     G4ThreeVector  LastSafetyLocation;
-       // Copy to keep last value - and restore
-
-     LastSafetyLocation= fSafetyLocation; 
-
      // Recompute ComputeSafety for end position
      //
      revisedSafety= ComputeSafety(lastEndPosition); 
-
-     // Reset the state of last call to ComputeSafety
-     //
-     ComputeSafety( LastSafetyLocation ); 
 
 #ifdef G4DEBUG_PATHFINDER
@@ -757 +748 @@
   
    std::vector<G4Navigator*>::iterator pNavigatorIter;
-   pNavigatorIter= fpTransportManager-> GetActiveNavigatorsIterator();
+   pNavigatorIter= fpTransportManager->GetActiveNavigatorsIterator();
 
    for( register G4int num=0; num<fNoActiveNavigators; ++pNavigatorIter,++num )
    {
-      G4double safety = (*pNavigatorIter)->ComputeSafety( position );
+      G4double safety = (*pNavigatorIter)->ComputeSafety( position,true );
       if( safety < minSafety ) { minSafety = safety; } 
       fNewSafetyComputed[num]= safety;
@@ -1183 +1174 @@
      for( numNav=0; numNav < fNoActiveNavigators; ++numNav )
      {
-        safety= fpNavigator[numNav]->ComputeSafety( startPoint );
+        safety= fpNavigator[numNav]->ComputeSafety( startPoint, false );
         fPreSafetyValues[numNav]= safety; 
         fCurrentPreStepSafety[numNav]= safety;