Add code to handle nonzero DELTAP for EXACT flag to TWISS

MethodicalAcceleratorDesign · Jun 22, 2022 · e4d7d90 · e4d7d90
1 parent 693518f
commit e4d7d90
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/twiss.f90 b/src/twiss.f90
@@ -7226,9 +7226,12 @@ SUBROUTINE tmdrf(fsec,ftrk,orbit,fmap,dl,ek,re,te)
          te(5,6,6) = -3*dl5*pp2*ptb
       endif
 
-      orbit(1) = orbit(1) + px*l_pz
-      orbit(3) = orbit(3) + py*l_pz
-      orbit(5) = orbit(5) + l_pz*(pt*(2*beti+pt)/(gamma*gamma) - px2 - py2)/(beta*beta*(ptb + beti*pz))
+      ek(1) = px*l_pz
+      ek(3) = py*l_pz
+      ek(5) = dl*dtbyds + l_pz*(pt*(2*beti+pt)/(gamma*gamma) - px2 - py2)/(beta*beta*(ptb + beti*pz))
+
+      if (ftrk) orbit(1:5:2) = orbit(1:5:2) + ek(1:5:2)
+
   else
 
      re(1,2) = dl