diff --git a/Inputs/EventGenerator/Example1.reaction b/Inputs/EventGenerator/Example1.reaction
index 2461a6e242fd81cbbffbee76be42f21a82f03038..4eb8f8ee2fa5c39f0b4f555f9b8372cda2d276c8 100644
--- a/Inputs/EventGenerator/Example1.reaction
+++ b/Inputs/EventGenerator/Example1.reaction
@@ -34,12 +34,12 @@ TwoBodyReaction
ShootHeavy= 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%Decay 10He
-% Daughter= 8He n n
-% ExcitationEnergy= 0 0 0 MeV
-% Threshold= 0 MeV
-% BranchingRatio= 0.5
-% LifeTime= 0 ns
-% Shoot= 1 1 1
+Decay 10He
+ Daughter= 8He n n
+ ExcitationEnergy= 0 0 0 MeV
+ Threshold= 0 MeV
+ BranchingRatio= 0.5
+ LifeTime= 0 ns
+ Shoot= 1 1 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPLib/scripts/NPToolLogon.C b/NPLib/scripts/NPToolLogon.C
index d3bdf5e8d522dce0bdab1163475232fe6e6386c3..f33ea030d0d6fb7846185f486c88ade64b4ae402 100644
--- a/NPLib/scripts/NPToolLogon.C
+++ b/NPLib/scripts/NPToolLogon.C
@@ -36,6 +36,14 @@ using namespace std;
#include"TRandom.h"
#include"TRandom2.h"
+bool contains(std::string path,std::string search){
+ if(path.find(search)!=std::string::npos)
+ return true;
+ else
+ return false;
+ }
+
+/////////////////////////////////////////////////////
void NPToolLogon(){
#ifdef __APPLE__
@@ -74,8 +82,8 @@ void NPToolLogon(){
if(!check){
// Add shared libraries
- TString libpath = Form("%s/NPLib/lib", path.c_str());
- TSystemDirectory libdir("libdir", libpath);
+ std::string libpath = Form("%s/NPLib/lib", path.c_str());
+ TSystemDirectory libdir("libdir", libpath.c_str());
TList* listfile = libdir.GetListOfFiles();
// Since the list is ordered alphabetically and that the
@@ -83,7 +91,8 @@ void NPToolLogon(){
// lib*Physics.dylib libraries, it is then loaded manually
// first.
// Test if the lib directory is empty or not
- if (listfile->GetEntries() > 2) gSystem->Load(libpath+"/libNPCore"+Lib_Extension);
+ std::string load_path = libpath+"/libNPCore"+Lib_Extension;
+ if (listfile->GetEntries() > 2) gSystem->Load(load_path.c_str());
gSystem->Load("libPhysics.so"); // Needed by Must2 and Sharc
gSystem->Load("libHist.so"); // Needed by TSpectra Class
@@ -91,30 +100,30 @@ void NPToolLogon(){
// Loop on Data libraries
Int_t i = 0;
while (listfile->At(i)) {
- TString libname = listfile->At(i++)->GetName();
- if (libname.Contains(Lib_Extension) && libname.Contains("Data") && !libname.Contains("libVDetector"+Lib_Extension)) {
- TString lib = libpath + "/" + libname;
- gSystem->Load(lib);
+ std::string libname = listfile->At(i++)->GetName();
+ if (contains(libname,Lib_Extension) && contains(libname,"Data") && !contains(libname,"libVDetector"+Lib_Extension)) {
+ std::string lib = libpath + "/" + libname;
+ gSystem->Load(lib.c_str());
}
}
// Loop on Physics Library
i = 0;
while (listfile->At(i)) {
- TString libname = listfile->At(i++)->GetName();
- if (libname.Contains(Lib_Extension) && libname.Contains("Physics") &&!libname.Contains("libVDetector"+Lib_Extension)) {
- TString lib = libpath + "/" + libname;
- gSystem->Load(lib);
+ std::string libname = listfile->At(i++)->GetName();
+ if (contains(libname,Lib_Extension) && contains(libname,"Physics") &&!contains(libname,"libVDetector"+Lib_Extension)) {
+ std::string lib = libpath + "/" + libname;
+ gSystem->Load(lib.c_str());
}
}
// Loop on the Reset of the Library
i = 0;
while (listfile->At(i)) {
- TString libname = listfile->At(i++)->GetName();
- if (libname.Contains(Lib_Extension) && !libname.Contains("Physics") && !libname.Contains("Data") &&!libname.Contains("libVDetector"+Lib_Extension)) {
- TString lib = libpath + "/" + libname;
- gSystem->Load(lib);
+ std::string libname = listfile->At(i++)->GetName();
+ if (contains(libname,Lib_Extension) && !contains(libname,"Physics") && !contains(libname,"Data") &&!contains(libname,"libVDetector"+Lib_Extension)) {
+ std::string lib = libpath + "/" + libname;
+ gSystem->Load(lib.c_str());
}
}
@@ -125,3 +134,5 @@ void NPToolLogon(){
gSystem->cd(currentpath.c_str());
}
}
+
+
diff --git a/NPSimulation/Detectors/Mugast/Mugast.cc b/NPSimulation/Detectors/Mugast/Mugast.cc
index 2b6f7895627fb8ff9e83df0ab30c8ce4942e8f81..6efd81e8ba5b9b6a76eb3041e2a35b917f036412 100644
--- a/NPSimulation/Detectors/Mugast/Mugast.cc
+++ b/NPSimulation/Detectors/Mugast/Mugast.cc
@@ -64,7 +64,7 @@ using namespace CLHEP;
namespace Mugast_NS{
// Resolution
const G4double SigmaTime = 0.212765957 ;// = 500ps
- const G4double SigmaEnergy = 0.0149 ;// 0.0223 = 52keV of Resolution // Unit is MeV/2.35 14.861996
+ const G4double SigmaEnergy = 0.019 ;//
// const G4double TimeOffset = 500 ;// 500 ns stop
// Threshold
diff --git a/Projects/MUGAST/16Odp17O_870keV_12.reaction b/Projects/MUGAST/16Odp17O_870keV_12.reaction
new file mode 100644
index 0000000000000000000000000000000000000000..e12027a95dde91ab03c60e67d5623de4e7f5059b
--- /dev/null
+++ b/Projects/MUGAST/16Odp17O_870keV_12.reaction
@@ -0,0 +1,30 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Reaction file: 56Ni(d,p)57Ni at VAMOS-AGATA %%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Beam
+ Particle= 16O
+ Energy= 96 MeV
+ SigmaEnergy= 0 MeV
+ SigmaX= 0 mm
+ SigmaY= 0 mm
+ SigmaThetaX= 0.0 deg
+ SigmaPhiY= 0.0 deg
+ MeanThetaX= 0 mm
+ MeanPhiY= 0 mm
+ MeanX= 0 mm
+ MeanY= 0 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+TwoBodyReaction
+ Beam= 16O
+ Target= 2H
+ Light= 1H
+ Heavy= 17O
+ ExcitationEnergyLight= 0.0 MeV
+ ExcitationEnergyHeavy= 0.870 MeV
+ CrossSectionPath= 16Odp17O_s12_6AMeV.dat CS
+ %CrossSectionPath= flat.txt CS
+ ShootLight= 1
+ ShootHeavy= 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Projects/MUGAST/16Odp17O_s12_6AMeV.dat b/Projects/MUGAST/16Odp17O_s12_6AMeV.dat
new file mode 100644
index 0000000000000000000000000000000000000000..81dcbecd1a9eedbb800b9e3841a5b0274e48207a
--- /dev/null
+++ b/Projects/MUGAST/16Odp17O_s12_6AMeV.dat
@@ -0,0 +1,181 @@
+ 0.00 1.914689E+02
+ 1.00 1.903373E+02
+ 2.00 1.869800E+02
+ 3.00 1.815069E+02
+ 4.00 1.740951E+02
+ 5.00 1.649792E+02
+ 6.00 1.544396E+02
+ 7.00 1.427886E+02
+ 8.00 1.303562E+02
+ 9.00 1.174749E+02
+ 10.00 1.044670E+02
+ 11.00 9.163196E+01
+ 12.00 7.923714E+01
+ 13.00 6.751044E+01
+ 14.00 5.663581E+01
+ 15.00 4.675114E+01
+ 16.00 3.794856E+01
+ 17.00 3.027664E+01
+ 18.00 2.374425E+01
+ 19.00 1.832545E+01
+ 20.00 1.396521E+01
+ 21.00 1.058544E+01
+ 22.00 8.091037E+00
+ 23.00 6.375645E+00
+ 24.00 5.326967E+00
+ 25.00 4.831442E+00
+ 26.00 4.778200E+00
+ 27.00 5.062263E+00
+ 28.00 5.586985E+00
+ 29.00 6.265784E+00
+ 30.00 7.023207E+00
+ 31.00 7.795429E+00
+ 32.00 8.530265E+00
+ 33.00 9.186782E+00
+ 34.00 9.734620E+00
+ 35.00 1.015309E+01
+ 36.00 1.043010E+01
+ 37.00 1.056108E+01
+ 38.00 1.054776E+01
+ 39.00 1.039707E+01
+ 40.00 1.012002E+01
+ 41.00 9.730684E+00
+ 42.00 9.245242E+00
+ 43.00 8.681144E+00
+ 44.00 8.056363E+00
+ 45.00 7.388755E+00
+ 46.00 6.695534E+00
+ 47.00 5.992840E+00
+ 48.00 5.295413E+00
+ 49.00 4.616354E+00
+ 50.00 3.966975E+00
+ 51.00 3.356727E+00
+ 52.00 2.793184E+00
+ 53.00 2.282089E+00
+ 54.00 1.827444E+00
+ 55.00 1.431633E+00
+ 56.00 1.095566E+00
+ 57.00 8.188420E-01
+ 58.00 5.999210E-01
+ 59.00 4.362965E-01
+ 60.00 3.246654E-01
+ 61.00 2.610923E-01
+ 62.00 2.411648E-01
+ 63.00 2.601375E-01
+ 64.00 3.130644E-01
+ 65.00 3.949183E-01
+ 66.00 5.006971E-01
+ 67.00 6.255160E-01
+ 68.00 7.646870E-01
+ 69.00 9.137842E-01
+ 70.00 1.068696E+00
+ 71.00 1.225665E+00
+ 72.00 1.381317E+00
+ 73.00 1.532673E+00
+ 74.00 1.677160E+00
+ 75.00 1.812607E+00
+ 76.00 1.937231E+00
+ 77.00 2.049626E+00
+ 78.00 2.148737E+00
+ 79.00 2.233833E+00
+ 80.00 2.304484E+00
+ 81.00 2.360527E+00
+ 82.00 2.402038E+00
+ 83.00 2.429303E+00
+ 84.00 2.442784E+00
+ 85.00 2.443096E+00
+ 86.00 2.430979E+00
+ 87.00 2.407270E+00
+ 88.00 2.372884E+00
+ 89.00 2.328788E+00
+ 90.00 2.275983E+00
+ 91.00 2.215488E+00
+ 92.00 2.148320E+00
+ 93.00 2.075485E+00
+ 94.00 1.997958E+00
+ 95.00 1.916681E+00
+ 96.00 1.832548E+00
+ 97.00 1.746401E+00
+ 98.00 1.659024E+00
+ 99.00 1.571140E+00
+ 100.00 1.483406E+00
+ 101.00 1.396416E+00
+ 102.00 1.310700E+00
+ 103.00 1.226720E+00
+ 104.00 1.144883E+00
+ 105.00 1.065532E+00
+ 106.00 9.889562E-01
+ 107.00 9.153939E-01
+ 108.00 8.450342E-01
+ 109.00 7.780226E-01
+ 110.00 7.144647E-01
+ 111.00 6.544303E-01
+ 112.00 5.979575E-01
+ 113.00 5.450562E-01
+ 114.00 4.957125E-01
+ 115.00 4.498914E-01
+ 116.00 4.075406E-01
+ 117.00 3.685935E-01
+ 118.00 3.329718E-01
+ 119.00 3.005884E-01
+ 120.00 2.713494E-01
+ 121.00 2.451567E-01
+ 122.00 2.219092E-01
+ 123.00 2.015054E-01
+ 124.00 1.838436E-01
+ 125.00 1.688244E-01
+ 126.00 1.563506E-01
+ 127.00 1.463287E-01
+ 128.00 1.386690E-01
+ 129.00 1.332863E-01
+ 130.00 1.301001E-01
+ 131.00 1.290345E-01
+ 132.00 1.300181E-01
+ 133.00 1.329839E-01
+ 134.00 1.378690E-01
+ 135.00 1.446138E-01
+ 136.00 1.531618E-01
+ 137.00 1.634589E-01
+ 138.00 1.754528E-01
+ 139.00 1.890917E-01
+ 140.00 2.043247E-01
+ 141.00 2.210998E-01
+ 142.00 2.393642E-01
+ 143.00 2.590627E-01
+ 144.00 2.801377E-01
+ 145.00 3.025281E-01
+ 146.00 3.261691E-01
+ 147.00 3.509911E-01
+ 148.00 3.769198E-01
+ 149.00 4.038755E-01
+ 150.00 4.317730E-01
+ 151.00 4.605210E-01
+ 152.00 4.900226E-01
+ 153.00 5.201749E-01
+ 154.00 5.508690E-01
+ 155.00 5.819905E-01
+ 156.00 6.134197E-01
+ 157.00 6.450319E-01
+ 158.00 6.766977E-01
+ 159.00 7.082841E-01
+ 160.00 7.396547E-01
+ 161.00 7.706706E-01
+ 162.00 8.011912E-01
+ 163.00 8.310749E-01
+ 164.00 8.601802E-01
+ 165.00 8.883668E-01
+ 166.00 9.154959E-01
+ 167.00 9.414322E-01
+ 168.00 9.660438E-01
+ 169.00 9.892042E-01
+ 170.00 1.010792E+00
+ 171.00 1.030695E+00
+ 172.00 1.048805E+00
+ 173.00 1.065026E+00
+ 174.00 1.079269E+00
+ 175.00 1.091457E+00
+ 176.00 1.101522E+00
+ 177.00 1.109409E+00
+ 178.00 1.115074E+00
+ 179.00 1.118486E+00
+ 180.00 1.119625E+00
diff --git a/Projects/MUGAST/ShowResults.C b/Projects/MUGAST/ShowResults.C
index d5fe10231893ad266a0be132da88934b6f6ef3b5..a2545748330069d630b22ab6eb54f93527a0bb32 100644
--- a/Projects/MUGAST/ShowResults.C
+++ b/Projects/MUGAST/ShowResults.C
@@ -87,7 +87,7 @@ void ShowResults(){
}
}
-
+/*
TCanvas *c2 = new TCanvas("c2", "Control", 1000, 1000);
c2->Divide(2,2);
c2->cd(1);
@@ -100,7 +100,7 @@ void ShowResults(){
t->Draw("ELab-OriginalELab>>hcE","","col");
TLine* lE = new TLine(0,0,60,60);
//lE->Draw();
-
+*/
}
diff --git a/Projects/MUGAST/e793.detector b/Projects/MUGAST/e793.detector
new file mode 100644
index 0000000000000000000000000000000000000000..1bb1133dc9fbab2031012fdd6b18b505317468f7
--- /dev/null
+++ b/Projects/MUGAST/e793.detector
@@ -0,0 +1,147 @@
+%%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Target
+ THICKNESS= 0.01 micrometer
+ ANGLE= 0 deg
+ RADIUS= 10 mm
+ MATERIAL= CD2
+ X= 0
+ Y= 0
+ Z= 0
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ X1_Y1= 35.56 -35.56 -2658 mm
+ X28_Y28= -35.56 35.56 -2658 mm
+ X1_Y28= 35.56 35.56 -2658 mm
+ X28_Y1= -35.56 -35.56 -2658 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ X28_Y1= -35.56 35.56 -2045 mm
+ X1_Y28= 35.56 -35.56 -2045 mm
+ X28_Y28= -35.56 -35.56 -2045 mm
+ X1_Y1= 35.56 35.56 -2045 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%% Telescope 1 %%%%%%%
+M2Telescope
+ X128_Y128= 115.88 9.61 154.54 mm
+ X128_Y1= 104.8 101.89 125.09 mm
+ X1_Y1= 14.55 102.4 160.63 mm
+ X1_Y128= 25.63 10.12 190.08 mm
+ SI= 1.00
+ SILI= 0.00
+ CSI= 1.00
+ VIS= all
+
+%%%%%%% Telescope 2 %%%%%%%
+M2Telescope
+ X128_Y128= -11.23 102.42 160.87 mm
+ X128_Y1= -101.39 102.39 124.37 mm
+ X1_Y1= -113.17 10.36 153.56 mm
+ X1_Y128= -23.03 10.38 190.05 mm
+ SI= 1.00
+ SILI= 0.00
+ CSI= 1.00
+ VIS= all
+
+%%%%%%% Telescope 3 %%%%%%%
+M2Telescope
+ X128_Y128= -113.28 -12.52 153.32 mm
+ X128_Y1= -101.58 -104.77 124.82 mm
+ X1_Y1= -11.39 -104.58 161.48 mm
+ X1_Y128= -23.1 -12.34 189.98 mm
+ SI= 1.00
+ SILI= 0.00
+ CSI= 1.00
+ VIS= all
+
+%%%%%%% Telescope 4 %%%%%%%
+M2Telescope
+ X128_Y128= 13.82 -104.92 160.72 mm
+ X128_Y1= 104.3 -104.95 125.08 mm
+ X1_Y1= 115.75 -12.73 153.76 mm
+ X1_Y128= 25.23 -12.65 189.43 mm
+ SI= 1.00
+ SILI= 0.00
+ CSI= 1.00
+ VIS= all
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%POS TO UPDATE%%%%%%%%%
+Mugast Trapezoid
+ DetectorNumber= 8
+ X128_Y128= -15.11 -44.73 -99.25 mm
+ X1_Y128= 10.11 -44.71 -99.35 mm
+ X1_Y1= 43.37 -125.07 -32.74 mm
+ X128_Y1= -48.18 -125.07 -32.45 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Mugast Trapezoid
+ DetectorNumber= 1
+ X128_Y128= -23.05 42.83 -99.66 mm
+ X1_Y128= -40.74 25.21 -99.65 mm
+ X1_Y1= -120.65 58.67 -32.39 mm
+ X128_Y1= -55.66 123.17 -32.55 mm
+
+%%%%%%%%%%%%%%%%%%%%%POS TO UPDATE%%%%%%%%%
+Mugast Trapezoid
+ DetectorNumber= 2
+ X128_Y128= -45.68 14.28 -98.74 mm
+ X1_Y128= -45.68 -10.92 -98.74 mm
+ X1_Y1= -125.65 -44.06 -31.63 mm
+ X128_Y1= -125.65 47.42 -31.63 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Mugast Trapezoid
+ DetectorNumber= 3
+ X128_Y128= -48.05 -23.23 -95.05 mm
+ X1_Y128= -24.83 -39.35 -99.33 mm
+ X1_Y1= -58.24 -119.46 -32.57 mm
+ X128_Y1= -122.86 -54.55 -32.41 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Mugast Trapezoid
+ DetectorNumber= 4
+ X128_Y128= -15.11 -44.73 -99.25 mm
+ X1_Y128= 10.11 -44.71 -99.35 mm
+ X1_Y1= 43.37 -125.07 -32.74 mm
+ X128_Y1= -48.18 -125.07 -32.45 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Mugast Trapezoid
+ DetectorNumber= 5
+ X128_Y128= 21.68 -41.48 -100.19 mm
+ X1_Y128= 39.55 -23.81 -100.11 mm
+ X1_Y1= 119.55 -57.08 -33.23 mm
+ X128_Y1= 54.81 -121.7 -33.12 mm
+
+%%%%%%%%%%%%%%%%%%%%POS TO UPDATE%%%%%%%%%
+%Mugast Trapezoid
+% DetectorNumber= 6
+% X128_Y128= 45.68 -14.28 -98.74 mm
+% X1_Y128= 45.68 10.92 -98.74 mm
+% X1_Y1= 125.65 44.06 -31.63 mm
+% X128_Y1= 125.65 -47.42 -31.63 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Mugast Trapezoid
+ DetectorNumber= 7
+ X128_Y128= 40.99 21.69 -98.21 mm
+ X1_Y128= 23.34 39.63 -98.04 mm
+ X1_Y1= 57.53 120.53 -32.58 mm
+ X128_Y1= 122.2 55.73 -32.67 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Mugast Square
+ DetectorNumber= 9
+ X128_Y128= 107.49 -95.88 0.0 mm
+ X1_Y128= 143.81 -8.21 0.0 mm
+ X1_Y1= 143.81 -8.21 91.7 mm
+ X128_Y1= 107.49 -95.88 91.7 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Mugast Annular
+ DetectorNumber= 11
+ Center= -0.3 1 -126.9 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Projects/Nebula/Nebula.detector b/Projects/Nebula/Nebula.detector
index 7bb9d72bebbcf9119852278c3f165f90b8dccc9c..776b850b709616f294bad3e2fb95df2c9a2e0aae 100644
--- a/Projects/Nebula/Nebula.detector
+++ b/Projects/Nebula/Nebula.detector
@@ -20,4 +20,14 @@ Nebula
Veto= 0
Frame= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%%%%%%% Telescope 1 %%%%%%%
+M2Telescope
+ X1_Y1= -50.23 50.23 365 mm
+ X1_Y128= -50.23 -50.23 365 mm
+ X128_Y128= 50.23 -50.23 365 mm
+ X128_Y1= 50.23 50.23 365 mm
+ SI= 1
+ SILI= 0
+ CSI= 1
+ VIS= all
+