diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis
index 4971deaa460a2813721916eea8cdb3f2d6cec81b..fb4588d23ff2511259a373e62ac6e9bbb7a2b228 100755
Binary files a/NPAnalysis/10He_Riken/Analysis and b/NPAnalysis/10He_Riken/Analysis differ
diff --git a/NPAnalysis/10He_Riken/include/ObjectManager.hh b/NPAnalysis/10He_Riken/include/ObjectManager.hh
index 01328403c184a28c276191c6bf3ee44d45d37992..43f0637655de55f51617f51752ee4cf4848e2857 100644
--- a/NPAnalysis/10He_Riken/include/ObjectManager.hh
+++ b/NPAnalysis/10He_Riken/include/ObjectManager.hh
@@ -106,23 +106,23 @@ namespace ENERGYLOSS
// Declare your Energy loss here :
EnergyLoss He3TargetWind = EnergyLoss ( "3He_Mylar.txt" ,
- 1000 ,
+ 100000 ,
1 ,
3 );
- EnergyLoss He3TargetGaz = EnergyLoss ( "xxx.txt" ,
+ EnergyLoss He3TargetGaz = EnergyLoss ( "3He_D2gaz_1b_26K.txt" ,
1000 ,
1 ,
3 );
EnergyLoss He3StripAl = EnergyLoss ( "3He_Al.txt" ,
- 1000 ,
+ 10 ,
1 ,
3 );
EnergyLoss He3StripSi = EnergyLoss ( "3He_Si.txt" ,
- 1000 ,
- 3 ,
+ 10 ,
+ 1 ,
3 );
}
diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc
index 0590389099f7fa15289dabc9fdcabb8f66eb1e05..d23ecc5842529a037d3d7572af67a58b541c6c3f 100644
--- a/NPAnalysis/10He_Riken/src/Analysis.cc
+++ b/NPAnalysis/10He_Riken/src/Analysis.cc
@@ -61,7 +61,7 @@ double TrueE=0 ; double TrueTheta=0 ;
// Get Must2 Pointer:
MUST2Array* M2 = (MUST2Array*) myDetector -> m_Detector["MUST2"] ;
- int i;
+ int i;
for ( i = 0 ; i < Chain -> GetEntries() ; i ++ )
{
if( i%10000 == 0 && i!=0) cout << i << " Event annalysed " << endl ;
@@ -74,8 +74,7 @@ double TrueE=0 ; double TrueTheta=0 ;
BeamTheta = Init->GetICIncidentAngleTheta(0)*deg ; BeamPhi = Init->GetICIncidentAnglePhi(0)*deg ;
-// TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta) , sin(BeamPhi)*sin(BeamTheta) , cos(BeamTheta)) ;
- TVector3 BeamDirection = TVector3(0,0,1) ; BeamDirection.SetTheta(BeamTheta) ; BeamDirection.SetPhi(BeamPhi) ;
+ TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta) , sin(BeamPhi)*sin(BeamTheta) , cos(BeamTheta)) ;
double Theta = ThetaCalculation ( HitDirection , BeamDirection ) ;
double ThetaN = ThetaCalculation ( HitDirection , TVector3(0,0,1) ) ;
double ThetaMM2Surface = ThetaCalculation ( HitDirection , M2 -> GetPositionOfInteraction() );
@@ -85,7 +84,12 @@ double TrueE=0 ; double TrueTheta=0 ;
E= He3StripAl.EvaluateInitialEnergy( E , // Energy of the detected particle
2*0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
- E = E + ThinSi ;
+
+ E= He3StripSi.EvaluateInitialEnergy( E , // Energy of the detected particle
+ 20*micrometer , // Target Thickness at 0 degree
+ ThetaMM2Surface );
+
+// E = E + ThinSi ;
E= He3StripAl.EvaluateInitialEnergy( E , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
@@ -133,6 +137,15 @@ double TrueE=0 ; double TrueTheta=0 ;
else if(E>-1000 )
{
+ if(E>18)//CsI are inside a Mylar foil, plus rear alu strip
+ {
+ E= He3TargetWind.EvaluateInitialEnergy( E , // Energy of the detected particle
+ 3*micrometer , // Target Thickness at 0 degree
+ ThetaMM2Surface );
+ E= He3StripAl.EvaluateInitialEnergy( E , // Energy of the detected particle
+ 0.4*micrometer , // Target Thickness at 0 degree
+ ThetaMM2Surface );
+ }
E= He3StripAl.EvaluateInitialEnergy( E , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree