Import Geant4 6.2.0 source tree

source/geometry/navigation/include/G4Navigator.hh

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4Navigator.hh,v 1.5 2004/03/10 18:21:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-06-01 $
+// $Id: G4Navigator.hh,v 1.8 2004/06/18 12:47:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-06-02 $
 //
 //
 // class G4Navigator
@@ -355,22 +355,32 @@ class G4Navigator
   G4ThreeVector fGrandMotherExitNormal;  // Leaving volume normal, in its 
                                          // own coordinate system
   G4NavigationHistory fHistory;
-                                // Transformation & `path' history
-                                // of current path through geomtrical
-                                // hierarchy
+    // Transformation & `path' history of current path
+    // through geomtrical hierarchy
 
-  G4bool  fLastStepWasZero;
-                                // Whether the last ComputeStep moved Zero
-                                //  Used to check for edges.
-  G4bool  fLocatedOnEdge;       
-                                // Whether the Navigator has detected an edge
+  // Count zero steps - as one or two can occur due to changing momentum at
+  //                    a boundary or at an edge common between volumes
+  //                  - several are likely a problem in the geometry
+  //                    description or in the navigation
+  //
+  G4bool fLastStepWasZero;
+    // Whether the last ComputeStep moved Zero. Used to check for edges.
+
+  G4bool fLocatedOnEdge;       
+    // Whether the Navigator has detected an edge
+  G4int fNumberZeroSteps;
+    // Number of preceding moves that were Zero. Reset to 0 after finite step
+  G4int fActionThreshold_NoZeroSteps;  
+    // After this many failed/zero steps, act (push etc) 
+  G4int fAbandonThreshold_NoZeroSteps; 
+    // After this many failed/zero steps, abandon track
 
   G4ThreeVector  fPreviousSftOrigin;
   G4double       fPreviousSafety; 
-                                // Memory of last safety origin & value.
-                                //  Used in ComputeStep to ensure that
-                                //  origin of current Step is in the same
-                                //  volume as the point of the last relocation.
+    // Memory of last safety origin & value. Used in ComputeStep to ensure
+    // that origin of current Step is in the same volume as the point of the
+    // last relocation
+
   //
   // END State information
   //
@@ -393,6 +403,8 @@ class G4Navigator
 
   G4bool fCheck;
     // Check-mode flag  [if true, more strict checks are performed].
+  G4bool fPushed;
+    // Push flag  [if true, means a stuck particle has been pushed].
   G4int  fVerbose;
     // Verbose(ness) level  [if > 0, printout can occur].