Merge pull request #846 from tpersson/dipole2drift

If 0 strength dipole -> drift
MethodicalAcceleratorDesign · Nov 6, 2019 · 160c1bb · 160c1bb
2 parents 6e6eb98 + 4c7a20d
commit 160c1bb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/trrun.f90 b/src/trrun.f90
@@ -5005,6 +5005,10 @@ subroutine tttdipole(track, ktrack, code)
   k0 = k0 + f_errors(0) / length ! dipole term
   k1 = k1 + f_errors(2) / length ! quad term
 
+  if (k0.eq.zero .and. k1.eq.zero) then
+     call ttdrf(length,track,ktrack);
+     return
+  endif
   !---- Apply entrance dipole edge effect
   if (node_value('kill_ent_fringe ') .eq. zero) &
        call ttdpdg_map(track, ktrack, e1, h1, hgap, fint, zero)