Changeset 1347 for trunk/source/geometry/navigation/include/G4Navigator.hh

Timestamp:

Dec 22, 2010, 3:52:27 PM (14 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/geometry/navigation/include/G4Navigator.hh (modified) (7 diffs)

trunk/source/geometry/navigation/include/G4Navigator.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Navigator.hh,v 1.29 2009/11/30 11:59:52 japost Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4Navigator.hh,v 1.34 2010/12/15 13:46:39 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 //
@@ -200 +200 @@
   inline G4GRSSolid* CreateGRSSolid() const; 
   inline G4TouchableHistory* CreateTouchableHistory() const;
+  inline G4TouchableHistory* CreateTouchableHistory(const G4NavigationHistory*) const;
     // `Touchable' creation methods: caller has deletion responsibility.
 
@@ -241 +242 @@
     // verifications and more strict correctness conditions.
     // Is effective only with G4VERBOSE set.
-  inline G4bool IsCheckModeActive() { return fCheck; } 
+  inline G4bool IsCheckModeActive() const;
+  inline void   SetPushVerbosity(G4bool mode);
+    // Set/unset verbosity for pushed tracks (default is true).
 
   void PrintState() const;
@@ -263 +266 @@
     //         9 (ready to abandon), 10 (abandoned)
 
-  // inline 
   void SetSavedState(); 
-  // ( fValidExitNormal, fExitNormal, fExiting, fEntering, 
-  //   fBlockedPhysicalVolume, fBlockedReplicaNo, fLastStepWasZero); 
-  // inline 
+    // ( fValidExitNormal, fExitNormal, fExiting, fEntering, 
+    //   fBlockedPhysicalVolume, fBlockedReplicaNo, fLastStepWasZero); 
   void RestoreSavedState(); 
     // Copy aspects of the state, to enable a non-state changing
     //  call to ComputeStep
-
- public:  // with description
 
   inline G4ThreeVector GetCurrentLocalCoordinate() const;
@@ -283 +282 @@
     // Compute+return the local->global translation/rotation of current volume.
 
+  inline void EnableBestSafety( G4bool value= false );
+    // Enable best-possible evaluation of isotropic safety
+
  protected:  // with description
+
   inline G4ThreeVector ComputeLocalPoint(const G4ThreeVector& rGlobPoint) const;
     // Return position vector in local coordinate system, given a position
@@ -310 +313 @@
     // o Recompute transforms and/or solids of replicated/parameterised
     //   volumes.
+
+ private:
+
+  void ComputeStepLog(const G4ThreeVector& pGlobalpoint,
+                            G4double moveLenSq) const;
+    // Log and checks for steps larger than the tolerance
 
  protected:  // without description
@@ -434 +443 @@
   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].
+  G4bool fPushed, fWarnPush;
+    // Push flags  [if true, means a stuck particle has been pushed].
 
   // Helpers/Utility classes