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

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

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

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

@@ -25 +25 @@
 // ********************************************************************
 //
-// $Id: G4TessellatedSolid.cc,v 1.19 2009/04/27 08:06:27 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4TessellatedSolid.cc,v 1.20 2010/04/28 16:21:21 flei Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -42 +42 @@
 // CHANGE HISTORY
 // --------------
+//
+// 12 April 2010      P R Truscott, QinetiQ, bug fixes to treat optical
+//                    photon transport, in particular internal reflection
+//                    at surface.
 //
 // 14 November 2007   P R Truscott, QinetiQ & Stan Seibert, U Texas
@@ -670 +674 @@
     if ((*f)->Intersect(p,v,false,dist,distFromSurface,normal))
     {
+//
+//
+// Set minDist to the new distance to current facet if distFromSurface is in
+// positive direction and point is not at surface.  If the point is within
+// 0.5*kCarTolerance of the surface, then force distance to be zero and
+// leave member function immediately (for efficiency), as proposed by & credit
+// to Akira Okumura.
+//
       if (distFromSurface > 0.5*kCarTolerance && dist >= 0.0 && dist < minDist)
       {
         minDist  = dist;
+      }
+      else if (-0.5*kCarTolerance <= dist && dist <= 0.5*kCarTolerance)
+      {
+        return 0.0;
       }
     }