Skip to content

Fix for nasty double-assignment m=m = m, spotted via mcstas-antlr #2355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willend merged 1 commit into from
Mar 13, 2026
+26 −26
Merged

Fix for nasty double-assignment m=m = m, spotted via mcstas-antlr #2355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions mcstas-comps/examples/ILL/ILL_H113/ILL_H113.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ AT (0,0,0) RELATIVE PREVIOUS

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

COMPONENT H113_2_2 = COPY(PREVIOUS)
Expand Down Expand Up @@ -176,7 +176,7 @@ AT (0,0,0) RELATIVE PREVIOUS

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

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

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

COMPONENT H113_4_2 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

COMPONENT H113_4_3 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

COMPONENT H113_4_4 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

COMPONENT H113_4_5 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

COMPONENT H113_4_6 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

COMPONENT H113_4_7 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

COMPONENT H113_4_8 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

COMPONENT H113_4_9 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_4+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_4,0) RELATIVE PREVIOUS

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

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

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

COMPONENT H113_5_2 = COPY(PREVIOUS)
Expand Down Expand Up @@ -313,7 +313,7 @@ AT (0,0,0) RELATIVE PREVIOUS

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

COMPONENT H113_6_2 = COPY(PREVIOUS)
Expand Down Expand Up @@ -359,7 +359,7 @@ AT (0,0,0) RELATIVE PREVIOUS

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

COMPONENT H113_7_2 = COPY(PREVIOUS)
Expand Down Expand Up @@ -405,7 +405,7 @@ AT (0,0,0) RELATIVE PREVIOUS

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

COMPONENT H113_8_2 = COPY(PREVIOUS)
Expand Down Expand Up @@ -451,52 +451,52 @@ AT (0,0,0) RELATIVE PREVIOUS

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

COMPONENT H113_9_2 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

COMPONENT H113_9_3 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

COMPONENT H113_9_4 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

COMPONENT H113_9_5 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

COMPONENT H113_9_6 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

COMPONENT H113_9_7 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

COMPONENT H113_9_8 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

COMPONENT H113_9_9 = Guide_gravity(
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,
R0=gR0, Qc=gQc, alpha=gAlpha, m=m = m, W=gW)
R0=gR0, Qc=gQc, alpha=gAlpha, m=m, W=gW)
AT (0,0,L_H113_9+gGap) RELATIVE PREVIOUS ROTATED (0,Rh_H113_9,0) RELATIVE PREVIOUS

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

COMPONENT H113_9_Out = Al_window(thickness=Al_Thickness)
Expand Down
Loading