Skip to content

Commit 33095c0

Browse files
farhiEmmanuel FARHI
andauthored
Mcxtrace fluo add detector 0 (#2029)
* mcxtrace: first version of a fluorescence detector * mcxtrace: fluorescence monitor in corresp. test * mcxtrace: fluo samples: remove escape/pile-up now in fluo_detector * mcxtrace: fluo detector: fix propagation Z0 * mcxtrace: fluo: dE is FWHM. Fix LUCIA test value --------- Co-authored-by: Emmanuel FARHI <emmanuel.farhi.1@gmail.com>
1 parent 99658bd commit 33095c0

6 files changed

Lines changed: 376 additions & 180 deletions

File tree

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,40 +59,38 @@ AT(0,0,3) RELATIVE Origin
5959

6060
COMPONENT sample=Fluorescence(material=material,
6161
xwidth=0.001,yheight=0.001,zdepth=0.0001, p_interact=0.99,
62-
target_index=1, focus_xw=0.0005, focus_yh=0.0005,
63-
escape_ratio=0.01, pileup_ratio=0.01)
62+
target_index=1, focus_xw=0.0005, focus_yh=0.0005)
6463
AT (0,0,0) RELATIVE sample_mount_point
6564
EXTEND %{
6665
if (!SCATTERED) ABSORB;
6766
Stype=type;
6867
%}
6968

70-
COMPONENT emon = E_monitor(restore_xray=1,nE=2001,Emin=0, Emax=1.5*E0,
71-
filename="emon.dat",xwidth=0.007, yheight=0.007)
72-
AT(0,0,0.1) RELATIVE PREVIOUS
73-
74-
COMPONENT psd = PSD_monitor(xwidth=0.0015, yheight=0.0015, nx=100, ny=100, filename="psd.dat")
75-
AT(0,0,0.1) RELATIVE PREVIOUS
76-
77-
COMPONENT emon_fluo = COPY(emon)(filename="Fluorescence.dat")
69+
// ideal detectors
70+
COMPONENT emon_fluo = E_monitor(restore_xray=1,
71+
xwidth=0.007, yheight=0.007,
72+
nE=2001,Emin=0, Emax=1.5*E0,
73+
filename="Fluorescence.dat")
7874
WHEN (Stype == FLUORESCENCE)
7975
AT(0,0,0.1) RELATIVE PREVIOUS
8076

81-
COMPONENT emon_Compton = COPY(emon)(filename="Compton.dat")
77+
COMPONENT emon_Compton = COPY(emon_fluo)(filename="Compton.dat")
8278
WHEN (Stype == COMPTON)
83-
AT(0,0,0.1) RELATIVE PREVIOUS
79+
AT(0,0,0) RELATIVE PREVIOUS
8480

85-
COMPONENT emon_Rayleigh = COPY(emon)(filename="Rayleigh.dat")
81+
COMPONENT emon_Rayleigh = COPY(emon_fluo)(filename="Rayleigh.dat")
8682
WHEN (Stype == RAYLEIGH)
87-
AT(0,0,0.1) RELATIVE PREVIOUS
83+
AT(0,0,0) RELATIVE PREVIOUS
84+
85+
// SDD model
86+
COMPONENT emon = Fluo_detector(restore_xray=1,nE=2001,Emin=0, Emax=1.5*E0,
87+
filename="emon.dat",xwidth=0.007, yheight=0.007)
88+
AT(0,0,0) RELATIVE PREVIOUS
89+
90+
COMPONENT psd = PSD_monitor(xwidth=0.001, yheight=0.001, nx=100, ny=100, filename="psd.dat")
91+
AT(0,0,0) RELATIVE PREVIOUS
8892

89-
COMPONENT emon_Escape = COPY(emon)(filename="Si_Escape.dat")
90-
WHEN (Stype == FLUORESCENCE_ESCAPE)
91-
AT(0,0,0.1) RELATIVE PREVIOUS
9293

93-
COMPONENT emon_PileUp = COPY(emon)(filename="Si_PileUp.dat")
94-
WHEN (Stype == FLUORESCENCE_PILEUP)
95-
AT(0,0,0.1) RELATIVE PREVIOUS
9694

9795

9896
END

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

Lines changed: 2 additions & 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=6.60276e-14
24+
* %Example: index=2 Detector: psd_Diff_I=3.70277e-14
2525
* %Example: index=3 Detector: psd_Diff_I=1.19386e-13
2626
*
2727
* %Parameters
@@ -81,6 +81,7 @@ EXTEND %{
8181
else Stype=type;
8282
%}
8383

84+
// Fluorescence+SX in a GROUP
8485
COMPONENT FluoG = Fluorescence(
8586
radius = .5e-4, yheight = 1e-3, material=reflections, p_interact=0.5)
8687
WHEN (index == 3)

0 commit comments

Comments
 (0)