From 6b89b229f31d4b16e0e005bbd517b59231618363 Mon Sep 17 00:00:00 2001
From: Unknown <unknown>
Date: Wed, 2 Oct 2013 10:00:25 +0000
Subject: [PATCH]
---
NPAnalysis/10He_Riken/Analysis | Bin 65712 -> 65712 bytes
.../10He_Riken/include/ObjectManager.hh | 30 +++++++++---------
NPAnalysis/10He_Riken/src/Analysis.cc | 2 +-
NPAnalysis/10He_Riken/src/GNUmakefile | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis
index 4a6726f22173df4161279eda7ba26322d4933327..e9398425686fe76955511aabcdfd989585e265d7 100755
GIT binary patch
delta 68
zcmdnc$g%;5Di}qIrrcW?c1>%4(Ce+)y4vd&@Bi}Z+2$U`@)+h9%nXy+;<kY4y->O&
M9?ajYozS`f06{?>AOHXW
delta 68
zcmdnc$g%;5Di}q~Q~$*VDY@<cbfDza|I><_vu<kEZ0=z!k6~WW#yFWRZVQ;+3#Ciq
L!TinI39SnN8WSDU
diff --git a/NPAnalysis/10He_Riken/include/ObjectManager.hh b/NPAnalysis/10He_Riken/include/ObjectManager.hh
index eef1cd425..0e6cd2b56 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 a05f1ef61..a5994dbe2 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 1d51c0a33..15a9a7a10 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)
--
GitLab