Changeset 1347 for trunk/source/geometry/navigation/include/G4VoxelNavigation.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/G4VoxelNavigation.hh (modified) (7 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VoxelNavigation.hh,v 1.5 2007/05/11 13:43:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VoxelNavigation.hh,v 1.8 2010/11/04 12:13:30 japost Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // 
@@ -44 +44 @@
 #include "geomdefs.hh"
 #include "G4NavigationHistory.hh"
+#include "G4NavigationLogger.hh"
 #include "G4AffineTransform.hh"
 #include "G4VPhysicalVolume.hh"
@@ -51 +52 @@
 
 #include "G4BlockingList.hh"
+
+class G4VoxelSafety; 
 
 // Required for inline implementation
@@ -98 +101 @@
 
     inline G4int GetVerboseLevel() const;
-    inline void  SetVerboseLevel(G4int level);
+    void  SetVerboseLevel(G4int level);
       // Get/Set Verbose(ness) level.
       // [if level>0 && G4VERBOSE, printout can occur]
@@ -107 +110 @@
       // Is effective only with G4VERBOSE set.
 
+    inline void  EnableBestSafety( G4bool flag= false );
+      // Enable best-possible evaluation of isotropic safety
+
   protected:
 
@@ -113 +119 @@
                             const G4ThreeVector& localDirection,
                             const G4double currentStep );
+
+    G4SmartVoxelNode* VoxelLocateLight( G4SmartVoxelHeader* pHead,
+                                        const G4ThreeVector& localPoint ) const;
+
+  private:  // Logging functions
+
+    void PreComputeStepLog  (const G4VPhysicalVolume* motherPhysical,
+                                   G4double motherSafety,
+                             const G4ThreeVector& localPoint);
+    void AlongComputeStepLog(const G4VSolid* sampleSolid,
+                             const G4ThreeVector& samplePoint,
+                             const G4ThreeVector& sampleDirection,
+                             const G4ThreeVector& localDirection,
+                                   G4double sampleSafety,
+                                   G4double sampleStep);
+    void PostComputeStepLog (const G4VSolid* motherSolid,
+                             const G4ThreeVector& localPoint,
+                             const G4ThreeVector& localDirection,
+                                   G4double motherStep,
+                                   G4double motherSafety);
+    void ComputeSafetyLog   (const G4VSolid* solid,
+                             const G4ThreeVector& point,
+                                   G4double safety,
+                                   G4bool banner);
+    inline void PrintDaughterLog (const G4VSolid* sampleSolid,
+                                  const G4ThreeVector& samplePoint,
+                                        G4double sampleSafety,
+                                        G4double sampleStep);   
+  protected:
 
     G4BlockingList fBList;
@@ -147 +182 @@
     //
 
+    G4VoxelSafety  *fpVoxelSafety;
+    //  Helper object for Voxel Safety
+
     G4bool fCheck;
-    G4int  fVerbose;
-    G4double kCarTolerance;
+    G4bool fBestSafety; 
+
+    G4NavigationLogger* fLogger;
+      // Verbosity logger
 };