From d66a734c74fe660cccf75aec2777944237f60433 Mon Sep 17 00:00:00 2001 From: Diablo Date: Tue, 24 Feb 2026 11:32:34 +0100 Subject: [PATCH 1/7] Add conversion from deg2rad inside initialize, to comply with header input in Phonon_simple --- mcstas-comps/samples/Phonon_simple.comp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mcstas-comps/samples/Phonon_simple.comp b/mcstas-comps/samples/Phonon_simple.comp index d11400a7a..96fd9cff4 100644 --- a/mcstas-comps/samples/Phonon_simple.comp +++ b/mcstas-comps/samples/Phonon_simple.comp @@ -378,6 +378,8 @@ INITIALIZE V_my_s = (V_rho * 100 * sigma_inc); V_my_a_v = (V_rho * 100 * sigma_abs * 2200); DV = 0.001; /* Velocity change used for numerical derivative */ + if (focus_aw) focus_aw *= DEG2RAD; + if (focus_ah) focus_ah *= DEG2RAD; // Set constant parameters for parms object phonon.a_ = a; From 296ad427469cac3a38f61042f69a16b9204bccbb Mon Sep 17 00:00:00 2001 From: Diablo Date: Tue, 24 Feb 2026 11:33:09 +0100 Subject: [PATCH 2/7] Add Test case to support Phonon focusing update --- .../Samples_Phonon/Samples_Phonon.instr | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr index a225e23f6..fad8142df 100644 --- a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr +++ b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr @@ -17,7 +17,8 @@ * Simple test instrument for the Phonon_simple component. * Refer to the component documentation for further instructions. * -* %Example: E=10 -n 1e5 Detector: mon1_I=2.86265e-25 +* %Example: E=10 -n 1e5 focus_r=0.001 Detector: mon1_I=2.86265e-25 +* %Example: E=10 -n 1e5 focus_a=0.1 Detector: mon1_I=2.86265e-25 * * %Parameters * E: [meV] Mean energy at source @@ -30,7 +31,25 @@ * * %End ******************************************************************************/ -DEFINE INSTRUMENT Samples_Phonon(E=10, DE=0, HDIV=1e-4, VDIV=1e-4, TT=72.69, OM=-43.3, C=8) +DEFINE INSTRUMENT Samples_Phonon(E=10, + DE=0, + HDIV=1e-4, + VDIV=1e-4, + TT=72.69, + OM=-43.3, + C=8, + focus_r = 0, + focus_a = 0 + + ) + + +INITIALIZE %{ + + + +%} + TRACE @@ -45,7 +64,8 @@ COMPONENT source = Source_div( AT (0,0,0) RELATIVE a1 ROTATED (0,0,0) RELATIVE a1 COMPONENT sample = Phonon_simple( - radius=0.01, yheight=0.02, focus_r=0.001, + radius=0.01, yheight=0.02, focus_r=focus_r, + focus_aw = focus_a, focus_ah = focus_a, target_index=+2, sigma_abs=0.17, sigma_inc=0.003, b=0.90, M=208, c=C, a=4.95, DW=1.00, T=300) From a9670ef9bdc6f007fc2e503bed07b60499f519ef Mon Sep 17 00:00:00 2001 From: Diablo Date: Tue, 24 Feb 2026 11:32:34 +0100 Subject: [PATCH 3/7] Add conversion from deg2rad inside initialize, to comply with header input in Phonon_simple rebase phonon_focusing_fix to be from updated main --- mcstas-comps/samples/Phonon_simple.comp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mcstas-comps/samples/Phonon_simple.comp b/mcstas-comps/samples/Phonon_simple.comp index bf45c8c98..f256f445c 100644 --- a/mcstas-comps/samples/Phonon_simple.comp +++ b/mcstas-comps/samples/Phonon_simple.comp @@ -347,8 +347,10 @@ INITIALIZE V_rho = 4 / (a * a * a); V_my_s = (V_rho * 100 * sigma_inc); V_my_a_v = (V_rho * 100 * sigma_abs * 2200); - DV = 0.001; /* Velocity change used for numerical derivative */ - + DV = 0.001; /* Velocity change used for numerical derivative */ + if (focus_aw) focus_aw *= DEG2RAD; + if (focus_ah) focus_ah *= DEG2RAD; + // Set constant parameters for parms object phonon.a_ = a; phonon.c_ = c; From 65e9d0fcd732487a631f84ab9819b8572e2f26e5 Mon Sep 17 00:00:00 2001 From: Diablo Date: Tue, 24 Feb 2026 11:33:09 +0100 Subject: [PATCH 4/7] Add Test case to support Phonon focusing update --- .../Samples_Phonon/Samples_Phonon.instr | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr index a225e23f6..fad8142df 100644 --- a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr +++ b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr @@ -17,7 +17,8 @@ * Simple test instrument for the Phonon_simple component. * Refer to the component documentation for further instructions. * -* %Example: E=10 -n 1e5 Detector: mon1_I=2.86265e-25 +* %Example: E=10 -n 1e5 focus_r=0.001 Detector: mon1_I=2.86265e-25 +* %Example: E=10 -n 1e5 focus_a=0.1 Detector: mon1_I=2.86265e-25 * * %Parameters * E: [meV] Mean energy at source @@ -30,7 +31,25 @@ * * %End ******************************************************************************/ -DEFINE INSTRUMENT Samples_Phonon(E=10, DE=0, HDIV=1e-4, VDIV=1e-4, TT=72.69, OM=-43.3, C=8) +DEFINE INSTRUMENT Samples_Phonon(E=10, + DE=0, + HDIV=1e-4, + VDIV=1e-4, + TT=72.69, + OM=-43.3, + C=8, + focus_r = 0, + focus_a = 0 + + ) + + +INITIALIZE %{ + + + +%} + TRACE @@ -45,7 +64,8 @@ COMPONENT source = Source_div( AT (0,0,0) RELATIVE a1 ROTATED (0,0,0) RELATIVE a1 COMPONENT sample = Phonon_simple( - radius=0.01, yheight=0.02, focus_r=0.001, + radius=0.01, yheight=0.02, focus_r=focus_r, + focus_aw = focus_a, focus_ah = focus_a, target_index=+2, sigma_abs=0.17, sigma_inc=0.003, b=0.90, M=208, c=C, a=4.95, DW=1.00, T=300) From 855450e9dead91cdc48143ed734d6143081bb811 Mon Sep 17 00:00:00 2001 From: Diablo Date: Tue, 24 Feb 2026 11:49:23 +0100 Subject: [PATCH 5/7] Use auto formatter on Phonon simple --- .../examples/Tests_samples/Samples_Phonon/Phonon_simple.comp | 1 + 1 file changed, 1 insertion(+) create mode 120000 mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp diff --git a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp new file mode 120000 index 000000000..fa5bebc20 --- /dev/null +++ b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp @@ -0,0 +1 @@ +../../.././samples/Phonon_simple.comp \ No newline at end of file From e2c0308224cecbe52e165229733871451bd3356e Mon Sep 17 00:00:00 2001 From: Diablo Date: Tue, 24 Feb 2026 11:52:05 +0100 Subject: [PATCH 6/7] Format Samples Phonon instr a little --- .../Samples_Phonon/Samples_Phonon.instr | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr index fad8142df..6e3c6f6fd 100644 --- a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr +++ b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Samples_Phonon.instr @@ -32,22 +32,18 @@ * %End ******************************************************************************/ DEFINE INSTRUMENT Samples_Phonon(E=10, - DE=0, - HDIV=1e-4, - VDIV=1e-4, - TT=72.69, - OM=-43.3, - C=8, - focus_r = 0, - focus_a = 0 - - ) + DE=0, + HDIV=1e-4, + VDIV=1e-4, + TT=72.69, + OM=-43.3, + C=8, + focus_r = 0, + focus_a = 0 +) INITIALIZE %{ - - - %} From 5bf8971d422a50932ae2fcf0444083fb6d7e8d68 Mon Sep 17 00:00:00 2001 From: Diablo Date: Tue, 24 Feb 2026 12:10:11 +0100 Subject: [PATCH 7/7] Remove erronous linking in Test folder, and auto format the correct phonon simple comp --- .../Tests_samples/Samples_Phonon/Phonon_simple.comp | 1 - mcstas-comps/samples/Phonon_simple.comp | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 120000 mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp diff --git a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp b/mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp deleted file mode 120000 index fa5bebc20..000000000 --- a/mcstas-comps/examples/Tests_samples/Samples_Phonon/Phonon_simple.comp +++ /dev/null @@ -1 +0,0 @@ -../../.././samples/Phonon_simple.comp \ No newline at end of file diff --git a/mcstas-comps/samples/Phonon_simple.comp b/mcstas-comps/samples/Phonon_simple.comp index f256f445c..1931584ce 100644 --- a/mcstas-comps/samples/Phonon_simple.comp +++ b/mcstas-comps/samples/Phonon_simple.comp @@ -347,10 +347,12 @@ INITIALIZE V_rho = 4 / (a * a * a); V_my_s = (V_rho * 100 * sigma_inc); V_my_a_v = (V_rho * 100 * sigma_abs * 2200); - DV = 0.001; /* Velocity change used for numerical derivative */ - if (focus_aw) focus_aw *= DEG2RAD; - if (focus_ah) focus_ah *= DEG2RAD; - + DV = 0.001; /* Velocity change used for numerical derivative */ + if (focus_aw) + focus_aw *= DEG2RAD; + if (focus_ah) + focus_ah *= DEG2RAD; + // Set constant parameters for parms object phonon.a_ = a; phonon.c_ = c;