Skip to content

Commit aed28f8

Browse files
ldeniauldeniau
authored
Merge pull request #599 from tpersson/fixReplace
Fix the replace command that had unwanted side effects
2 parents cc74e98 + 31f6728 commit aed28f8

File tree

7 files changed

+179
-4
lines changed

7 files changed

+179
-4
lines changed

‎Makefile_test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ test-ptc-trackline test-ptc-trackline-2 test-ptc-trackline-3 \
8181
test-ptc-align test-ptc-align-2 \
8282
test-rfmultipole-ptc-1 \
8383
test-touschek test-touschek-2 \
84-
test-sequence test-sequence-2 test-sequence-3 test-sequence-4 test-sequence-5 test-sequence-6 \
84+
test-sequence test-sequence-2 test-sequence-3 test-sequence-4 test-sequence-5 test-sequence-6 test-sequence-7 \
8585
test-line \
8686
test-plot test-plot-2 \
8787
test-setknob test-fillknob\

‎src/mad_node.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -720,9 +720,8 @@ replace_one(struct node* node, struct element* el)
720720
add_to_node_list(node, 0, edit_sequ->nodes);
721721
node->p_elem = el;
722722

723-
/*node->base_name = el->base_type->name;*/
724-
strcpy(node->base_name, el->base_type->name);
725-
723+
node->base_name = el->base_type->name;
724+
//strcpy(node->base_name, el->base_type->name);
726725
node->length = el->length;
727726
if (strcmp(el->base_type->name, "rfcavity") == 0 &&
728727
find_element(el->name, edit_sequ->cavities) == NULL)

‎tests/test-sequence-7/test-sequence-7.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1-7 * skip # head
2+
7-$ * any abs=1e-12 rel=1.1e-5

‎tests/test-sequence-7/test-sequence-7.madx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
2+
option, echo, info, warn;
3+
bthin : multipole, knl={0,0.001};
4+
a: sbend, l=4.0;
5+
b: sbend, l=4.0;
6+
c: sbend, l=2.0;
7+
8+
myseq: sequence, l=50;
9+
a, at=10.0;
10+
b, at=20.0;
11+
endsequence;
12+
13+
14+
seqedit, sequence=myseq;
15+
replace, element=b, by=bthin;
16+
endedit;
17+
18+
beam;
19+
use, sequence=myseq;
20+
21+
select,flag=twiss, column=s, name,keyword,betx, bety;
22+
twiss, BETX=1,BETY=1, file="twiss.out";
23+
24+
stop;

‎tests/test-sequence-7/test-sequence-7.ref‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
2+
++++++++++++++++++++++++++++++++++++++++++++
3+
+ MAD-X 5.04.00 (64 bit, Linux) +
4+
+ Support: [email protected], http://cern.ch/mad +
5+
+ Release date: 2018.03.02 +
6+
+ Execution date: 2018.03.05 11:02:54 +
7+
++++++++++++++++++++++++++++++++++++++++++++
8+
9+
10+
option, echo, info, warn;
11+
12+
bthin : multipole, knl={0,0.001};
13+
14+
a: sbend, l=4.0;
15+
16+
b: sbend, l=4.0;
17+
18+
c: sbend, l=2.0;
19+
20+
21+
22+
myseq: sequence, l=50;
23+
24+
a, at=10.0;
25+
26+
b, at=20.0;
27+
28+
endsequence;
29+
30+
31+
32+
33+
34+
seqedit, sequence=myseq;
35+
36+
replace, element=b, by=bthin;
37+
38+
endedit;
39+
40+
++++++ info: seqedit - number of elements installed: 0
41+
++++++ info: seqedit - number of elements moved: 0
42+
++++++ info: seqedit - number of elements removed: 0
43+
++++++ info: seqedit - number of elements replaced: 1
44+
45+
46+
beam;
47+
48+
use, sequence=myseq;
49+
50+
51+
52+
select,flag=twiss, column=s, name,keyword,betx, bety;
53+
54+
twiss, BETX=1,BETY=1, file="twiss.out";
55+
56+
enter Twiss module
57+
58+
open line - error with deltap: 0.000000E+00
59+
initial orbit vector: 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
60+
final orbit vector: 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00
61+
62+
++++++ table: summ
63+
64+
length orbit5 alfa gammatr
65+
50 -0 0 0
66+
67+
q1 dq1 betxmax dxmax
68+
0.2468752944 0 2441.3009 0
69+
70+
dxrms xcomax xcorms q2
71+
0 0 0 0.2467607321
72+
73+
dq2 betymax dymax dyrms
74+
0 2561.4209 0 0
75+
76+
ycomax ycorms deltap synch_1
77+
0 0 0 0
78+
79+
synch_2 synch_3 synch_4 synch_5
80+
0 0 0 0
81+
82+
nflips
83+
0
84+
85+
86+
stop;
87+
88+
89+
Number of warnings: 0
90+
91+
++++++++++++++++++++++++++++++++++++++++++++
92+
+ MAD-X finished normally +
93+
++++++++++++++++++++++++++++++++++++++++++++

‎tests/test-sequence-7/twiss.out.cfg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
42-47 * skip # head
2+
* * any abs=1e-12 rel=1.1e-5
3+
* 0 omit='DRIFT_'

‎tests/test-sequence-7/twiss.out.ref‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
@ NAME %05s "TWISS"
2+
@ TYPE %05s "TWISS"
3+
@ SEQUENCE %05s "MYSEQ"
4+
@ PARTICLE %08s "POSITRON"
5+
@ MASS %le 0.0005109989461
6+
@ CHARGE %le 1
7+
@ ENERGY %le 1
8+
@ PC %le 0.9999998694
9+
@ GAMMA %le 1956.951198
10+
@ KBUNCH %le 1
11+
@ BCURRENT %le 0
12+
@ SIGE %le 0.001
13+
@ SIGT %le 1
14+
@ NPART %le 0
15+
@ EX %le 1
16+
@ EY %le 1
17+
@ ET %le 0.001
18+
@ LENGTH %le 50
19+
@ ALFA %le 0
20+
@ ORBIT5 %le -0
21+
@ GAMMATR %le 0
22+
@ Q1 %le 0.2468752944
23+
@ Q2 %le 0.2467607321
24+
@ DQ1 %le 0
25+
@ DQ2 %le 0
26+
@ DXMAX %le 0
27+
@ DYMAX %le 0
28+
@ XCOMAX %le 0
29+
@ YCOMAX %le 0
30+
@ BETXMAX %le 2441.3009
31+
@ BETYMAX %le 2561.4209
32+
@ XCORMS %le 0
33+
@ YCORMS %le 0
34+
@ DXRMS %le 0
35+
@ DYRMS %le 0
36+
@ DELTAP %le 0
37+
@ SYNCH_1 %le 0
38+
@ SYNCH_2 %le 0
39+
@ SYNCH_3 %le 0
40+
@ SYNCH_4 %le 0
41+
@ SYNCH_5 %le 0
42+
@ TITLE %08s "no-title"
43+
@ ORIGIN %16s "5.04.00 Linux 64"
44+
@ DATE %08s "05/03/18"
45+
@ TIME %08s "10.59.48"
46+
* S NAME KEYWORD BETX BETY
47+
$ %le %s %s %le %le
48+
0 "MYSEQ$START" "MARKER" 1 1
49+
8 "DRIFT_0" "DRIFT" 65 65
50+
12 "A" "SBEND" 145 145
51+
20 "DRIFT_1" "DRIFT" 401 401
52+
20 "BTHIN" "MULTIPOLE" 401 401
53+
50 "DRIFT_2" "DRIFT" 2441.3009 2561.4209
54+
50 "MYSEQ$END" "MARKER" 2441.3009 2561.4209

0 commit comments

Comments
 (0)