Index: trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AuxiliaryNavServices.hh,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AuxiliaryNavServices.icc,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4BrentLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4BrentLocator.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4BrentLocator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BrentLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4BrentLocator
Index: trunk/source/geometry/navigation/include/G4DrawVoxels.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4DrawVoxels.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4DrawVoxels.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DrawVoxels.hh,v 1.3 2006/06/29 18:35:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPropagationNavigator.hh,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestErrorList.hh,v 1.3 2006/06/29 18:35:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestLogger.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestLogger.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestLogger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestLogger.hh,v 1.3 2006/06/29 18:35:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestOverlapList.hh,v 1.3 2006/06/29 18:35:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestOvershootList.hh,v 1.3 2006/06/29 18:35:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestPoint.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestPoint.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestPoint.hh,v 1.3 2006/06/29 18:35:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestSegment.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestSegment.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestSegment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestSegment.hh,v 1.4 2007/05/11 13:43:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestStreamLogger.hh,v 1.3 2006/06/29 18:35:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestVolPoint.hh,v 1.3 2006/06/29 18:35:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestVolume.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestVolume.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeomTestVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestVolume.hh,v 1.3 2006/06/29 18:35:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeometryMessenger.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeometryMessenger.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4GeometryMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryMessenger.hh,v 1.4 2006/06/29 18:35:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MultiLevelLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4MultiNavigator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4MultiNavigator.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4MultiNavigator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MultiNavigator.hh,v 1.5 2008/10/24 14:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4Navigator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4Navigator.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4Navigator.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Navigator.hh,v 1.28 2009/01/27 09:32:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4Navigator.hh,v 1.29 2009/11/30 11:59:52 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -237,8 +237,9 @@
     // Verify if the step has exited the mother volume.
 
-  inline void  CheckMode(G4bool mode);
+  inline void   CheckMode(G4bool mode);
     // Run navigation in "check-mode", therefore using additional
     // verifications and more strict correctness conditions.
     // Is effective only with G4VERBOSE set.
+  inline G4bool IsCheckModeActive() { return fCheck; } 
 
   void PrintState() const;
Index: trunk/source/geometry/navigation/include/G4Navigator.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4Navigator.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4Navigator.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Navigator.icc,v 1.15 2007/10/18 14:18:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4NormalNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4NormalNavigation.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4NormalNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NormalNavigation.hh,v 1.4 2006/06/29 18:36:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4NormalNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4NormalNavigation.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4NormalNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NormalNavigation.icc,v 1.4 2006/06/29 18:36:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisedNavigation.hh,v 1.6 2007/11/09 16:06:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisedNavigation.icc,v 1.7 2007/11/09 16:06:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4PathFinder.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4PathFinder.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4PathFinder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PathFinder.hh,v 1.34 2007/11/02 12:28:31 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // class G4PathFinder 
Index: trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhantomParameterisation.hh,v 1.5 2009/05/19 18:27:03 arce Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhantomParameterisation.icc,v 1.1 2007/10/17 19:13:58 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //--------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4PropagatorInField.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4PropagatorInField.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4PropagatorInField.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 // 
-// $Id: G4PropagatorInField.hh,v 1.17 2008/11/13 14:28:56 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4PropagatorInField.hh,v 1.19 2009/11/13 17:34:26 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -163,4 +163,6 @@
    inline G4VIntersectionLocator* GetIntersectionLocator();
    inline void SetIntersectionLocator(G4VIntersectionLocator *pLocator );
+     // Change or get the object which calculates the exact 
+     //  intersection point with the next boundary
  
  public:  // without description
@@ -168,9 +170,4 @@
    inline G4double  GetDeltaIntersection() const;
    inline G4double  GetDeltaOneStep() const;
-   inline void    SetAccuraciesWithDeltaOneStep( G4double deltaOneStep );  
-   inline void    SetDeltaIntersection( G4double deltaIntersection );
-   inline void    SetDeltaOneStep( G4double deltaOneStep );  
-     // The above 5 methods are obsolete and will not work, as they have been
-     // replaced by the same methods in G4FieldManager since Geant4 4.0 ...
 
    inline G4FieldManager*  GetCurrentFieldManager();
@@ -182,4 +179,11 @@
                                        G4int noAbandon );
    inline G4int GetThresholdNoZeroSteps( G4int i ); 
+
+   inline G4double  GetZeroStepThreshold(); 
+   inline void      SetZeroStepThreshold( G4double newLength ); 
+
+   void RefreshIntersectionLocator(); 
+     // Update the Locator with parameters from this class
+     //    and from current field manager
 
  protected:  // with description
@@ -243,4 +247,6 @@
    G4double  kCarTolerance;
      // Geometrical tolerance defining surface thickness
+   G4double  fZeroStepThreshold; 
+     // Threshold for counting of tiny or 'zero' steps
 
    G4VIntersectionLocator *fIntersectionLocator;
Index: trunk/source/geometry/navigation/include/G4PropagatorInField.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4PropagatorInField.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4PropagatorInField.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PropagatorInField.icc,v 1.13 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4PropagatorInField.icc,v 1.16 2009/11/13 17:34:26 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -110,4 +110,5 @@
 }
 
+// #if 0
 inline
 G4double G4PropagatorInField::GetDeltaIntersection() const
@@ -121,23 +122,5 @@
   return fCurrentFieldMgr->GetDeltaOneStep();
 }
-
-inline
-void
-G4PropagatorInField::SetAccuraciesWithDeltaOneStep( G4double valDeltaOneStep )
-{ 
-  fDetectorFieldMgr->SetAccuraciesWithDeltaOneStep(valDeltaOneStep);
-}
-
-inline
-void G4PropagatorInField::SetDeltaOneStep( G4double valDeltaOneStep )
-{ 
-  fDetectorFieldMgr->SetDeltaOneStep(valDeltaOneStep); 
-}
-
-inline
-void G4PropagatorInField::SetDeltaIntersection( G4double valDeltaIntersection )
-{
-  fDetectorFieldMgr->SetDeltaIntersection(valDeltaIntersection);
-}
+// #endif 
 
 inline
@@ -236,4 +219,10 @@
 }
 
+inline G4double  G4PropagatorInField::GetZeroStepThreshold(){ return fZeroStepThreshold; }
+inline void      G4PropagatorInField::SetZeroStepThreshold( G4double newLength )
+{ 
+  fZeroStepThreshold= newLength;
+}
+
 inline
 void G4PropagatorInField::SetDetectorFieldManager(G4FieldManager* newDetectorFieldManager)
@@ -259,5 +248,10 @@
 SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator )
 {
-  if(SimpleOrMultiNavigator)  { fNavigator= SimpleOrMultiNavigator; }
+  if(SimpleOrMultiNavigator)  { 
+     fNavigator= SimpleOrMultiNavigator; 
+     if( fIntersectionLocator ) {
+	 fIntersectionLocator->SetNavigatorFor( SimpleOrMultiNavigator );
+     }
+  }
 }
 
@@ -295,2 +289,3 @@
                           LinearStepLength,IntersectionPoint);
 }
+
Index: trunk/source/geometry/navigation/include/G4RegularNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4RegularNavigation.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4RegularNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegularNavigation.hh,v 1.2 2007/10/18 14:18:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegularNavigationHelper.hh,v 1.1 2009/01/27 09:31:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReplicaNavigation.hh,v 1.6 2007/05/18 07:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReplicaNavigation.icc,v 1.5 2006/06/29 18:36:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4SafetyHelper.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4SafetyHelper.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4SafetyHelper.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SafetyHelper.hh,v 1.7 2007/05/02 15:32:13 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4SimpleLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4SimpleLocator.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4SimpleLocator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SimpleLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4TransportationManager.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4TransportationManager.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4TransportationManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransportationManager.hh,v 1.12 2007/04/20 15:28:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4TransportationManager
Index: trunk/source/geometry/navigation/include/G4TransportationManager.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4TransportationManager.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4TransportationManager.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransportationManager.icc,v 1.10 2007/04/20 15:28:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // ------------------------------------------------------------
 //  GEANT 4  inlined function members implementation
Index: trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4VIntersectionLocator.hh,v 1.4 2008/11/14 18:26:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4VIntersectionLocator.hh,v 1.6 2009/11/30 11:39:15 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -95,23 +95,34 @@
        // whether an intersection occurred. NOTE: changes the Safety!
 
+     inline void    SetEpsilonStepFor( G4double EpsilonStep );
+     inline void    SetDeltaIntersectionFor( G4double deltaIntersection );
+     inline void    SetNavigatorFor( G4Navigator *fNavigator );
+     inline void    SetChordFinderFor(G4ChordFinder *fCFinder );
+       // These parameters must be set at each step, in case they were changed
+
+       // Note: This simple approach ensures that all scenarios are considered. 
+       //   [ Future refinement may identify which are invariant during a 
+       //      track, run or event ]
+
+    inline void     SetVerboseFor(G4int fVerbose);
+    inline G4int    GetVerboseFor();
+       // Controling verbosity enables checking of the locating of intersections
+
   public:  // without description
+    // Additional inline Set/Get methods for parameters, dependent objects
 
-    // inline Set/Get methods used for IntersctionLocator
+    inline G4double       GetDeltaIntersectionFor();
+    inline G4double       GetEpsilonStepFor();
+    inline G4Navigator*   GetNavigatorFor();
+    inline G4ChordFinder* GetChordFinderFor();
 
-    inline G4double  GetDeltaIntersectionFor();
-    inline G4double  GetEpsilonStepFor();
-    inline G4Navigator*  GetNavigatorFor();
-    inline G4ChordFinder*  GetChordFinderFor();
-    inline G4int  GetVerboseFor();
+    inline void   SetSafetyParametersFor(G4bool UseSafety );
 
-    inline void SetEpsilonStepFor( G4double EpsilonStep );
-    inline void SetDeltaIntersectionFor( G4double deltaIntersection );
-    inline void SetNavigatorFor( G4Navigator *fNavigator );
-    inline void SetChordFinderFor(G4ChordFinder *fCFinder );
-    inline void SetSafetyParametersFor(G4bool UseSafety );
-    inline void SetVerboseFor(G4int fVerbose);
-
-    inline void AddAdjustementOfFoundIntersection(G4bool UseCorrection);
+    inline void   AddAdjustementOfFoundIntersection(G4bool UseCorrection);
     inline G4bool GetAdjustementOfFoundIntersection();
+      // Methods to be made Obsolete - replaced by methods below
+    inline void   AdjustIntersections(G4bool UseCorrection); 
+    inline G4bool AreIntersectionsAdjusted(){ return fUseNormalCorrection; }  
+      // Change adjustment flag  ( New Interface ) 
 
   protected:  // with description
@@ -144,15 +155,17 @@
   protected:
 
-    G4double kCarTolerance;
-    G4int    fVerboseLevel;
-      // For verbose purposes
-    G4bool   fUseNormalCorrection;
+    G4double kCarTolerance;         // Constant
 
+    G4int    fVerboseLevel;          // For debugging
+    G4bool   fUseNormalCorrection;   // Configuration parameter
+
+    G4Navigator   *fiNavigator;
+      // Parameters set by G4PropagatorInField  ( when ? ) 
+
+    G4ChordFinder *fiChordFinder;
     G4double       fiEpsilonStep;
     G4double       fiDeltaIntersection;
-    G4Navigator   *fiNavigator;
-    G4ChordFinder *fiChordFinder;
     G4bool         fiUseSafety;
-      // For passing the parameters from G4PropagatorInField
+      // Parameters set at each physical step by calling method - G4PropagatorInField
 
     G4Navigator *fHelpingNavigator;
Index: trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VIntersectionLocator.icc,v 1.3 2008/11/14 18:26:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4VoxelNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4VoxelNavigation.hh	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4VoxelNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelNavigation.hh,v 1.5 2007/05/11 13:43:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4VoxelNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4VoxelNavigation.icc	(revision 1202)
+++ trunk/source/geometry/navigation/include/G4VoxelNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelNavigation.icc,v 1.4 2006/06/29 18:36:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
