Skip to content

Commit ea9469e

Browse files
farhiEmmanuel FARHI
andauthored
mcxtrace: fix test values after fluo update (#2051)
Co-authored-by: Emmanuel FARHI <emmanuel.farhi.1@gmail.com>
1 parent b30cd77 commit ea9469e

6 files changed

Lines changed: 9 additions & 12 deletions

File tree

mcxtrace-comps/examples/SOLEIL/SOLEIL_DIFFABS/SOLEIL_DIFFABS.instr

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
* 14.92 | M1 bent mirror with Rh/Si coating. Focuses vertically the beam on the DCM. length 1300 mm, width 100 mm. 2.4 mrad incidence above 19 keV, 3 mrad in 12.5-19 keV, and 5 mrad in 6.5-12.5 keV, and 6 mrad below.
3737
* 17.462 | a Si(111) DCM. First crystal is 200x100 mm flat at 2.54 m from M1; 2nd is bent 70x100 mm to focus the beam horizontally.
3838
* 19.28 | M2 bent mirror with Rh coating, 1300x100 mm. Focuses vertically the beam. At 1.817 from DCM.
39-
* 27.752 | _secondary slits when using the KB. We ignore them here_.
40-
* 31.227 | _a KB mirror set M3/M4 for micro focusing. Optional, see the practical 5 "Optics"._
39+
* 27.752 | secondary slits when using the KB. We ignore them here.
40+
* 31.227 | a KB mirror set M3/M4 for micro focusing. We ignore them here.
4141
* 31.45 | sample stage with e.g. Fluorescence and/or PowderN components. At 13.99 from DCM.
4242
* 32.09 | a set of detectors (transmission, XRD and XRF), radius 654 mm
4343
*
44-
* %Example: E0=13 Detector: xpad_I=1.7e6
44+
* %Example: E0=13 Detector: xpad_I=3.2e+06
4545
*
4646
* %Parameters
4747
* E0: [keV] Central energy of the interval to be looked at
@@ -261,7 +261,7 @@ GROUP samples
261261
// We ignore it here.
262262
COMPONENT fluo = Fluorescence(
263263
material=sample,
264-
xwidth = 0.001, yheight=0.01, zdepth=5e-6, // flag_rayleigh=0,
264+
xwidth = 0.001, yheight=0.01, zdepth=5e-6,
265265
p_interact=1, target_z=1, focus_aw=180, focus_ah=5)
266266
AT (0,0,0) RELATIVE sample_stage
267267
GROUP samples
@@ -285,7 +285,4 @@ COMPONENT xpad = Monitor_nD(radius=.645, yheight = 0.05,
285285
WHEN (0.75 * E0 < K2E*sqrt(kx*kx+ky*ky+kz*kz)) // model detector energy discrimination
286286
AT (0,0,0) RELATIVE sample_stage
287287

288-
289-
290288
END
291-

mcxtrace-comps/examples/SOLEIL/SOLEIL_LUCIA/SOLEIL_LUCIA.instr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* 29 | Sample location
2323
* 29.1 | Fluorescence Detector at 90 deg
2424
*
25-
* %Example: -n 1e7 E0=3 Detector: mon_spl_fluo_I=9.77125e+09
25+
* %Example: -n 1e7 E0=3.09 Detector: mon_spl_fluo_I=9.77125e+09
2626
*
2727
* %Parameters
2828
* E0: [keV] Nominal energy at the source, in 0.6-8 keV.

mcxtrace-comps/examples/SOLEIL/SOLEIL_ROCK/SOLEIL_ROCK.instr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* Manganese and chrome scan: mxrun SOLEIL_ROCK.instr E0=5.700,6.800 scan=1 sample_file=MnCr cc=2 -N100
4545
* Pretty energy repartition monitor result: mxrun SOLEIL_ROCK.instr E0=17.000 cc=2 -n1e8
4646
*
47-
* %Example: E0=15.918 Detector: psd_monitor_I=6.9e+08
47+
* %Example: E0=15.918 Detector: psd_monitor_I=1.4e+08
4848
*
4949
* %Parameters
5050
* E0: [keV] Energy to hit, i.e. selected by the channel-cut monochromator

mcxtrace-comps/examples/Tests_samples/Test_Absorption/Test_Absorption.instr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* %Example: Test_Absorption.instr -n1e5 index=1 Detector: emon_I=8.25376e-12
2828
* %Example: Test_Absorption.instr -n1e5 index=2 Detector: emon_I=8.24127e-12
2929
* %Example: Test_Absorption.instr -n1e5 index=3 Detector: emon_I=8.28866e-12
30-
* %Example: Test_Absorption.instr -n1e5 index=4 Detector: emon_I=5.83067e-12
30+
* %Example: Test_Absorption.instr -n1e5 index=4 Detector: emon_I=9.36962e-10
3131
*
3232
* %Parameters
3333
* index: [1] Index of the absorption component to use in 1-4. See above.

mcxtrace-comps/examples/Tests_samples/Test_PowderN/Test_PowderN.instr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* %Example: index=1 Detector: Sph_mon_I=1.26755e-11
2121
* %Example: index=2 Detector: Sph_mon_I=4.44793e-13
22-
* %Example: index=3 Detector: Sph_mon_I=5.23579e-11
22+
* %Example: index=3 Detector: Sph_mon_I=1.98093e-11
2323
*
2424
* %Parameters
2525
* E0: [keV] Source energy (width 1 keV)

mcxtrace-comps/examples/Tests_samples/Test_SX/Test_SX.instr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* - index=3: use Fluorescence+Single_crystal in a GROUP
2222
*
2323
* %Example: index=1 Detector: psd_Diff_I=2.29638e-13
24-
* %Example: index=2 Detector: psd_Diff_I=2.47057e-13
24+
* %Example: index=2 Detector: psd_Diff_I=2.07726e-11
2525
* %Example: index=3 Detector: psd_Diff_I=1.19386e-13
2626
*
2727
* %Parameters

0 commit comments

Comments
 (0)