diff --git a/Inputs/EventGenerator/12Li.reaction b/Inputs/EventGenerator/12Li.reaction index d8b2cc58eeea144bcb08a5241a558cd6633b769c..4622b307ef6199e6eece0f56edc33b70d5ffd7f5 100644 --- a/Inputs/EventGenerator/12Li.reaction +++ b/Inputs/EventGenerator/12Li.reaction @@ -3,20 +3,28 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm % SigmaThetaX/PhiY in deg -Transfert +Beam + Particle= 11Li + Energy= 550 + SigmaEnergy= 0 + SigmaThetaX= 0.6921330164 + SigmaPhiY= 0.963142053 + SigmaX= 6.232 + SigmaY= 9.069 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +TwoBodyReaction Beam= 11Li Target= 2H Light= 1H Heavy= 12Li ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 1.0 - BeamEnergy= 550 - BeamEnergySpread= 0 - SigmaThetaX= 0.6921330164 - SigmaPhiY= 0.963142053 - SigmaX= 6.232 - SigmaY= 9.069 - CrossSectionPath= flat.txt + CrossSectionPath= flat.txt CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/132Sndp.reaction b/Inputs/EventGenerator/132Sndp.reaction index 72598b481c356b15625ede5ee548b97869f59c62..f9080ecf8fd1e5df47edcc8c301ec528d0787c78 100644 --- a/Inputs/EventGenerator/132Sndp.reaction +++ b/Inputs/EventGenerator/132Sndp.reaction @@ -2,24 +2,31 @@ %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad -Transfert +Beam + Particle= 132Sn + Energy= 1320 + SigmaEnergy= 0 + SigmaThetaX= 0 + SigmaPhiY= 0 + SigmaX= 0 + SigmaY= 0 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +TwoBodyReaction Beam= 132Sn Target= 2H Light= 1H Heavy= 133Sn ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 0.0 - BeamEnergy= 1320 - BeamEnergySpread= 0 - SigmaX= 0 - SigmaY= 0 - SigmaThetaX= 0 - SigmaPhiY= 0 - CrossSectionPath= sn132dp_gs_10AMeV.txt -% CrossSectionPath= 132Sndp_10A_MeV_2f7_ZR_FRC.lis -% CrossSectionPath= flat.txt - HalfOpenAngleMin= 0 - HalfOpenAngleMax= 180 + CrossSectionPath= sn132dp_gs_10AMeV.txt CS +%CrossSectionPath= 132Sndp_10A_MeV_2f7_ZR_FRC.lis +%CrossSectionPath= flat.txt + HalfOpenAngleMin= 0 + HalfOpenAngleMax= 180 ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/132SndpTestMarcIsotropic.reaction b/Inputs/EventGenerator/132SndpTestMarcIsotropic.reaction index 3a3f1a6c67db8a048272fd1baf556cff0709a48f..b8dab4c3dfb6d09b7652822ce83aff3bf90fda98 100644 --- a/Inputs/EventGenerator/132SndpTestMarcIsotropic.reaction +++ b/Inputs/EventGenerator/132SndpTestMarcIsotropic.reaction @@ -2,20 +2,27 @@ %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad -Transfert +Beam + Particle= 132Sn + Energy= 1320 + SigmaEnergy= 0 + SigmaX= 0.851 + SigmaY= 0.851 + SigmaThetaX= 0 + SigmaPhiY= 0 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +TwoBodyReaction Beam= 132Sn Target= 2H Light= 1H Heavy= 133Sn ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 0.0 - BeamEnergy= 1320 - BeamEnergySpread= 0 - SigmaX= 0.851 - SigmaY= 0.851 - SigmaThetaX= 0 - SigmaPhiY= 0 - CrossSectionPath= flat.txt + CrossSectionPath= flat.txt CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/134Snpt.reaction b/Inputs/EventGenerator/134Snpt.reaction index 5a9d186af754c566aa0226ff32864e729f21e30e..8358daae192325812f0ddc38dfbc30bcea5bca1e 100644 --- a/Inputs/EventGenerator/134Snpt.reaction +++ b/Inputs/EventGenerator/134Snpt.reaction @@ -2,20 +2,27 @@ %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad -Transfert +Beam + Particle= 134Sn + Energy= 1340 + SigmaEnergy= 0 + SigmaX= 0 + SigmaY= 0 + SigmaThetaX= 0 + SigmaPhiY= 0 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +TwoBodyReaction Beam= 134Sn Target= 1H Light= 3H Heavy= 132Sn ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 0.0 - BeamEnergy= 1340 - BeamEnergySpread= 0 - SigmaX= 0 - SigmaY= 0 - SigmaThetaX= 0 - SigmaPhiY= 0 - CrossSectionPath= CS_Ep10MeV_sn134pt_gs_1h9demi.dat + CrossSectionPath= CS_Ep10MeV_sn134pt_gs_1h9demi.dat CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/19C208Pb_570MeV_EneSpr1_flat.reaction b/Inputs/EventGenerator/19C208Pb_570MeV_EneSpr1_flat.reaction index 77f0989bacb1b16573cf3ef500005504692493a3..2eaeed3493e1966633333a25bdcfb6794a6715bf 100644 --- a/Inputs/EventGenerator/19C208Pb_570MeV_EneSpr1_flat.reaction +++ b/Inputs/EventGenerator/19C208Pb_570MeV_EneSpr1_flat.reaction @@ -2,20 +2,27 @@ %%% Reaction file for 208Pb(19C,19C)208Pb reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad -Transfert +Beam + Particle= 19C + Energy= 570 + SigmaEnergy= 5.70 + SigmaX= 1. + SigmaY= 1. + SigmaThetaX= 0. + SigmaPhiY= 0. + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +TwoBodyReaction Beam= 19C Target= 208Pb Light= 19C Heavy= 208Pb ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 0.0 - BeamEnergy= 570 - BeamEnergySpread= 5.70 - SigmaX= 1. - SigmaY= 1. - SigmaThetaX= 0. - SigmaPhiY= 0. - CrossSectionPath= flat.txt + CrossSectionPath= flat.txt CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/27Alppp.reaction b/Inputs/EventGenerator/27Alppp.reaction index e8190b868da45f7a64ba253dcf1399465dbf65e0..28d33b63360030b2d19f6417ab2afd6abcc9602f 100644 --- a/Inputs/EventGenerator/27Alppp.reaction +++ b/Inputs/EventGenerator/27Alppp.reaction @@ -2,25 +2,31 @@ %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%Beam energy given in MeV ; Excitation in MeV -TransfertToResonance +Beam + Particle= 1H + Energy= 18 + SigmaEnergy= 0 + SigmaThetaX= 0 + SigmaPhiY= 0 + SigmaX= 0 + SigmaY= 0 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +TwoBodyReaction Beam= 1H Target= 27Al Light= 1H Heavy= 27Al ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 13.0 - BeamEnergy= 18 - BeamEnergySpread= 0 - SigmaThetaX= 0 - SigmaPhiY= 0 - SigmaX= 0 - SigmaY= 0 - ResonanceWidth= 0 - ResonanceDecayZ= 12 - ResonanceDecayA= 26 - CrossSectionPath= flat.txt + CrossSectionPath= flat.txt CS ShootLight= 1 - ShootHeavy= 0 - ShootDecayProduct= 1 + ShootHeavy= 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - +ParticleDecay 27Al + Daughter= 26Mg p + ExcitationEnergy= 0 0 + shoot= 1 1 diff --git a/Inputs/EventGenerator/40Ca.reaction b/Inputs/EventGenerator/40Ca.reaction index 72e69b5adeac17959ef775c623015adbfa48fa31..c99ff0cc90d28421c64ed525db5bceca79e0b2a7 100644 --- a/Inputs/EventGenerator/40Ca.reaction +++ b/Inputs/EventGenerator/40Ca.reaction @@ -20,6 +20,6 @@ TwoBodyReaction Heavy= 40Ca ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 0.0 - CrossSectionPath= flat.txt CS10He + CrossSectionPath= flat.txt CS ShootLight= 1 ShootHeavy= 1 diff --git a/Inputs/EventGenerator/60Fe.reaction b/Inputs/EventGenerator/60Fe.reaction index 92f87dfaa4c8cf1ff78e94b9d0f21feeca32902c..f45f8e3a3f6401b3f6593ffac2488f3d82036bed 100644 --- a/Inputs/EventGenerator/60Fe.reaction +++ b/Inputs/EventGenerator/60Fe.reaction @@ -1,21 +1,27 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad -Transfert +Beam + Particle= 60Fe + Energy= 1628.41 + SigmaEnergy= 0 + SigmaX= 0 + SigmaY= 0 + SigmaThetaX= 0 + SigmaPhiY= 0 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +TwoBodyReaction Beam= 60Fe Target= 2H Light= 1H Heavy= 61Fe ExcitationEnergyHeavy= 0.0 ExcitationEnergyLight= 0.0 - BeamEnergy= 1628.41 - BeamEnergySpread= 0 - SigmaX= 0 - SigmaY= 0 - SigmaThetaX= 0 - SigmaPhiY= 0 - CrossSectionPath= fe61_p3_2gs.n + CrossSectionPath= fe61_p3_2gs.n CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/69Ni.reaction b/Inputs/EventGenerator/69Ni.reaction index 91461447288df0b2fa154ef15dd6acfd80ab8b55..9924ea6d84639b8b25f94a349480f6457ad980ba 100644 --- a/Inputs/EventGenerator/69Ni.reaction +++ b/Inputs/EventGenerator/69Ni.reaction @@ -1,21 +1,30 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%Beam energy given in MeV ; Excitation in MeV -Transfert +Beam + Particle= 68Ni + Energy= 1904 + SigmaEnergy= 0 + SigmaX= 1.5 + SigmaY= 1.5 + SigmaThetaX= 0.005 + SigmaPhiY= 0.005 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +TwoBodyReaction Beam= 68Ni Target= 2H Light= 1H Heavy= 69Ni ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 2.0 - BeamEnergy= 1904 - BeamEnergySpread= 0 - SigmaX= 1.5 - SigmaY= 1.5 - SigmaThetaX= 0.005 - SigmaPhiY= 0.005 - CrossSectionPath= ./Data/CrossSection/ni69_d5_01.n + %CrossSectionPath= ./Data/CrossSection/ni69_d5_01.n CS + CrossSectionPath= flat.txt CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/9He.reaction b/Inputs/EventGenerator/9He.reaction deleted file mode 100644 index efff66a0203b316eba044e1b7aa02851e504b33a..0000000000000000000000000000000000000000 --- a/Inputs/EventGenerator/9He.reaction +++ /dev/null @@ -1,22 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm -% SigmaThetaX/PhiY in deg -Transfert - Beam= 11Li - Target= 2H - Light= 4He - Heavy= 9He - ExcitationEnergyLight= 0.0 - ExcitationEnergyHeavy= 1.0 - BeamEnergy= 550 - BeamEnergySpread= 0 - SigmaThetaX= 0.6921330164 - SigmaPhiY= 0.963142053 - SigmaX= 6.232 - SigmaY= 9.069 - CrossSectionPath= flat.txt - ShootLight= 1 - ShootHeavy= 0 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/Source.reaction b/Inputs/EventGenerator/Source.reaction deleted file mode 100644 index 12b39ee5e0424d239a92f8623d71bd436e640ec0..0000000000000000000000000000000000000000 --- a/Inputs/EventGenerator/Source.reaction +++ /dev/null @@ -1,23 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%% File used for PARIS analysis when a gamma source %%%% -%%% The reaction is irrelevent and just kept for the format %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm -% SigmaThetaX/PhiY in deg -Transfert - Beam= 11Li - Target= 2H - Light= 1H - Heavy= 12Li - ExcitationEnergyLight= 0.0 - ExcitationEnergyHeavy= 1.0 - BeamEnergy= 550 - BeamEnergySpread= 0 - SigmaThetaX= 0.6921330164 - SigmaPhiY= 0.963142053 - SigmaX= 6.232 - SigmaY= 9.069 - CrossSectionPath= flat.txt - ShootLight= 1 - ShootHeavy= 0 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Inputs/EventGenerator/e569.reaction b/Inputs/EventGenerator/e569.reaction index 108c421bc77c715ad29e00617257164f8a464862..de4defd9e40730d47c37afbbfa6861b9f40c84ed 100644 --- a/Inputs/EventGenerator/e569.reaction +++ b/Inputs/EventGenerator/e569.reaction @@ -1,21 +1,30 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%Beam energy given in MeV ; Excitation in MeV -Transfert +Beam + Particle= 14O + Energy= 252 + SigmaEnergy= 0 + SigmaX= 2 + SigmaY= 1.5 + SigmaThetaX= 0 + SigmaPhiY= 0 + MeanThetaX= 0 + MeanPhiY= 0 + MeanX= 0 + MeanY= 0 + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +TwoBodyReaction Beam= 14O Target= 2H Light= 3H Heavy= 13O ExcitationEnergyLight= 0.0 ExcitationEnergyHeavy= 0.0 - BeamEnergy= 252 - BeamEnergySpread= 0 - SigmaX= 2 - SigmaY= 1.5 - SigmaThetaX= 0 - SigmaPhiY= 0 - CrossSectionPath= ../Data/CrossSection/flat.txt + %CrossSectionPath= ../Data/CrossSection/flat.txt CS + CrossSectionPath= flat.txt CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/NPLib/Physics/NPFunction.cxx b/NPLib/Physics/NPFunction.cxx index 2948824adf6ea9747150ca6c4a9bf35d061032ec..a4a9e93eff34837ad9c516bc7bc7343d040f332e 100644 --- a/NPLib/Physics/NPFunction.cxx +++ b/NPLib/Physics/NPFunction.cxx @@ -229,6 +229,11 @@ void RandomGaussian2D(double MeanX, double MeanY, double SigmaX, double SigmaY, Y = MeanY; X = gRandom->Gaus(MeanX, SigmaX); } + + else { + X = MeanX; + Y = MeanY; + } } } diff --git a/NPSimulation/src/EventGeneratorGammaDecay.cc b/NPSimulation/src/EventGeneratorGammaDecay.cc index 9b5b8742fb97614a69beb547e5090c108e4e478d..bb3a6dfcabc31c90f3c5fa40e78cf91b265fad99 100644 --- a/NPSimulation/src/EventGeneratorGammaDecay.cc +++ b/NPSimulation/src/EventGeneratorGammaDecay.cc @@ -53,9 +53,6 @@ EventGeneratorGammaDecay::EventGeneratorGammaDecay(){ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... EventGeneratorGammaDecay::~EventGeneratorGammaDecay(){ - for(unsigned i = 0 ; i < m_CrossSectionHist.size() ; i++) - delete m_CrossSectionHist[i]; - m_CrossSectionHist.clear(); } diff --git a/NPSimulation/src/EventGeneratorParticleDecay.cc b/NPSimulation/src/EventGeneratorParticleDecay.cc index 9c31da6512ed07cf73fce0eb18dbe1d2cdd4c88f..cb1e20f1af97a1f9c62942f35b161b46281934a0 100644 --- a/NPSimulation/src/EventGeneratorParticleDecay.cc +++ b/NPSimulation/src/EventGeneratorParticleDecay.cc @@ -51,7 +51,6 @@ EventGeneratorParticleDecay::EventGeneratorParticleDecay(){ } EventGeneratorParticleDecay::~EventGeneratorParticleDecay(){ - delete m_CrossSectionHist; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......