diff --git a/t29_optical_digi/Materials.xml b/t29_optical_digi/Materials.xml index 315b1bf..c3eeb52 100755 --- a/t29_optical_digi/Materials.xml +++ b/t29_optical_digi/Materials.xml @@ -221,6 +221,7 @@ not distinguish between 'original' photons and WLS photons. --> --> + diff --git a/t29_optical_digi/mac/Geometry.mac b/t29_optical_digi/mac/Geometry.mac index f962a92..2c6776b 100755 --- a/t29_optical_digi/mac/Geometry.mac +++ b/t29_optical_digi/mac/Geometry.mac @@ -20,18 +20,12 @@ /gate/world/daughters/name OpticalSystem /gate/world/daughters/insert box -#/gate/OpticalSystem/geometry/setXLength 10.5 cm -#/gate/OpticalSystem/geometry/setYLength 10.5 cm /gate/OpticalSystem/geometry/setXLength 20. cm /gate/OpticalSystem/geometry/setYLength 40. cm /gate/OpticalSystem/geometry/setZLength 2.0 cm /gate/OpticalSystem/placement/setTranslation 0 0 3.0 cm /gate/OpticalSystem/setMaterial Air -#/gate/OpticalSystem/repeaters/insert ring -#/gate/OpticalSystem/ring/setRepeatNumber 16 -#/gate/OpticalSystem/ring/setPoint1 0. 1. 0. mm -#/gate/OpticalSystem/ring/setPoint2 0. 0. 0. mm # === crystal: pixels and an additionnal volume behind the pixels === /gate/OpticalSystem/daughters/name crystal @@ -47,30 +41,6 @@ /gate/systems/OpticalSystem/crystal/attach crystal -# === pixels === -#/gate/crystal/daughters/name pixel -#/gate/crystal/daughters/insert box -#/gate/pixel/geometry/setXLength 2. cm -#/gate/pixel/geometry/setYLength 2. cm -#/gate/pixel/geometry/setXLength 0.105 cm -#/gate/pixel/geometry/setYLength 0.105 cm -#/gate/pixel/geometry/setZLength 1 cm -#/gate/pixel/setMaterial Air -#/gate/pixel/placement/setTranslation 0 0 0 cm -#/gate/pixel/vis/setColor red -#/gate/pixel/repeaters/insert cubicArray -#/gate/pixel/cubicArray/setRepeatNumberX 5 -#/gate/pixel/cubicArray/setRepeatNumberY 5 -#/gate/pixel/cubicArray/setRepeatNumberX 100 -#/gate/pixel/cubicArray/setRepeatNumberY 100 -#/gate/pixel/cubicArray/setRepeatNumberZ 1 -#/gate/pixel/cubicArray/setRepeatVector 2.1 2.1 0 cm -#/gate/pixel/cubicArray/setRepeatVector 0.105 0.105 0 cm -#/gate/pixel/vis/forceSolid -#/gate/pixel/attachCrystalSD -#/gate/systems/OpticalSystem/pixel/attach pixel - - # === additionnal volume behind pixels (ex: electronic board) === /gate/OpticalSystem/daughters/name Electronics /gate/OpticalSystem/daughters/insert box diff --git a/t29_optical_digi/mac/Phantom.mac b/t29_optical_digi/mac/Phantom.mac index 8b41e40..5fb87ea 100755 --- a/t29_optical_digi/mac/Phantom.mac +++ b/t29_optical_digi/mac/Phantom.mac @@ -30,19 +30,3 @@ /gate/casper/vis/setColor blue /gate/casper/vis/forceWireframe /gate/casper/attachPhantomSD - - -#/gate/casper/daughters/name fluorescent -#/gate/casper/daughters/insert cylinder -#/gate/fluorescent/geometry/setRmin 0.0 cm -#/gate/fluorescent/geometry/setRmax 0.75 mm -#/gate/fluorescent/geometry/setHeight 30. mm -#/gate/fluorescent/placement/setTranslation 0. 0. 0. cm -#/gate/fluorescent/placement/setRotationAxis 1 0 0 -#/gate/fluorescent/placement/setRotationAngle -90 deg -#/gate/fluorescent/setMaterial RhB -#/gate/fluorescent/vis/setColor yellow -#/gate/fluorescent/vis/forceSolid -#/gate/fluorescent/attachPhantomSD - - diff --git a/t29_optical_digi/mac/digitizer.mac b/t29_optical_digi/mac/digitizer.mac index 93a9688..bbf3694 100755 --- a/t29_optical_digi/mac/digitizer.mac +++ b/t29_optical_digi/mac/digitizer.mac @@ -5,13 +5,13 @@ #===================================================== /gate/digitizerMgr/crystal/SinglesDigitizer/Singles/insert opticaladder -/gate/digitizerMgr/crystal/SinglesDigitizer/Singles/insert readout -# for pixels: -#/gate/digitizerMgr/crystal/SinglesDigitizer/Singles/readout/setDepth 2 +/gate/digitizerMgr/crystal/SinglesDigitizer/Singles/insert readout + # for crystal: /gate/digitizerMgr/crystal/SinglesDigitizer/Singles/readout/setDepth 1 # In order to detect only fluorescent photons, you can use an energyFraming cut: /gate/digitizerMgr/crystal/SinglesDigitizer/Singles/insert energyFraming /gate/digitizerMgr/crystal/SinglesDigitizer/Singles/energyFraming/setMax 2.1 eV +/gate/digitizerMgr/crystal/SinglesDigitizer/Singles/energyFraming/setMin 1.77 eV diff --git a/t29_optical_digi/mac/main.mac b/t29_optical_digi/mac/main.mac index 5212cc8..3b7c19b 100755 --- a/t29_optical_digi/mac/main.mac +++ b/t29_optical_digi/mac/main.mac @@ -72,12 +72,8 @@ #===================================================== # P H Y S I C S #===================================================== - -/gate/physics/addProcess OpticalAbsorption -/gate/physics/addProcess OpticalRayleigh -/gate/physics/addProcess OpticalBoundary -/gate/physics/addProcess OpticalMie -/gate/physics/addProcess OpticalWLS +/gate/physics/addPhysicsList emlivermore +/gate/physics/addPhysicsList optical /gate/physics/processList Enabled /gate/physics/processList Initialized @@ -132,9 +128,7 @@ # Choose between: JamesRandom Ranlux64 MersenneTwister /gate/random/setEngineName MersenneTwister -#/gate/random/setEngineSeed default /gate/random/setEngineSeed auto -#/gate/random/setEngineSeed 123456789 /gate/random/verbose 1 #===================================================== diff --git a/t29_optical_digi/readme.txt b/t29_optical_digi/readme.txt index f12d058..08f1d96 100755 --- a/t29_optical_digi/readme.txt +++ b/t29_optical_digi/readme.txt @@ -18,3 +18,5 @@ Run the analysis with runAnalysis.py +19-02-2026. After passing from Geant4 11.3.0 to Geant4 11.4.0 it seems some of optical description became more precise and some of optical photons now is desciped better. However, this makes this test fail giving a peak at 1.77 eV coming from WLS in RhD. +But this test is meant to be for digitizer and not the optical part which is tested in t15. This is why the WLSCOMPONENT for RhD was modified and a cut at min energy at 1.77 eV was applied in order to march the distributions form previous results (i.e. the tail was cut out)