Changeset 1228 for trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc

Timestamp:

Jan 8, 2010, 11:56:51 AM (15 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

File:

• trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc (modified) (5 diffs)

trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc

@@ -25 +25 @@
 // ********************************************************************
 //
-// $Id: G4TessellatedSolid.cc,v 1.18 2008/03/13 11:58:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4TessellatedSolid.cc,v 1.19 2009/04/27 08:06:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -520 +520 @@
     } while (nearParallel && m!=maxTries);
 
+#ifdef G4VERBOSE
     if (m == maxTries)
     {
@@ -528 +529 @@
 // something wrong with geometry.
 //
+      G4cout.precision(16) ;
+      G4cout << G4endl ;
+      G4cout << "Solid name       = " << GetName()  << G4endl;
+      G4cout << "Geometry Type    = " << geometryType  << G4endl;
+      G4cout << "Number of facets = " << facets.size() << G4endl;
+      G4cout << "Position:"  << G4endl << G4endl ;
+      G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
+      G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
+      G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
       G4Exception("G4TessellatedSolid::Inside()",
-                "UnknownInsideOutside", FatalException,
+                "UnknownInsideOutside-MaxTries", JustWarning,
                 "Cannot determine whether point is inside or outside volume!");
     }
+#endif
 //
 //
@@ -550 +561 @@
       locationprime = kInside;
 
-    if (i == 0) location = locationprime;
+    if (i == 0)  { location = locationprime; }
+#ifdef G4VERBOSE
     else if (locationprime != location)
     {
@@ -558 +570 @@
 // geometry is not constructed correctly.
 //
+      G4cout.precision(16) ;
+      G4cout << G4endl ;
+      G4cout << "Solid name       = " << GetName()  << G4endl;
+      G4cout << "Geometry Type    = " << geometryType  << G4endl;
+      G4cout << "Number of facets = " << facets.size() << G4endl;
+      G4cout << "Position:"  << G4endl << G4endl ;
+      G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
+      G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
+      G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
       G4Exception("G4TessellatedSolid::Inside()",
-                "UnknownInsideOutside", FatalException,
+                "UnknownInsideOutside", JustWarning,
                 "Cannot determine whether point is inside or outside volume!");
     }
+#endif
   }