From 24a9ad0e75f7ce35689d47fdb659f879902f9692 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 65696 -> 65696 bytes
.../10He_Riken/include/ObjectManager.hh | 6 +++---
NPAnalysis/10He_Riken/src/Analysis.cc | 10 +++++-----
NPLib/Tools/NPReaction.cxx | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis
index fb4588d23ff2511259a373e62ac6e9bbb7a2b228..26e6e27779acdfb7f4c0a90264d8b8cda462c3a6 100755
GIT binary patch
delta 93
zcmV-j0HXh(fdrs|1h9Ak6s<W2^m-j;ZJ>effOW$`c3ScmV6%(?ZBPNUv-(je4g;Wu
z0h1+Qv;yb@liOgm0_X#?l3{WI3P_1WBm{{RB<MwxE@K}7C6mr#76ELtMPpl?1BE1=
delta 100
zcmZ3`$g-f3WkUs{h;t0{NnhupPy;ogFUGl#b~Em77TVmym>a-2XY;Q>4Zg_}64@qe
yBy42jVwik8VJnc@JSnk=k;|adMTMnPMCFC+<a0@4TsAPS>SVrT`OUt`!E*sG9wUJO
diff --git a/NPAnalysis/10He_Riken/include/ObjectManager.hh b/NPAnalysis/10He_Riken/include/ObjectManager.hh
index 43f063765..d8120bdb7 100644
--- a/NPAnalysis/10He_Riken/include/ObjectManager.hh
+++ b/NPAnalysis/10He_Riken/include/ObjectManager.hh
@@ -111,17 +111,17 @@ namespace ENERGYLOSS
3 );
EnergyLoss He3TargetGaz = EnergyLoss ( "3He_D2gaz_1b_26K.txt" ,
- 1000 ,
+ 100000 ,
1 ,
3 );
EnergyLoss He3StripAl = EnergyLoss ( "3He_Al.txt" ,
- 10 ,
+ 1000 ,
1 ,
3 );
EnergyLoss He3StripSi = EnergyLoss ( "3He_Si.txt" ,
- 10 ,
+ 1000 ,
1 ,
3 );
diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc
index f0088f64f..f1003bc7c 100644
--- a/NPAnalysis/10He_Riken/src/Analysis.cc
+++ b/NPAnalysis/10He_Riken/src/Analysis.cc
@@ -4,14 +4,14 @@ using namespace std;
int main(int argc,char** argv)
{
-
+
if(argc!=4)
{
cout <<
"you need to specify both a Reaction file and a Detector file such as : Analysis myReaction.reaction myDetector.detector runToRead.run"
<< endl;
return 0;
- }
+ }
string reactionfileName = argv[1] ;
string detectorfileName = argv[2] ;
@@ -44,12 +44,12 @@ int main(int argc,char** argv)
RootOutput::getInstance()->GetTree()->Branch("ResolThetaCM",&ResolThetaCM,"ResolThetaCM/D") ;
// Get the formed Chained Tree and Treat it
TChain* Chain = RootInput:: getInstance() -> GetChain() ;
-
+
// Open the ThinSi Branch
Chain->SetBranchStatus("ThinSiEnergy",true) ;
Chain->SetBranchStatus("InitialConditions",true) ;
- Chain->SetBranchStatus("fIC_*",true) ;
-
+ Chain->SetBranchStatus("fIC_*",true) ;
+
TInitialConditions* Init = new TInitialConditions();
Chain->SetBranchAddress("ThinSiEnergy" ,&ThinSi );
Chain->SetBranchAddress("InitialConditions" ,&Init );
diff --git a/NPLib/Tools/NPReaction.cxx b/NPLib/Tools/NPReaction.cxx
index dfb319ab5..30c5360df 100644
--- a/NPLib/Tools/NPReaction.cxx
+++ b/NPLib/Tools/NPReaction.cxx
@@ -299,7 +299,7 @@ void Reaction::ReadConfigurationFile(string Path)
//////////////////////////////////////////////////////////////////////////////////////////
ifstream ReactionFile;
string GlobalPath = getenv("NPTOOL");
- Path = GlobalPath + "/Inputs/Reaction/" + Path;
+ Path = GlobalPath + "/Inputs/EventGenerator/" + Path;
ReactionFile.open(Path.c_str());
if (ReactionFile.is_open()) {cout << "Reading Reaction File " << Path << endl ;}
--
GitLab