From 9e2abf4ba44cbba10b9152624063222f5477340b Mon Sep 17 00:00:00 2001 From: Riccardo De Maria Date: Wed, 24 May 2023 10:04:50 +0200 Subject: [PATCH 1/3] fixes #1181 --- src/trrun.f90 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/trrun.f90 b/src/trrun.f90 index 1d0f3b04b..417298108 100644 --- a/src/trrun.f90 +++ b/src/trrun.f90 @@ -4663,14 +4663,12 @@ subroutine tttdipole(track, ktrack, code) f_errors = zero n_ferr = node_fd_errors(f_errors) if (k0.ne.0) then - f_errors(0) = f_errors(0) + k0*length - angle + k0 = k0 + f_errors(0)/length else - k0 = h + k0 = h + f_errors(0)/length endif - k0 = k0 * (one + ktap) ! tapering to main field only - - 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 From 3d06b0d2367b8328b83709dfa37f52a66900fb6d Mon Sep 17 00:00:00 2001 From: Riccardo De Maria Date: Fri, 26 May 2023 15:30:41 +0200 Subject: [PATCH 2/3] ktap on main field only --- src/trrun.f90 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/trrun.f90 b/src/trrun.f90 index 417298108..149d81cb7 100644 --- a/src/trrun.f90 +++ b/src/trrun.f90 @@ -4662,12 +4662,13 @@ subroutine tttdipole(track, ktrack, code) !---- Apply errors f_errors = zero n_ferr = node_fd_errors(f_errors) + ! tapering on the main field is applied consistently + ! with twiss, but needs to be revised if (k0.ne.0) then - k0 = k0 + f_errors(0)/length + k0 = k0 * (one + ktap) + f_errors(0)/length else - k0 = h + f_errors(0)/length + k0 = h * (one + ktap) + f_errors(0)/length endif - k0 = k0 * (one + ktap) ! tapering to main field only k1 = k1 + f_errors(2) / length ! quad term From b9d8a7178c058c9e9ce2e45e6a0285944f53c14a Mon Sep 17 00:00:00 2001 From: Riccardo De Maria Date: Fri, 26 May 2023 16:03:42 +0200 Subject: [PATCH 3/3] update changes --- Changes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes.md b/Changes.md index 67d44bb08..04198bc3b 100644 --- a/Changes.md +++ b/Changes.md @@ -1,4 +1,6 @@ MAD-X master +* Track + * [PR 1182](https://github.com/MethodicalAcceleratorDesign/MAD-X/pull/1182) Fix thick dipole tracking MAD-X release 5.09.00 (2023.05.05)