Changeset 1347 for trunk/source/geometry/navigation/src/G4GeomTestSegment.cc

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/geometry/navigation/src/G4GeomTestSegment.cc (modified) (8 diffs)

trunk/source/geometry/navigation/src/G4GeomTestSegment.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GeomTestSegment.cc,v 1.11 2007/11/16 09:39:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GeomTestSegment.cc,v 1.13 2010/08/20 09:03:54 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // --------------------------------------------------------------------
@@ -275 +275 @@
   G4bool entering;
   G4double vSurfN;
-  // G4cout<<"Entering Find Some Points vSearch="<<vSearch<<" p="<<p<<G4endl;
-  //
+ 
   // Look for nearest intersection point in the specified
   // direction and return if there isn't one
@@ -283 +282 @@
   switch(solid->Inside(p)) {
     case kInside:
-       dist = solid->DistanceToOut(p,vSearch);
-       // G4cout<<"Inside DistToOut="<<dist<<G4endl;
+      dist = solid->DistanceToOut(p,vSearch);
       if (dist >= kInfinity) {
         logger->SolidProblem( solid,
@@ -290 +288 @@
         return;
       }
-      
       s += sign*dist;
       entering = false;
@@ -296 +293 @@
     case kOutside:
       dist = solid->DistanceToIn(p,vSearch);
-      //G4cout<<"Outside DistToIn="<<dist<<G4endl;
       if (dist >= kInfinity) return;
-      
       s += sign*dist;
       entering = true;
       break;
     case kSurface:
-      vSurfN=vSearch.dot(solid->SurfaceNormal(p));
-      if(std::abs(vSurfN)<kCarTolerance)vSurfN=0;
+      vSurfN=v.dot(solid->SurfaceNormal(p));
+      if(std::fabs(vSurfN)<kCarTolerance)vSurfN=0;
       entering = (vSurfN < 0);
-      //G4cout<<"Surface SurfN="<<solid->SurfaceNormal(p)<<" v.dotN="<<vSurfN<<" entering="<<entering<<G4endl;
       break;
     default:
@@ -361 +355 @@
       //
       points.push_back( G4GeomTestPoint( p, s, entering==forward ) );
-      //G4cout<<"Add point p"<<p<<" s="<<s<<" entering="<<entering<<G4endl;
+      
     }
     
@@ -369 +363 @@
     if (entering) {
       dist = solid->DistanceToOut(p,vSearch);
-      //G4cout<<"if entering distToOut="<<dist<<G4endl;
       if (dist >= kInfinity) {
         logger->SolidProblem( solid,
@@ -389 +382 @@
         return;
       }
-
-       if(std::abs(dist)<=kCarTolerance){
-          G4double push = 1E-6;
-          s += sign*push;
-          p = p0 + s*v;
-          EInside inside = solid->Inside(p); 
-          if (inside == kOutside) {
-          entering = false;
-          break;
-        }
-      }
-
-      
+            
       entering = false;
     }
     else {
       dist = solid->DistanceToIn(p,vSearch);
-      //G4cout<<"if exiting distToIn="<<dist<<G4endl;
       if (dist >= kInfinity) return;