Skip to content

X: Fluorescence upgrade, forward this PR and #3088 to FluoCrystal and FluoPowder #3094

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 8 commits into from
Nov 12, 2026
Merged

X: Fluorescence upgrade, forward this PR and #3088 to FluoCrystal and FluoPowder #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
99ff97e
X: Fluorescence: handle non-radiative (e.g. Auger) absorption; polari…
farhi Nov 11, 2026
94cc962
X: FluoCrystal: forward Fluorescence changes. See #3088 and current PR
farhi Nov 11, 2026
8496345
X: FluoPowder: forward Fluorescence changes. See #3088 and current PR
farhi Nov 11, 2026
3dfbba8
X: tests: fix test values after Fluo* updates.
farhi Nov 11, 2026
e3af5d0
X: tests: fix test values after Fluo* updates.
farhi Nov 11, 2026
db5029f
Merge branch 'main' into 2026-11-farhi-fluorescence-upgrade1
willend Nov 11, 2026
419e2c4
X: SOLEIL_MARS, CRISTAL, ROCK: test values for the Fluo* update
willend Nov 11, 2026
75b508e
X: SOLEIL_ROCK: test with -n1e7, value 8.2e+09
willend Nov 11, 2026
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
2 changes: 1 addition & 1 deletion mcxtrace-comps/examples/SOLEIL/SOLEIL_CRISTAL/SOLEIL_CRISTAL.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* modelled; hutch diagnostics such as xbpm, beam imagers and attenuators are
* omitted for simplicity.
*
* %Test: CRISTAL_E0=12 Detector: CRISTAL_detector_diffraction_I=1.53764e+06
* %Test: CRISTAL_E0=12 Detector: CRISTAL_detector_diffraction_I=1.39e+06
*
* %Parameters
* CRISTAL_E0: [keV] Central energy of the beam
Expand Down
2 changes: 1 addition & 1 deletion mcxtrace-comps/examples/SOLEIL/SOLEIL_MARS/SOLEIL_MARS.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*
* This model implements the XRD station for powders.
*
* %Test: MARS_E0=16.99 Detector: MARS_detector_diffraction_I=4.17087e+08
* %Test: MARS_E0=16.99 Detector: MARS_detector_diffraction_I=2.29e+08
*
* %Parameters
* MARS_E0: [keV] Central energy to be emitted by the source
Expand Down
2 changes: 1 addition & 1 deletion mcxtrace-comps/examples/SOLEIL/SOLEIL_ROCK/SOLEIL_ROCK.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* Manganese and chrome ROCK_scan: mxrun SOLEIL_ROCK.instr ROCK_E0=5.700,6.800 ROCK_scan=1 ROCK_sample_file=MnCr ROCK_cc=2 -N100
* Pretty energy repartition monitor result: mxrun SOLEIL_ROCK.instr ROCK_E0=17.000 ROCK_cc=2 -n1e8
*
* %Test: ROCK_E0=15.918 Detector: ROCK_fluo_monitor_I=119954000000
* %Test: ROCK_E0=15.918 ROCK_dE=0.01 -n1e7 Detector: ROCK_fluo_monitor_I=8.2e+09
*
* %Parameters
* ROCK_E0: [keV] Energy to hit, i.e. selected by the channel-cut monochromator
Expand Down
2 changes: 1 addition & 1 deletion mcxtrace-comps/examples/Tests_samples/Test_Absorption/Test_Absorption.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* %Test: Test_Absorption.instr -n1e5 index=1 Detector: emon_I=8.25376e-12
* %Test: Test_Absorption.instr -n1e5 index=2 Detector: emon_I=8.24127e-12
* %Test: Test_Absorption.instr -n1e5 index=3 Detector: emon_I=8.28866e-12
* %Test: Test_Absorption.instr -n1e5 index=4 Detector: emon_I=9.36962e-10
* %Test: Test_Absorption.instr -n1e5 index=4 Detector: emon_I=5.31547e-12
*
* %Parameters
* index: [1] Index of the absorption component to use in 1-4. See above.
Expand Down
2 changes: 1 addition & 1 deletion mcxtrace-comps/examples/Tests_samples/Test_PowderN/Test_PowderN.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* %Test: index=1 Detector: Sph_mon_I=1.29869e-12
* Example: index=2 Detector: Sph_mon_I=1.91726e-12
* (Unittest disabled for Single_crystal powder-mode, numerically unstable on GPU)
* %Test: index=3 Detector: Sph_mon_I=6.29534e-12
* %Test: index=3 Detector: Sph_mon_I=2.81248e-12
*
* (Unittest disabled for Single_crystal powder-mode, numerically unstable on GPU)
*
Expand Down
2 changes: 1 addition & 1 deletion mcxtrace-comps/examples/Tests_samples/Test_SX/Test_SX.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* - index=3: use Fluorescence+Single_crystal in a GROUP
*
* %Test: index=1 Detector: psd_Diff_I=2.29638e-13
* %Test: index=2 Detector: psd_Diff_I=6.1e-14
* %Test: index=2 Detector: psd_Diff_I=3.33118e-14
* Example: index=3 Detector: psd_Diff_I=1.19386e-13
*
* (Fluorescence+Single_crystal GROUP is unstable on GPU, disable index=3 test for now)
Expand Down
355 changes: 225 additions & 130 deletions mcxtrace-comps/samples/FluoCrystal.comp
View file
Open in desktop

Large diffs are not rendered by default.

344 changes: 218 additions & 126 deletions mcxtrace-comps/samples/FluoPowder.comp
View file
Open in desktop

Large diffs are not rendered by default.

155 changes: 138 additions & 17 deletions mcxtrace-comps/samples/Fluorescence.comp
View file
Open in desktop

Large diffs are not rendered by default.