Import Geant4 9.6.0 source tree

source/geometry/navigation/src/G4MultiNavigator.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4MultiNavigator.cc,v 1.11 2010-09-06 09:49:15 gcosmo Exp $
+// $Id$
 // GEANT4 tag $ Name:  $
 // 
 // class G4PathFinder Implementation
@@ -32,16 +32,17 @@
 // Author:  John Apostolakis, November 2006
 // --------------------------------------------------------------------
 
+#include <iomanip>
+
 #include "G4MultiNavigator.hh"
 
 class G4FieldManager;
 
+#include "G4SystemOfUnits.hh"
 #include "G4Navigator.hh"
 #include "G4PropagatorInField.hh"
 #include "G4TransportationManager.hh"
 
-#include <iomanip>
-
 // ********************************************************************
 // Constructor
 // ********************************************************************
@@ -691,7 +692,7 @@ G4MultiNavigator::ResetHierarchyAndLocate(const G4ThreeVector &point,
 
 G4ThreeVector 
 G4MultiNavigator::GetGlobalExitNormal(const G4ThreeVector &argPoint,
-                                                    G4bool* argpObtained) // const
+                                      G4bool* argpObtained)  //  obtained valid
 {
   G4ThreeVector normalGlobalCrd(0.0, 0.0, 0.0); 
   G4bool isObtained= false; 
@@ -736,7 +737,9 @@ G4MultiNavigator::GetGlobalExitNormal(const G4ThreeVector &argPoint,
                 dotNewPrevious /= productMag; // Normalise
                 if( dotNewPrevious < (1 - perThousand) ) 
                 {
-                  if( dotNewPrevious <= 0.0 )
+                  *argpObtained= false; 
+
+                  if( fVerbose > 2 )  //  dotNewPrevious <= 0.0 )
                   {
                     std::ostringstream message;
                     message << "Clash of Normal from different Navigators!" << G4endl
@@ -746,7 +749,7 @@ G4MultiNavigator::GetGlobalExitNormal(const G4ThreeVector &argPoint,
                     message << "        Normal (previous) = " << normalGlobalCrd << G4endl;
                     message << "        Normal (current)  = " << newNormal       << G4endl;
                     G4Exception("G4MultiNavigator::GetGlobalExitNormal()", "GeomNav0002",
-                                FatalException, message); 
+                                JustWarning, message); 
                   }
                 }
                 else