diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis index 4a6726f22173df4161279eda7ba26322d4933327..e9398425686fe76955511aabcdfd989585e265d7 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 eef1cd4254777d0770bb24083d14f12fc0c4aa56..0e6cd2b569689527a0b221415fdd7ba0f6a3dd4e 100644 --- a/NPAnalysis/10He_Riken/include/ObjectManager.hh +++ b/NPAnalysis/10He_Riken/include/ObjectManager.hh @@ -105,25 +105,25 @@ namespace ENERGYLOSS { // Declare your Energy loss here : - EnergyLoss He3TargetWind = EnergyLoss ( "3He_Mylar.txt" , - 100000 , - 1 , - 3 ); + EnergyLoss He3TargetWind = EnergyLoss ( "3He_Mylar.txt" , + 1000 , + 1 , + 3 ); EnergyLoss He3TargetGaz = EnergyLoss ( "3He_D2gaz_1b_26K.txt" , - 100000 , - 1 , - 3 ); + 1000 , + 1 , + 3 ); - EnergyLoss He3StripAl = EnergyLoss ( "3He_Al.txt" , - 100000 , - 1 , - 3 ); + EnergyLoss He3StripAl = EnergyLoss ( "3He_Al.txt" , + 1000 , + 1 , + 3 ); - EnergyLoss He3StripSi = EnergyLoss ( "3He_Si.txt" , - 100000 , - 1 , - 3 ); + EnergyLoss He3StripSi = EnergyLoss ( "3He_Si.txt" , + 1000 , + 1 , + 3 ); } diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc index a05f1ef61a1c56792bebc901f3622417e5095a1e..a5994dbe2e865ca321137b851fbd009dde41d0f6 100644 --- a/NPAnalysis/10He_Riken/src/Analysis.cc +++ b/NPAnalysis/10He_Riken/src/Analysis.cc @@ -87,7 +87,7 @@ double TrueE=0 ; double TrueTheta=0 ; // E= He3StripAl.EvaluateInitialEnergy( E , // Energy of the detected particle // 2*2*0.4*micrometer , // One for ThinSi and one for Must // 0 ); - + E= He3StripAl.EvaluateInitialEnergy( E , // Energy of the detected particle 0.4*micrometer , // Target Thickness at 0 degree 0 ); diff --git a/NPAnalysis/10He_Riken/src/GNUmakefile b/NPAnalysis/10He_Riken/src/GNUmakefile index 1d51c0a332bee2d9721bd0b61501125b32189c95..15a9a7a10e9dc1d50489b0a14210d6697621466d 100644 --- a/NPAnalysis/10He_Riken/src/GNUmakefile +++ b/NPAnalysis/10He_Riken/src/GNUmakefile @@ -23,7 +23,7 @@ LDFLAGS+= -L$(NPLIB)/lib -lVDetector -lIORoot -lReaction -lEnergyLoss \ LDFLAGS+= -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) SRC= $(wildcard *.cc) -INC= $(wildcard *.hh) +INC= $(wildcard $(NPAINCLUDES)/*.hh) OBJ=$(SRC:.cc=.o) #all:$(EXEC)