Skip to content

Commit cbd669b

Browse files
madcernmadcern
authored
Merge pull request #950 from tpersson/fixMissingBV
Fixing missing BV flag for dipole fringe
2 parents 41670e7 + 277c98a commit cbd669b

24 files changed

+40418
-39747
lines changed

‎src/mad_6track.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3400,7 +3400,8 @@ write_f3_wire(void)
34003400
}
34013401

34023402
fprintf(f3,name_format_short,current_element->name);
3403-
for(int i=1; i < 9; i++) fprintf(f3,name_format_6, current_element->value[i]);
3403+
fprintf(f3, "%d", (int)current_element->value[1]);
3404+
for(int i=2; i < 9; i++) fprintf(f3,name_format_6, current_element->value[i]);
34043405
fprintf(f3,"\n");
34053406
}
34063407
current_element = current_element->next;

‎src/twiss.f90‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,16 +3618,17 @@ SUBROUTINE tmbend(ftrk,fcentre,orbit,fmap,el,dl,ek,re,te,code)
36183618
fintx = g_elpar(b_fintx)
36193619
sks = g_elpar(b_k1s)
36203620
h = an / el
3621-
h_k = h
3621+
h_k = h * bvk
36223622
!---- Apply field errors and change coefficients using DELTAP.
36233623
F_ERRORS = zero
36243624
n_ferr = node_fd_errors(f_errors)
36253625
if (sk0 .ne. 0) then
36263626
f_errors(0) = f_errors(0) + sk0*el - g_elpar(b_angle)
3627-
h_k = sk0
3627+
h_k = sk0 * bvk
36283628
endif
36293629

36303630

3631+
36313632

36323633
!! if (sk0*el .ne. g_elpar(b_angle)) then
36333634
!! call element_name(name,len(name))

‎tests/test-cororbit-2/corr.ref‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1 0 1.004852e+01 2.636123e+00 9.581877e-01 8.998692e-02 5.343926e+00 2.511470e+00
1+
1 0 1.006046e+01 2.637702e+00 9.588439e-01 9.004260e-02 5.350301e+00 2.513009e+00

‎tests/test-cororbit-2/cx12.tab_1.ref‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@ NAME %05s "CORR1"
22
@ TYPE %05s "CORR1"
33
@ TITLE %62s "LHC 6.503 with errors and two beam orbit correction using MADX"
4-
@ ORIGIN %16s "5.05.02 Linux 64"
5-
@ DATE %08s "10/08/20"
6-
@ TIME %08s "13.26.36"
4+
@ ORIGIN %16s "5.06.00 Linux 64"
5+
@ DATE %08s "31/08/20"
6+
@ TIME %08s "16.54.22"
77
* NAME PX.OLD PY.OLD PX.CORRECTION PY.CORRECTION
88
$ %s %le %le %le %le
9-
"MCBXH.1R1" 0 0 -1.115668086e-06 0
9+
"MCBXH.1R1" 0 0 -1.115690418e-06 0
1010
"MCBXH.2R1" 0 0 0 0
1111
"MCBXH.3R1" 0 0 0 0
1212
"MCBXH.3L2" 0 0 0 0
@@ -17,8 +17,8 @@ $ %s %le %le %le
1717
"MCBXH.3R2" 0 0 0 0
1818
"MCBXH.3L5" 0 0 0 0
1919
"MCBXH.2L5" 0 0 0 0
20-
"MCBXH.1L5" 0 0 5.765931795e-07 0
21-
"MCBXH.1R5" 0 0 -1.08438951e-06 0
20+
"MCBXH.1L5" 0 0 5.765825041e-07 0
21+
"MCBXH.1R5" 0 0 -1.084404528e-06 0
2222
"MCBXH.2R5" 0 0 0 0
2323
"MCBXH.3R5" 0 0 0 0
2424
"MCBXH.3L8" 0 0 0 0
@@ -29,4 +29,4 @@ $ %s %le %le %le
2929
"MCBXH.3R8" 0 0 0 0
3030
"MCBXH.3L1" 0 0 0 0
3131
"MCBXH.2L1" 0 0 0 0
32-
"MCBXH.1L1" 0 0 2.271670499e-06 0
32+
"MCBXH.1L1" 0 0 2.271654094e-06 0

‎tests/test-cororbit-2/cx12.tab_2.ref‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@ NAME %05s "CORR2"
22
@ TYPE %05s "CORR2"
33
@ TITLE %62s "LHC 6.503 with errors and two beam orbit correction using MADX"
4-
@ ORIGIN %16s "5.05.02 Linux 64"
5-
@ DATE %08s "10/08/20"
6-
@ TIME %08s "13.26.36"
4+
@ ORIGIN %16s "5.06.00 Linux 64"
5+
@ DATE %08s "31/08/20"
6+
@ TIME %08s "16.54.22"
77
* NAME PX.OLD PY.OLD PX.CORRECTION PY.CORRECTION
88
$ %s %le %le %le %le
9-
"MCBXH.1R1" 0 0 -1.115668086e-06 0
9+
"MCBXH.1R1" 0 0 -1.115690418e-06 0
1010
"MCBXH.2R1" 0 0 0 0
1111
"MCBXH.3R1" 0 0 0 0
1212
"MCBXH.3L2" 0 0 0 0
@@ -17,8 +17,8 @@ $ %s %le %le %le
1717
"MCBXH.3R2" 0 0 0 0
1818
"MCBXH.3L5" 0 0 0 0
1919
"MCBXH.2L5" 0 0 0 0
20-
"MCBXH.1L5" 0 0 5.765931795e-07 0
21-
"MCBXH.1R5" 0 0 -1.08438951e-06 0
20+
"MCBXH.1L5" 0 0 5.765825041e-07 0
21+
"MCBXH.1R5" 0 0 -1.084404528e-06 0
2222
"MCBXH.2R5" 0 0 0 0
2323
"MCBXH.3R5" 0 0 0 0
2424
"MCBXH.3L8" 0 0 0 0
@@ -29,4 +29,4 @@ $ %s %le %le %le
2929
"MCBXH.3R8" 0 0 0 0
3030
"MCBXH.3L1" 0 0 0 0
3131
"MCBXH.2L1" 0 0 0 0
32-
"MCBXH.1L1" 0 0 2.271670499e-06 0
32+
"MCBXH.1L1" 0 0 2.271654094e-06 0

0 commit comments

Comments
 (0)