Merge 7927e32 into f4b7e17

MethodicalAcceleratorDesign · Sep 25, 2018 · 174de85 · 174de85
2 parents f4b7e17 + 7927e32
commit 174de85
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/trrun.f90 b/src/trrun.f90
@@ -2841,8 +2841,8 @@ subroutine trcoll(apertype, aperture, offset, al_errors, maxaper, &
         !*** case of racetrack: test outer rectangle (ap1,ap2) first
         !    then test ellipse for corner part.
         lost =  x .gt. ap1 .or. y .gt. ap2 .or. &
-             ( x .gt. ap1-ap3 .and. y .gt. ap2-ap3 .and. &
-               ((x-(ap1-ap3)) / ap3)**2 + ((y-(ap2-ap3)) / ap4)**2 .gt. one )
+             ( x .gt. ap1-ap3 .and. y .gt. ap2-ap4 .and. &
+               ((x-(ap1-ap3)) / ap3)**2 + ((y-(ap2-ap4)) / ap4)**2 .gt. one )
 
      case ("octagon")
         ! 2015-Feb-20  18:42:26  ghislain: added octagon shape