diff --git a/Inputs/DetectorConfiguration/hira.detector b/Inputs/DetectorConfiguration/hira.detector
index 0420a979eb3256413e3d08bc8be9064e2948a289..5ab9fcd6e020ca3ac6e30e80f8919f54164b03c3 100755
--- a/Inputs/DetectorConfiguration/hira.detector
+++ b/Inputs/DetectorConfiguration/hira.detector
@@ -7,7 +7,7 @@ GeneralTarget
% Radius in mm
% Temperature in K, Pressure in bar
Target
- THICKNESS= 45
+ THICKNESS= 25
ANGLE= 0
RADIUS= 10
MATERIAL= CH2
diff --git a/NPAnalysis/Hira/Analysis b/NPAnalysis/Hira/Analysis
deleted file mode 100755
index a1eda041f6342c1023f4cda8ff998fcfc8212266..0000000000000000000000000000000000000000
Binary files a/NPAnalysis/Hira/Analysis and /dev/null differ
diff --git a/NPAnalysis/Hira/Analysis.cxx b/NPAnalysis/Hira/Analysis.cxx
index 20889f2d5abdd4687eb37e6955bc12039de3e65b..7af350caae37713bde36d68c67276d0c85b2462d 100644
--- a/NPAnalysis/Hira/Analysis.cxx
+++ b/NPAnalysis/Hira/Analysis.cxx
@@ -33,7 +33,9 @@ int main(int argc, char** argv)
// Instantiate some Reaction
NPL::Reaction* TransfertReaction = new Reaction ;
+ //TransfertReaction -> ReadConfigurationFile("34Ar_pd.reaction") ;
TransfertReaction -> ReadConfigurationFile("46Ar_pd.reaction") ;
+ //TransfertReaction -> ReadConfigurationFile("11Be_d3He.reaction") ;
//Get Detector pointer :
THiraPhysics* Hira = (THiraPhysics*) myDetector -> GetDetector("HIRAArray") ;
@@ -158,9 +160,10 @@ int main(int argc, char** argv)
TransfertReaction -> SetNuclei3(ELab, ThetaLab*deg);
ThetaCM = TransfertReaction->GetThetaCM()/deg;
ExcitationEnergy = TransfertReaction->GetExcitation4();
+
+ RootOutput::getInstance()->GetTree()->Fill();
}
}
- RootOutput::getInstance()->GetTree()->Fill();
}
cout << "A total of " << nentries << " event has been annalysed " << endl ;
diff --git a/NPAnalysis/Hira/Analysis.h b/NPAnalysis/Hira/Analysis.h
index 544b4424344bed22bde358b4e24a3fb2c0f4c84e..707a074154bb155f014647bd4d712333f7fae697 100644
--- a/NPAnalysis/Hira/Analysis.h
+++ b/NPAnalysis/Hira/Analysis.h
@@ -125,6 +125,7 @@ namespace ENERGYLOSS
{
EnergyLoss EL_deuteron_CH2 = EnergyLoss("deuteron_CH2.G4table","G4Table",100 );
+ //EnergyLoss EL_deuteron_CH2 = EnergyLoss("He3_CH2.G4table","G4Table",100 );
// Declare your Energy loss here :
/* EnergyLoss DeuerontTarget = EnergyLoss ( "CD2.txt" ,
100 ,
diff --git a/NPAnalysis/Hira/Analysis.o b/NPAnalysis/Hira/Analysis.o
index 23bcb614e32cd6d9b95ed2fc3a516c031d442eb5..d22422d06835e83013f87e372bddf870a1d5f0be 100644
Binary files a/NPAnalysis/Hira/Analysis.o and b/NPAnalysis/Hira/Analysis.o differ
diff --git a/NPAnalysis/Hira/RunToTreat.txt b/NPAnalysis/Hira/RunToTreat.txt
index 706313c9f4cc50aa5fece9fcba99378f4e75187d..39b6e401552c330dff7d5992ecb9a876da2db2b1 100644
--- a/NPAnalysis/Hira/RunToTreat.txt
+++ b/NPAnalysis/Hira/RunToTreat.txt
@@ -1,9 +1,10 @@
TTreeName
SimulatedTree
RootFileName
- %/Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Simulation/simu.root
- /Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Simulation/46Ar_pd.root
+ /Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Simulation/46Ar_pd_gs.root
+ /Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Simulation/46Ar_pd_1st.root
+ %/Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Simulation/34Ar_pd_gs.root
diff --git a/NPAnalysis/Hira/Show.C b/NPAnalysis/Hira/Show.C
index 68361983baba7305f80f0c4bbc15e8d48b70943e..5d32449f0ac33e7b115959858a0d549aa5ebf2aa 100644
--- a/NPAnalysis/Hira/Show.C
+++ b/NPAnalysis/Hira/Show.C
@@ -63,12 +63,13 @@ void Show()
h2->GetYaxis()->SetTitle("E (MeV)");
h2->SetTitle("");
+ //NPL::Reaction *r = new NPL::Reaction("11Be(d,3He)10Li@770");
//NPL::Reaction *r = new NPL::Reaction("34Ar(p,d)33Ar@2380");
NPL::Reaction *r = new NPL::Reaction("46Ar(p,d)45Ar@3220");
kin = r->GetKinematicLine3();
kin->SetLineColor(2);
- //kin->Draw("plsame");
+ kin->Draw("plsame");
mainC3->cd();
chain->Draw("PhiLab:ThetaLab>>h3(100,0,50,720,-180,180)","","colz");
@@ -120,7 +121,9 @@ void InitChain()
if(chain!=NULL){delete chain;}
chain = new TChain("AnalysedTree","");
+ //chain->Add("/Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Analysis/34Ar_pd.root");
chain->Add("/Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Analysis/46Ar_pd.root");
+ //chain->Add("/Users/pierremorfouace/Physics/NPTool/nptool/Outputs/Analysis/11Be_d3He_gs.root");
return;
}