Merge branch develop into master for 2019a release

nrc-cnrc · May 3, 2019 · 00b70e1 · 00b70e1
2 parents c5537de + bce4233
commit 00b70e1
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/HEN_HOUSE/egs++/geometry/egs_cones/egs_cones.h b/HEN_HOUSE/egs++/geometry/egs_cones/egs_cones.h
@@ -1554,12 +1554,6 @@ class EGS_ConeStack : public EGS_BaseGeometry {
                 t = tp;                             // set t = distance to plane
             }
 
-            // If we are right on a plane, return -1
-            if(tp < boundaryTolerance) {
-                t = 0;
-                return -1;
-            }
-
             // distance to outer cone
             int ir = ireg - il*nmax;                // cone index in current layer
             bool hitc = false;                      // assume we don't hit the cone