Fix geometry error in box corners

Fix a geometry error where a particle could get stuck in the corner of a box.
nrc-cnrc · Jan 21, 2019 · 92516c3 · 92516c3
1 parent 3f8ca80
commit 92516c3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/HEN_HOUSE/egs++/geometry/egs_box/egs_box.h b/HEN_HOUSE/egs++/geometry/egs_box/egs_box.h
@@ -236,8 +236,8 @@ class EGS_BOX_EXPORT EGS_Box : public EGS_BaseGeometry {
  }
  if (t1 < t) {
  EGS_Float y1 = xp.y + up.y*t1, z1 = xp.z + up.z*t1;
- if (2*y1 + ay >= 0 && 2*y1 - ay <= 0 &&
- 2*z1 + az >= 0 && 2*z1 - az <= 0) {
+ if (2*y1 + ay > 0 && 2*y1 - ay < 0 &&
+ 2*z1 + az > 0 && 2*z1 - az < 0) {
  t = t1;
  if (newmed) {
  *newmed = med;
@@ -273,8 +273,8 @@ class EGS_BOX_EXPORT EGS_Box : public EGS_BaseGeometry {
  }
  if (t1 < t) {
  EGS_Float x1 = xp.x + up.x*t1, z1 = xp.z + up.z*t1;
- if (2*x1 + ax >= 0 && 2*x1 - ax <= 0 &&
- 2*z1 + az >= 0 && 2*z1 - az <= 0) {
+ if (2*x1 + ax > 0 && 2*x1 - ax < 0 &&
+ 2*z1 + az > 0 && 2*z1 - az < 0) {
  t = t1;
  if (newmed) {
  *newmed = med;
@@ -310,8 +310,8 @@ class EGS_BOX_EXPORT EGS_Box : public EGS_BaseGeometry {
  }
  if (t1 < t) {
  EGS_Float x1 = xp.x + up.x*t1, y1 = xp.y + up.y*t1;
- if (2*x1 + ax >= 0 && 2*x1 - ax <= 0 &&
- 2*y1 + ay >= 0 && 2*y1 - ay <= 0) {
+ if (2*x1 + ax > 0 && 2*x1 - ax < 0 &&
+ 2*y1 + ay > 0 && 2*y1 - ay < 0) {
  t = t1;
  if (newmed) {
  *newmed = med;