diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis index fb4588d23ff2511259a373e62ac6e9bbb7a2b228..26e6e27779acdfb7f4c0a90264d8b8cda462c3a6 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 43f0637655de55f51617f51752ee4cf4848e2857..d8120bdb7d1422eb74467f6b384e056bc987cf98 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 f0088f64fe70d541eafbab5c9e657643cadc84d7..f1003bc7c1b0f398376d9ef52dead1ff739faafa 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 dfb319ab5df675571944d333767e8acb9e9a30ea..30c5360df7615ae5381ec5c6fc900926aa111f96 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 ;}