Skip to content

Commit 4279405

Browse files
willendwillend
authored
Merge pull request #2355 from willend/main
Fix for nasty double-assignment m=m = m, spotted via mcstas-antlr
2 parents 5d54b22 + 4369eab commit 4279405

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

‎mcstas-comps/examples/ILL/ILL_H113/ILL_H113.instr‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ AT (0,0,0) RELATIVE PREVIOUS
143143

144144
COMPONENT H113_2_1 = Guide_gravity(
145145
w1=0.06, h1=0.2, w2=0.06, h2=0.2, l=L_H113_2,
146-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
146+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
147147
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_2,0) RELATIVE PREVIOUS
148148

149149
COMPONENT H113_2_2 = COPY(PREVIOUS)
@@ -176,7 +176,7 @@ AT (0,0,0) RELATIVE PREVIOUS
176176

177177
COMPONENT H113_3_1 = Guide_gravity(
178178
w1=0.06, h1=0.2, w2=0.06, h2=0.2, l=L_H113_3,
179-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
179+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
180180
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_3,0) RELATIVE PREVIOUS
181181

182182
COMPONENT H113_3_2 = COPY(PREVIOUS)
@@ -200,52 +200,52 @@ AT (0,0,0) RELATIVE PREVIOUS
200200

201201
COMPONENT H113_4_1 = Guide_gravity(
202202
w1=0.06, h1=0.2, w2=(0.06*9+0.09*1)/10, h2=0.2, l=L_H113_4,
203-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
203+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
204204
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
205205

206206
COMPONENT H113_4_2 = Guide_gravity(
207207
w1=(0.06*9+0.09*1)/10, h1=0.2, w2=(0.06*8+0.09*2)/10, h2=0.2, l=L_H113_4,
208-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
208+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
209209
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
210210

211211
COMPONENT H113_4_3 = Guide_gravity(
212212
w1=(0.06*8+0.09*2)/10, h1=0.2, w2=(0.06*7+0.09*3)/10, h2=0.2, l=L_H113_4,
213-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
213+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
214214
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
215215

216216
COMPONENT H113_4_4 = Guide_gravity(
217217
w1=(0.06*7+0.09*3)/10, h1=0.2, w2=(0.06*6+0.09*4)/10, h2=0.2, l=L_H113_4,
218-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
218+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
219219
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
220220

221221
COMPONENT H113_4_5 = Guide_gravity(
222222
w1=(0.06*6+0.09*4)/10, h1=0.2, w2=(0.06*5+0.09*5)/10, h2=0.2, l=L_H113_4,
223-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
223+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
224224
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
225225

226226
COMPONENT H113_4_6 = Guide_gravity(
227227
w1=(0.06*5+0.09*5)/10, h1=0.2, w2=(0.06*4+0.09*6)/10, h2=0.2, l=L_H113_4,
228-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
228+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
229229
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
230230

231231
COMPONENT H113_4_7 = Guide_gravity(
232232
w1=(0.06*4+0.09*6)/10, h1=0.2, w2=(0.06*3+0.09*7)/10, h2=0.2, l=L_H113_4,
233-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
233+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
234234
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
235235

236236
COMPONENT H113_4_8 = Guide_gravity(
237237
w1=(0.06*3+0.09*7)/10, h1=0.2, w2=(0.06*2+0.09*8)/10, h2=0.2, l=L_H113_4,
238-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
238+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
239239
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
240240

241241
COMPONENT H113_4_9 = Guide_gravity(
242242
w1=(0.06*2+0.09*8)/10, h1=0.2, w2=(0.06*1+0.09*9)/10, h2=0.2, l=L_H113_4,
243-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
243+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
244244
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
245245

246246
COMPONENT H113_4_10 = Guide_gravity(
247247
w1=(0.06*1+0.09*9)/10, h1=0.2, w2=0.09, h2=0.2, l=L_H113_4,
248-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
248+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
249249
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS
250250

251251
COMPONENT H113_4_Out = Al_window(thickness=Al_Thickness)
@@ -263,7 +263,7 @@ AT (0,0,0) RELATIVE PREVIOUS
263263

264264
COMPONENT H113_5_1 = Guide_gravity(
265265
w1=0.09, h1=0.2, w2=0.09, h2=0.2, l=L_H113_5,
266-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
266+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
267267
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_5,0) RELATIVE PREVIOUS
268268

269269
COMPONENT H113_5_2 = COPY(PREVIOUS)
@@ -313,7 +313,7 @@ AT (0,0,0) RELATIVE PREVIOUS
313313

314314
COMPONENT H113_6_1 = Guide_gravity(
315315
w1=0.09, h1=0.2, w2=0.09, h2=0.2, l=L_H113_6,
316-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
316+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
317317
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_6,0) RELATIVE PREVIOUS
318318

319319
COMPONENT H113_6_2 = COPY(PREVIOUS)
@@ -359,7 +359,7 @@ AT (0,0,0) RELATIVE PREVIOUS
359359

360360
COMPONENT H113_7_1 = Guide_gravity(
361361
w1=0.09, h1=0.2, w2=0.09, h2=0.2, l=L_H113_7,
362-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
362+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
363363
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_7,0) RELATIVE PREVIOUS
364364

365365
COMPONENT H113_7_2 = COPY(PREVIOUS)
@@ -405,7 +405,7 @@ AT (0,0,0) RELATIVE PREVIOUS
405405

406406
COMPONENT H113_8_1 = Guide_gravity(
407407
w1=0.09, h1=0.2, w2=0.09, h2=0.2, l=L_H113_8,
408-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
408+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
409409
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_8,0) RELATIVE PREVIOUS
410410

411411
COMPONENT H113_8_2 = COPY(PREVIOUS)
@@ -451,52 +451,52 @@ AT (0,0,0) RELATIVE PREVIOUS
451451

452452
COMPONENT H113_9_1 = Guide_gravity(
453453
w1=0.09, h1=0.2, w2=(0.09*9+0.06*1)/10, h2=0.2, l=L_H113_9,
454-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
454+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
455455
AT (0,0,Al_Thickness+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
456456

457457
COMPONENT H113_9_2 = Guide_gravity(
458458
w1=(0.09*9+0.06*1)/10, h1=0.2, w2=(0.09*8+0.06*2)/10, h2=0.2, l=L_H113_9,
459-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
459+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
460460
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
461461

462462
COMPONENT H113_9_3 = Guide_gravity(
463463
w1=(0.09*8+0.06*2)/10, h1=0.2, w2=(0.09*7+0.06*3)/10, h2=0.2, l=L_H113_9,
464-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
464+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
465465
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
466466

467467
COMPONENT H113_9_4 = Guide_gravity(
468468
w1=(0.09*7+0.06*3)/10, h1=0.2, w2=(0.09*6+0.06*4)/10, h2=0.2, l=L_H113_9,
469-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
469+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
470470
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
471471

472472
COMPONENT H113_9_5 = Guide_gravity(
473473
w1=(0.09*6+0.06*4)/10, h1=0.2, w2=(0.09*5+0.06*5)/10, h2=0.2, l=L_H113_9,
474-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
474+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
475475
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
476476

477477
COMPONENT H113_9_6 = Guide_gravity(
478478
w1=(0.09*5+0.06*5)/10, h1=0.2, w2=(0.09*4+0.06*6)/10, h2=0.2, l=L_H113_9,
479-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
479+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
480480
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
481481

482482
COMPONENT H113_9_7 = Guide_gravity(
483483
w1=(0.09*4+0.06*6)/10, h1=0.2, w2=(0.09*3+0.06*7)/10, h2=0.2, l=L_H113_9,
484-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
484+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
485485
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
486486

487487
COMPONENT H113_9_8 = Guide_gravity(
488488
w1=(0.09*3+0.06*7)/10, h1=0.2, w2=(0.09*2+0.06*8)/10, h2=0.2, l=L_H113_9,
489-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
489+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
490490
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
491491

492492
COMPONENT H113_9_9 = Guide_gravity(
493493
w1=(0.09*2+0.06*8)/10, h1=0.2, w2=(0.09*1+0.06*9)/10, h2=0.2, l=L_H113_9,
494-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
494+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
495495
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
496496

497497
COMPONENT H113_9_10 = Guide_gravity(
498498
w1=(0.09*1+0.06*9)/10, h1=0.2, w2=0.06, h2=0.2, l=L_H113_9,
499-
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
499+
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
500500
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS
501501

502502
COMPONENT H113_9_Out = Al_window(thickness=Al_Thickness)

0 commit comments

Comments
 (0)