diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis index 75f4cb005797b9560b71bcab202eac2dbc49b5fb..7cef41140871d8998f1f75d4d3721c747100421e 100755 Binary files a/NPAnalysis/10He_Riken/Analysis and b/NPAnalysis/10He_Riken/Analysis differ diff --git a/NPAnalysis/Gaspard/include/ObjectManager.hh b/NPAnalysis/Gaspard/include/ObjectManager.hh index beaa696da29c95da8214bffd50b8990f0cd8217e..50cd38902a87965e936d7092ee5f3de09d344f11 100644 --- a/NPAnalysis/Gaspard/include/ObjectManager.hh +++ b/NPAnalysis/Gaspard/include/ObjectManager.hh @@ -104,7 +104,8 @@ using namespace NPL ; namespace ENERGYLOSS { // Declare your Energy loss here - EnergyLoss DeutonTargetCD2 = EnergyLoss("deuton_cd2.txt", 100, 1, 2); +// EnergyLoss DeutonTargetCD2 = EnergyLoss("deuton_cd2.txt", 100, 1, 2); + EnergyLoss DeutonTargetCD2 = EnergyLoss("proton_cd2.txt", 100, 1, 2); } using namespace ENERGYLOSS ; diff --git a/NPSimulation/src/Target.cc b/NPSimulation/src/Target.cc index b9e382610e6ea7e917e5992287c6008860af40ba..ec13519f9ec18f8a9cfbdd0b7f887e724995be0e 100644 --- a/NPSimulation/src/Target.cc +++ b/NPSimulation/src/Target.cc @@ -292,7 +292,7 @@ void Target::ReadConfiguration(string Path) cout << m_TargetZ / mm << " )" << endl ; } - else if (DataBuffer.compare(0, 9, "NbLayers=") == 0) { + else if (DataBuffer.compare(0, 9, "NBLAYERS=") == 0) { check_m_TargetNbLayers = true ; ConfigFile >> DataBuffer; m_TargetNbLayers = atoi(DataBuffer.c_str()); @@ -386,7 +386,7 @@ void Target::ReadConfiguration(string Path) cout << m_TargetZ / mm << " )" << endl ; } - else if (DataBuffer.compare(0, 9, "m_TargetNbLayers=") == 0) { + else if (DataBuffer.compare(0, 9, "NBLAYERS=") == 0) { check_m_TargetNbLayers = true ; ConfigFile >> DataBuffer; m_TargetNbLayers = atoi(DataBuffer.c_str());