diff --git a/Inputs/DetectorConfiguration/Riken_30mm.detector b/Inputs/DetectorConfiguration/Riken_30mm.detector
index 241aed0721955b29df1c702f2390f483af8a32f4..8661159da643abececfe1e2295ace79e32afc8f5 100644
--- a/Inputs/DetectorConfiguration/Riken_30mm.detector
+++ b/Inputs/DetectorConfiguration/Riken_30mm.detector
@@ -27,14 +27,15 @@ CryoTarget
Y= 0
Z= 0
+
%%%%%%%%%%%%%%%%%%%%%
MUST2Array
%%%%%%% Telescope 1 %%%%%%%
M2Telescope
-X1_Y1= 10.85 105.03 162.16
-X1_Y128= 22.8 9.84 191.95
-X128_Y1= 104.09 105.03 124.76
-X128_Y128= 116.04 9.84 154.55
+X1_Y1= 10.85 105.03 146.16
+X1_Y128= 22.8 9.84 175.95
+X128_Y1= 104.09 105.03 108.76
+X128_Y128= 116.04 9.84 138.55
SI= 1
SILI= 0
CSI= 1
@@ -42,10 +43,10 @@ VIS= all
%%%%%%% Telescope 2 %%%%%%%
M2Telescope
-X1_Y1= -116.04 9.84 154.55
-X1_Y128= -22.8 9.84 191.95
-X128_Y1= -104.09 105.03 124.76
-X128_Y128= -10.85 105.03 162.16
+X1_Y1= -116.04 9.84 138.55
+X1_Y128= -22.8 9.84 175.95
+X128_Y1= -104.09 105.03 108.76
+X128_Y128= -10.85 105.03 146.16
SI= 1
SILI= 0
CSI= 1
@@ -53,10 +54,10 @@ VIS= all
%%%%%%% Telescope 3 %%%%%%%
M2Telescope
-X1_Y1= -10.85 -105.03 162.16
-X1_Y128= -22.8 -9.84 191.95
-X128_Y1= -104.09 -105.03 124.76
-X128_Y128= -116.04 -9.84 154.55
+X1_Y1= -10.85 -105.03 146.16
+X1_Y128= -22.8 -9.84 175.95
+X128_Y1= -104.09 -105.03 108.76
+X128_Y128= -116.04 -9.84 138.55
SI= 1
SILI= 0
CSI= 1
@@ -64,10 +65,10 @@ VIS= all
%%%%%%% Telescope 4 %%%%%%%
M2Telescope
-X1_Y1= 116.04 -9.84 154.55
-X1_Y128= 22.8 -9.84 191.95
-X128_Y1= 104.09 -105.03 124.76
-X128_Y128= 10.85 -105.03 162.16
+X1_Y1= 116.04 -9.84 138.55
+X1_Y128= 22.8 -9.84 175.95
+X128_Y1= 104.09 -105.03 108.76
+X128_Y128= 10.85 -105.03 146.16
SI= 1
SILI= 0
CSI= 1
@@ -75,10 +76,10 @@ VIS= all
%%%%%%% Telescope 5 %%%%%%%
M2Telescope
-X1_Y1= -50.23 -50.23 341
-X1_Y128= 50.23 -50.23 341
-X128_Y1= -50.23 50.23 341
-X128_Y128= 50.23 50.23 341
+X1_Y1= -50.23 -50.23 325
+X1_Y128= 50.23 -50.23 325
+X128_Y1= -50.23 50.23 325
+X128_Y128= 50.23 50.23 325
SI= 1
SILI= 0
CSI= 1
@@ -88,29 +89,29 @@ VIS= all
AddThinSi
%%%%%%%%% Det 1 %%%%%%%%
ThinSi
-A= 18.39 9.66 159.67
-B= 65.26 9.66 140.87
-C= 59.44 56.09 126.34
-D= 12.57 56.09 145.14
+A= 18.39 9.66 143.67
+B= 65.26 9.66 124.87
+C= 59.44 56.09 110.34
+D= 12.57 56.09 129.14
%%%%%%%%% Det 2 %%%%%%%%
ThinSi
-A= -12.57 56.09 145.14
-B= -59.44 56.09 126.34
-C= -65.26 9.66 140.87
-D= -18.39 9.66 159.67
+A= -12.57 56.09 129.14
+B= -59.44 56.09 110.34
+C= -65.26 9.66 124.87
+D= -18.39 9.66 143.67
%%%%%%%%% Det 3 %%%%%%%%
ThinSi
-A= -18.39 -9.66 159.67
-B= -65.26 -9.66 140.87
-C= -59.44 -56.09 126.34
-D= -12.57 -56.09 145.14
+A= -18.39 -9.66 143.67
+B= -65.26 -9.66 124.87
+C= -59.44 -56.09 110.34
+D= -12.57 -56.09 129.14
%%%%%%%%% Det 4 %%%%%%%%
ThinSi
-A= 12.57 -56.09 145.14
-B= 59.44 -56.09 126.34
-C= 65.26 -9.66 140.87
-D= 18.39 -9.66 159.67
+A= 12.57 -56.09 129.14
+B= 59.44 -56.09 110.34
+C= 65.26 -9.66 124.87
+D= 18.39 -9.66 143.67
diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector
index 580a324aeaf92b051ce42ed6aab3f01368500ad8..5470d39192c13ca49b9165d9977f853c7610314b 100644
--- a/Inputs/DetectorConfiguration/Riken_65mm.detector
+++ b/Inputs/DetectorConfiguration/Riken_65mm.detector
@@ -1,12 +1,42 @@
+%%%%%%%%%%%Target%%%%%%%%%%%%%%%%%%%1
+%Thickness in micrometer
+%Radius in mm
+%Temperature in K, Pressure in bar
+%Material name according to the target library
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+GeneralTarget
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Target
+ THICKNESS= 1
+ RADIUS= 45
+ MATERIAL= CD2
+ X= 10
+ Y= -10
+ Z= 50
+
+CryoTarget
+ THICKNESS= 3000
+ RADIUS= 45
+ TEMPERATURE= 26
+ PRESSURE= 1
+ MATERIAL= D2
+ WINDOWSTHICKNESS= 15
+ WINDOWSMATERIAL= Mylar
+ X= 0
+ Y= 0
+ Z= 0
+
+
%%%%%%%%%%%%%%%%%%%%%
MUST2Array
%%%%%%% Telescope 1 %%%%%%%
M2Telescope
-X1_Y1= 10.85 105.03 162.16
-X1_Y128= 22.8 9.84 191.95
-X128_Y1= 104.09 105.03 124.76
-X128_Y128= 116.04 9.84 154.55
+X1_Y1= 10.85 105.03 146.16
+X1_Y128= 22.8 9.84 175.95
+X128_Y1= 104.09 105.03 108.76
+X128_Y128= 116.04 9.84 138.55
SI= 1
SILI= 0
CSI= 1
@@ -14,10 +44,10 @@ VIS= all
%%%%%%% Telescope 2 %%%%%%%
M2Telescope
-X1_Y1= -116.04 9.84 154.55
-X1_Y128= -22.8 9.84 191.95
-X128_Y1= -104.09 105.03 124.76
-X128_Y128= -10.85 105.03 162.16
+X1_Y1= -116.04 9.84 138.55
+X1_Y128= -22.8 9.84 175.95
+X128_Y1= -104.09 105.03 108.76
+X128_Y128= -10.85 105.03 146.16
SI= 1
SILI= 0
CSI= 1
@@ -25,10 +55,10 @@ VIS= all
%%%%%%% Telescope 3 %%%%%%%
M2Telescope
-X1_Y1= -10.85 -105.03 162.16
-X1_Y128= -22.8 -9.84 191.95
-X128_Y1= -104.09 -105.03 124.76
-X128_Y128= -116.04 -9.84 154.55
+X1_Y1= -10.85 -105.03 146.16
+X1_Y128= -22.8 -9.84 175.95
+X128_Y1= -104.09 -105.03 108.76
+X128_Y128= -116.04 -9.84 138.55
SI= 1
SILI= 0
CSI= 1
@@ -36,10 +66,10 @@ VIS= all
%%%%%%% Telescope 4 %%%%%%%
M2Telescope
-X1_Y1= 116.04 -9.84 154.55
-X1_Y128= 22.8 -9.84 191.95
-X128_Y1= 104.09 -105.03 124.76
-X128_Y128= 10.85 -105.03 162.16
+X1_Y1= 116.04 -9.84 138.55
+X1_Y128= 22.8 -9.84 175.95
+X128_Y1= 104.09 -105.03 108.76
+X128_Y128= 10.85 -105.03 146.16
SI= 1
SILI= 0
CSI= 1
@@ -47,10 +77,10 @@ VIS= all
%%%%%%% Telescope 5 %%%%%%%
M2Telescope
-X1_Y1= -50.23 -50.23 341
-X1_Y128= 50.23 -50.23 341
-X128_Y1= -50.23 50.23 341
-X128_Y128= 50.23 50.23 341
+X1_Y1= -50.23 -50.23 325
+X1_Y128= 50.23 -50.23 325
+X128_Y1= -50.23 50.23 325
+X128_Y128= 50.23 50.23 325
SI= 1
SILI= 0
CSI= 1
@@ -60,30 +90,30 @@ VIS= all
AddThinSi
%%%%%%%%% Det 1 %%%%%%%%
ThinSi
-A= 17.61 9.85 120.11
-B= 64.48 9.85 101.31
-C= 58.66 56.29 86.79
-D= 11.79 56.29 105.59
+A= 17.61 9.85 104.11
+B= 64.48 9.85 85.31
+C= 58.66 56.29 70.79
+D= 11.79 56.29 89.69
%%%%%%%%% Det 2 %%%%%%%%
ThinSi
-A= -116.04 9.84 154.55
-B= -22.8 9.84 191.95
-C= -104.09 105.03 124.76
-D= -10.85 105.03 162.16
+A= -11.79 56.29 89.59
+B= -58.66 56.29 70.79
+C= -64.48 9.85 85.31
+D= -17.61 9.85 104.11
%%%%%%%%% Det 3 %%%%%%%%
ThinSi
-A= -11.79 56.29 105.59
-B= -58.66 56.29 86.79
-C= -64.48 9.85 101.31
-D= -17.61 9.85 120.11
+A= -17.61 -9.85 104.11
+B= -64.48 -9.85 85.31
+C= -58.66 -56.29 70.79
+D= -11.79 -56.29 89.59
%%%%%%%%% Det 4 %%%%%%%%
ThinSi
-A= -10.85 -105.03 162.16
-B= -22.8 -9.84 191.95
-C= -104.09 -105.03 124.76
-D= -116.04 -9.84 154.55
+A= 11.79 -56.29 89.59
+B= 58.66 -56.29 70.79
+C= 64.48 -9.85 85.31
+D= 17.61 -9.85 104.11
diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc
index c06a0e94a6eb74807be7e8d399d5dc8fe30e9150..a86e9e19e3bc3581e41e6a8bd98326ad45e49b69 100644
--- a/NPAnalysis/10He_Riken/src/Analysis.cc
+++ b/NPAnalysis/10He_Riken/src/Analysis.cc
@@ -38,6 +38,10 @@ int main(int argc,char** argv)
RootOutput::getInstance()->GetTree()->Branch("X",&X,"X/D") ;
RootOutput::getInstance()->GetTree()->Branch("Y",&Y,"Y/D") ;
+ // Open the ThinSi Branch
+ RootInput::getInstance() -> GetTree()->SetBranchStatus(ThinSi,true) ;
+ RootInput::getInstance() -> GetTree()->SetBranchAddress(ThinSiEnergy,true) ;
+
// Get Must2 Pointer:
MUST2Array* M2 = (MUST2Array*) myDetector -> m_Detector["MUST2"] ;
// Get the formed Chained Tree and Treat it
diff --git a/NPSimulation/src/ThinSi.cc b/NPSimulation/src/ThinSi.cc
index ff0c030aa3c7a38cb0a50375527044c4f3a688ee..e8d484113a5cb6dc6e1260e97ef88324b16f2b1e 100644
--- a/NPSimulation/src/ThinSi.cc
+++ b/NPSimulation/src/ThinSi.cc
@@ -41,14 +41,15 @@ namespace THINSI
{
// Energy and time Resolution
const G4double ResoTime = 0 ;
- const G4double ResoEnergy = 0.042 ;// = 100keV of Resolution // Unit is MeV/2.35
+ const G4double ResoEnergy = 0.042 ;// = 100keV of Resolution // Unit is MeV/2.35
// Geometry
- const G4double DetectorSize = 70*mm ;
- const G4double SiliconThickness = 20*micrometer ;
+ const G4double DetectorSize = 68*mm ;
+ const G4double SiliconThickness = 20*micrometer ;
+ const G4double FrameThickness = 1*mm ;
const G4double SiliconSize = 50*mm ;
const G4double AluThickness = 0.4*micrometer ;
- const G4int NumberOfStrip = 32 ;
+ const G4int NumberOfStrip = 32 ;
const G4double AluStripFront_PosZ = -0.5*SiliconThickness - 0.5*AluThickness ;
const G4double Si_PosZ = 0 ;
@@ -178,7 +179,7 @@ void ThinSi::VolumeMaker(G4int DetNumber ,
/////// Starting Volume Definition ///////
G4String Name = "ThinSi" + DetectorNumber;
- G4Box* solidThinSi = new G4Box(Name, 0.5*DetectorSize, 0.5*DetectorSize, 0.5*3*mm);
+ G4Box* solidThinSi = new G4Box(Name, 0.5*DetectorSize, 0.5*DetectorSize, 0.5*FrameThickness*mm);
G4LogicalVolume* logicThinSi =
new G4LogicalVolume(solidThinSi, Vacuum, Name, 0, 0);
@@ -192,8 +193,8 @@ void ThinSi::VolumeMaker(G4int DetNumber ,
0);
// Frame is made of 4 thick box (2 Horizontal and 2 Vertical)
- G4Box* solidFrameHorizontal = new G4Box(Name + "Frame", 0.5*SiliconSize, 0.5*(DetectorSize - SiliconSize) / 2, 0.5*3*mm) ;
- G4Box* solidFrameVertical = new G4Box(Name + "Frame", 0.5*(DetectorSize - SiliconSize) / 2, 0.5*DetectorSize, 0.5*3*mm) ;
+ G4Box* solidFrameHorizontal = new G4Box(Name + "Frame", 0.5*SiliconSize, 0.5*(DetectorSize - SiliconSize) / 2, 0.5*FrameThickness*mm) ;
+ G4Box* solidFrameVertical = new G4Box(Name + "Frame", 0.5*(DetectorSize - SiliconSize) / 2, 0.5*DetectorSize, 0.5*FrameThickness*mm) ;
G4LogicalVolume* logicFrameHorizontal =
new G4LogicalVolume(solidFrameHorizontal, Al, Name, 0, 0);