diff --git a/Inputs/EventGenerator/10He.reaction b/Inputs/EventGenerator/10He.reaction
index 2c1407b0f4d2339fef7a3ead00cc6e449d203b9a..2c89aa85c0eaa4890c09a387316198103333f977 100644
--- a/Inputs/EventGenerator/10He.reaction
+++ b/Inputs/EventGenerator/10He.reaction
@@ -19,7 +19,7 @@ TransfertToResonance
ResonanceDecayA= 8
CrossSectionPath= 11Li(d,3He)10He.txt
ShootLight= 1
- ShootHeavy= 1
+ ShootHeavy= 0
ShootDecayProduct= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis
index e45aba2337d941b4290b9fffcde8bb1d1a00e1f0..59f527f9d00c3ebb0de4ab83fe2eb345fcc3f2f7 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 bc9b0684a7361b53b5700a7bcb330281ffaefa54..9f84a86bd3dbeee5fc2b356fa15e4b145bb623b1 100644
--- a/NPAnalysis/10He_Riken/include/ObjectManager.hh
+++ b/NPAnalysis/10He_Riken/include/ObjectManager.hh
@@ -109,39 +109,39 @@ namespace ENERGYLOSS
// 3He Energy Loss
EnergyLoss He3TargetWind = EnergyLoss ( "3He_Mylar.txt" ,
1000 ,
- 1 ,
+ 3 ,
3 );
- EnergyLoss He3TargetGaz = EnergyLoss ( "3He_D2gaz_1b_26K.txt" ,
+ EnergyLoss He3TargetGaz = EnergyLoss ( "3He_D2solid_1b_26K.txt" ,
1000 ,
- 1 ,
+ 3 ,
3 );
EnergyLoss He3StripAl = EnergyLoss ( "3He_Al.txt" ,
1000 ,
- 1 ,
+ 3 ,
3 );
EnergyLoss He3StripSi = EnergyLoss ( "3He_Si.txt" ,
1000 ,
- 1 ,
+ 3 ,
3 );
// proton Energy Loss
EnergyLoss protonTargetWind = EnergyLoss ( "proton_Mylar.txt" ,
1000 ,
- 1 ,
+ 3 ,
1 );
EnergyLoss protonTargetGaz = EnergyLoss ( "proton_D2gaz_1b_26K.txt" ,
1000 ,
- 1 ,
+ 3 ,
1 );
EnergyLoss protonStripAl = EnergyLoss ( "proton_Al.txt" ,
100 ,
- 1 ,
+ 3 ,
1 );
diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc
index ca47ae0997ea8a394215e43e50beec12a41c549a..e6b193ec156b4b8a399d53eff8d9ffae66b23916 100644
--- a/NPAnalysis/10He_Riken/src/Analysis.cc
+++ b/NPAnalysis/10He_Riken/src/Analysis.cc
@@ -141,30 +141,31 @@ int main(int argc,char** argv)
{
if(ELab[hit]>-1000 && ThinSi_E>0 )
{
- ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
- 2*0.4*micrometer , // Target Thickness at 0 degree
- ThetaMM2Surface );
+ ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
+ 2*0.4*micrometer , // Target Thickness at 0 degree
+ ThetaMM2Surface );
- ELab[hit]= He3StripSi.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
- 20*micrometer , // Target Thickness at 0 degree
- ThetaMM2Surface );
+ ELab[hit]= He3StripSi.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
+ 20*micrometer , // Target Thickness at 0 degree
+ ThetaMM2Surface );
- ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
- 0.4*micrometer , // Target Thickness at 0 degree
- ThetaMM2Surface );
+ ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
+ 0.4*micrometer , // Target Thickness at 0 degree
+ ThetaMM2Surface );
ELab[hit]= He3TargetWind.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
- 15*micrometer , // Target Thickness at 0 degree
- ThetaN );
+ 15*micrometer , // Target Thickness at 0 degree
+ ThetaN );
ELab[hit]= He3TargetGaz.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
- 1.5*mm , // Target Thickness at 0 degree
- ThetaN );
+ 1.5*mm , // Target Thickness at 0 degree
+ ThetaN );
- ThetaCM[hit] = myReaction -> EnergyLabToThetaCM( ELab[hit] , 1 ) /deg ;
+ ThetaCM[hit] = myReaction -> EnergyLabToThetaCM( ELab[hit] ) /deg ;
ExcitationEnergy[hit] = myReaction -> ReconstructRelativistic( ELab[hit] , ThetaLab[hit] ) ;
X[hit] = HitDirection . X();
+ X[hit] = HitDirection . X();
Y[hit] = HitDirection . Y();
ThetaLab[hit] = ThetaLab[hit] / deg ;
}
@@ -244,7 +245,7 @@ int main(int argc,char** argv)
// Plastic
for(int yy = 0 ; yy < Plastic->GetEnergySize() ; yy++)
{
- if(Plastic->GetPlasticNumber(yy)==1) EPl1[yy]=Plastic->GetEnergy(yy);
+ if(Plastic->GetPlasticNumber(yy)==1) EPl1[yy]=Plastic->GetEnergy(yy);
else if(Plastic->GetPlasticNumber(yy)==2) EPl2[yy]=Plastic->GetEnergy(yy);
}
diff --git a/NPLib/Tools/NPReaction.cxx b/NPLib/Tools/NPReaction.cxx
index b2cc194c06a2e9cc08fc15b9ff54110c91cad8b3..1eaec349f49062837ab76ddcebbb9574127b1d14 100644
--- a/NPLib/Tools/NPReaction.cxx
+++ b/NPLib/Tools/NPReaction.cxx
@@ -231,7 +231,7 @@ double Reaction::ReconstructRelativistic(double EnergyLab, double ThetaLab) cons
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//Return ThetaCM
-double Reaction::EnergyLabToThetaCM( double EnergyLab , double ExcitationEnergy = -500) const
+double Reaction::EnergyLabToThetaCM( double EnergyLab , double ExcitationEnergy ) const
{
if(ExcitationEnergy == -500) ExcitationEnergy = fExcitation;
diff --git a/NPLib/Tools/NPReaction.h b/NPLib/Tools/NPReaction.h
index 3ab556da14523e1786fd56ccfe701af5d0af30a5..d8d638aea81d5107513ad4d008a428af8e34bf3b 100644
--- a/NPLib/Tools/NPReaction.h
+++ b/NPLib/Tools/NPReaction.h
@@ -94,7 +94,7 @@ namespace NPL
double ThetaLab) const;
// Return ThetaCM
double EnergyLabToThetaCM( double EnergyLab , // Energy Measured in lab ref
- double ExcitationEnergy ) // Excitation Energy previously calculated. If no argument given, fExcitation is used
+ double ExcitationEnergy = -500) // Excitation Energy previously calculated. If no argument given, fExcitation is used
const;
// Other //
diff --git a/NPSimulation/src/PhysicsList.cc b/NPSimulation/src/PhysicsList.cc
index 5b8679f84be07212c57668ba3ada4a2b521186cc..7c7c186d44f58b774f212b69261c56fe4d03f84d 100644
--- a/NPSimulation/src/PhysicsList.cc
+++ b/NPSimulation/src/PhysicsList.cc
@@ -212,7 +212,7 @@ void PhysicsList::ConstructEM()
pmanager->AddProcess(new G4MultipleScattering(), -1, 1, 1) ;
G4ionIonisation* iI = new G4ionIonisation ;
// mod by Nicolas [07/05/09]
-// iI->ActivateNuclearStopping(true) ;
+ iI->ActivateNuclearStopping(true) ;
iI->ActivateStoppingData(true) ;
pmanager->AddProcess(iI , -1, 2, 2) ;