Merge pull request #610 from hibtc/tmbend-interpolate-k0

Fix incorrect field errors in tmbend with INTERPOLATE
MethodicalAcceleratorDesign · Mar 28, 2018 · 49b4e7f · 49b4e7f
2 parents b7f4133 + ab90c58
commit 49b4e7f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/twiss.f90 b/src/twiss.f90
@@ -3539,12 +3539,6 @@ SUBROUTINE tmbend(ftrk,fcentre,orbit,fmap,el,dl,ek,re,te)
      sks = g_elpar(b_k1s)
      h = an / el
 
-     !---  calculate body slice from start (no exit fringe field):
-     if (dl .lt. el .and. .not. fcentre) then
-       el = dl
-       kill_exi_fringe = .true.
-     endif
-
      !---- Apply field errors and change coefficients using DELTAP.
      F_ERRORS = zero
      n_ferr = node_fd_errors(f_errors)
@@ -3560,6 +3554,12 @@ SUBROUTINE tmbend(ftrk,fcentre,orbit,fmap,el,dl,ek,re,te)
      sk2 = bvk * (sk2 + f_errors(4) / el) / (one + deltap) ! sext term
      sks = bvk * (sks + f_errors(3) / el) / (one + deltap) ! skew quad term
 
+     !---  calculate body slice from start (no exit fringe field):
+     if (dl .lt. el .and. .not. fcentre) then
+       el = dl
+       kill_exi_fringe = .true.
+     endif
+
      !---- Half radiation effects at entrance.
      if (ftrk .and. radiate) then
         ct = cos(tilt)