Skip to content
Snippets Groups Projects
Commit 5db35a47 authored by matta's avatar matta
Browse files

* Changing the input file of Eventgenerator to new standard and performing test 

 - Fixing bug in particle and gamma dicay causing seg fault when leaving the program
 - fixing bug in NP function caussing 2Dgaussian to be stuck for sigmaX=sigmaY=0 case
parent 002d54a5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 157 additions and 135 deletions
Inputs/EventGenerator/12Li.reaction
+ 16
− 8
View file @ 5db35a47
...@@ -3,20 +3,28 @@ ...@@ -3,20 +3,28 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm %% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm
% SigmaThetaX/PhiY in deg % 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 Beam= 11Li
Target= 2H Target= 2H
Light= 1H Light= 1H
Heavy= 12Li Heavy= 12Li
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 1.0 ExcitationEnergyHeavy= 1.0
BeamEnergy= 550 CrossSectionPath= flat.txt CS
BeamEnergySpread= 0
SigmaThetaX= 0.6921330164
SigmaPhiY= 0.963142053
SigmaX= 6.232
SigmaY= 9.069
CrossSectionPath= flat.txt
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Inputs/EventGenerator/132Sndp.reaction
+ 19
− 12
View file @ 5db35a47
...@@ -2,24 +2,31 @@ ...@@ -2,24 +2,31 @@
%%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad %%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 Beam= 132Sn
Target= 2H Target= 2H
Light= 1H Light= 1H
Heavy= 133Sn Heavy= 133Sn
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 0.0 ExcitationEnergyHeavy= 0.0
BeamEnergy= 1320 CrossSectionPath= sn132dp_gs_10AMeV.txt CS
BeamEnergySpread= 0 %CrossSectionPath= 132Sndp_10A_MeV_2f7_ZR_FRC.lis
SigmaX= 0 %CrossSectionPath= flat.txt
SigmaY= 0 HalfOpenAngleMin= 0
SigmaThetaX= 0 HalfOpenAngleMax= 180
SigmaPhiY= 0
CrossSectionPath= sn132dp_gs_10AMeV.txt
% CrossSectionPath= 132Sndp_10A_MeV_2f7_ZR_FRC.lis
% CrossSectionPath= flat.txt
HalfOpenAngleMin= 0
HalfOpenAngleMax= 180
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
Inputs/EventGenerator/132SndpTestMarcIsotropic.reaction
+ 15
− 8
View file @ 5db35a47
...@@ -2,20 +2,27 @@ ...@@ -2,20 +2,27 @@
%%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad %%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 Beam= 132Sn
Target= 2H Target= 2H
Light= 1H Light= 1H
Heavy= 133Sn Heavy= 133Sn
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 0.0 ExcitationEnergyHeavy= 0.0
BeamEnergy= 1320 CrossSectionPath= flat.txt CS
BeamEnergySpread= 0
SigmaX= 0.851
SigmaY= 0.851
SigmaThetaX= 0
SigmaPhiY= 0
CrossSectionPath= flat.txt
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
Inputs/EventGenerator/134Snpt.reaction
+ 15
− 8
View file @ 5db35a47
...@@ -2,20 +2,27 @@ ...@@ -2,20 +2,27 @@
%%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad %%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 Beam= 134Sn
Target= 1H Target= 1H
Light= 3H Light= 3H
Heavy= 132Sn Heavy= 132Sn
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 0.0 ExcitationEnergyHeavy= 0.0
BeamEnergy= 1340 CrossSectionPath= CS_Ep10MeV_sn134pt_gs_1h9demi.dat CS
BeamEnergySpread= 0
SigmaX= 0
SigmaY= 0
SigmaThetaX= 0
SigmaPhiY= 0
CrossSectionPath= CS_Ep10MeV_sn134pt_gs_1h9demi.dat
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
Inputs/EventGenerator/19C208Pb_570MeV_EneSpr1_flat.reaction
+ 15
− 8
View file @ 5db35a47
...@@ -2,20 +2,27 @@ ...@@ -2,20 +2,27 @@
%%% Reaction file for 208Pb(19C,19C)208Pb reaction %%%%%%%%% %%% Reaction file for 208Pb(19C,19C)208Pb reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad %%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 Beam= 19C
Target= 208Pb Target= 208Pb
Light= 19C Light= 19C
Heavy= 208Pb Heavy= 208Pb
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 0.0 ExcitationEnergyHeavy= 0.0
BeamEnergy= 570 CrossSectionPath= flat.txt CS
BeamEnergySpread= 5.70
SigmaX= 1.
SigmaY= 1.
SigmaThetaX= 0.
SigmaPhiY= 0.
CrossSectionPath= flat.txt
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
Inputs/EventGenerator/27Alppp.reaction
+ 20
− 14
View file @ 5db35a47
...@@ -2,25 +2,31 @@ ...@@ -2,25 +2,31 @@
%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV %%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 Beam= 1H
Target= 27Al Target= 27Al
Light= 1H Light= 1H
Heavy= 27Al Heavy= 27Al
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 13.0 ExcitationEnergyHeavy= 13.0
BeamEnergy= 18 CrossSectionPath= flat.txt CS
BeamEnergySpread= 0
SigmaThetaX= 0
SigmaPhiY= 0
SigmaX= 0
SigmaY= 0
ResonanceWidth= 0
ResonanceDecayZ= 12
ResonanceDecayA= 26
CrossSectionPath= flat.txt
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 1
ShootDecayProduct= 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
ParticleDecay 27Al
Daughter= 26Mg p
ExcitationEnergy= 0 0
shoot= 1 1
Inputs/EventGenerator/40Ca.reaction
+ 1
− 1
View file @ 5db35a47
...@@ -20,6 +20,6 @@ TwoBodyReaction ...@@ -20,6 +20,6 @@ TwoBodyReaction
Heavy= 40Ca Heavy= 40Ca
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 0.0 ExcitationEnergyHeavy= 0.0
CrossSectionPath= flat.txt CS10He CrossSectionPath= flat.txt CS
ShootLight= 1 ShootLight= 1
ShootHeavy= 1 ShootHeavy= 1
Inputs/EventGenerator/60Fe.reaction
+ 15
− 9
View file @ 5db35a47
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%% %%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad Beam
Transfert 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 Beam= 60Fe
Target= 2H Target= 2H
Light= 1H Light= 1H
Heavy= 61Fe Heavy= 61Fe
ExcitationEnergyHeavy= 0.0 ExcitationEnergyHeavy= 0.0
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
BeamEnergy= 1628.41 CrossSectionPath= fe61_p3_2gs.n CS
BeamEnergySpread= 0
SigmaX= 0
SigmaY= 0
SigmaThetaX= 0
SigmaPhiY= 0
CrossSectionPath= fe61_p3_2gs.n
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
Inputs/EventGenerator/69Ni.reaction
+ 18
− 9
View file @ 5db35a47
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV Beam
Transfert 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 Beam= 68Ni
Target= 2H Target= 2H
Light= 1H Light= 1H
Heavy= 69Ni Heavy= 69Ni
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 2.0 ExcitationEnergyHeavy= 2.0
BeamEnergy= 1904 %CrossSectionPath= ./Data/CrossSection/ni69_d5_01.n CS
BeamEnergySpread= 0 CrossSectionPath= flat.txt CS
SigmaX= 1.5
SigmaY= 1.5
SigmaThetaX= 0.005
SigmaPhiY= 0.005
CrossSectionPath= ./Data/CrossSection/ni69_d5_01.n
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Inputs/EventGenerator/9He.reaction deleted 100644 → 0
+ 0
− 22
View file @ 002d54a5
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%% 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
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Inputs/EventGenerator/Source.reaction deleted 100644 → 0
+ 0
− 23
View file @ 002d54a5
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%% 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
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Inputs/EventGenerator/e569.reaction
+ 18
− 9
View file @ 5db35a47
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Beam energy given in MeV ; Excitation in MeV Beam
Transfert 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 Beam= 14O
Target= 2H Target= 2H
Light= 3H Light= 3H
Heavy= 13O Heavy= 13O
ExcitationEnergyLight= 0.0 ExcitationEnergyLight= 0.0
ExcitationEnergyHeavy= 0.0 ExcitationEnergyHeavy= 0.0
BeamEnergy= 252 %CrossSectionPath= ../Data/CrossSection/flat.txt CS
BeamEnergySpread= 0 CrossSectionPath= flat.txt CS
SigmaX= 2
SigmaY= 1.5
SigmaThetaX= 0
SigmaPhiY= 0
CrossSectionPath= ../Data/CrossSection/flat.txt
ShootLight= 1 ShootLight= 1
ShootHeavy= 0 ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
NPLib/Physics/NPFunction.cxx
+ 5
− 0
View file @ 5db35a47
...@@ -229,6 +229,11 @@ void RandomGaussian2D(double MeanX, double MeanY, double SigmaX, double SigmaY, ...@@ -229,6 +229,11 @@ void RandomGaussian2D(double MeanX, double MeanY, double SigmaX, double SigmaY,
Y = MeanY; Y = MeanY;
X = gRandom->Gaus(MeanX, SigmaX); X = gRandom->Gaus(MeanX, SigmaX);
} }
else {
X = MeanX;
Y = MeanY;
}
} }
} }
NPSimulation/src/EventGeneratorGammaDecay.cc
+ 0
− 3
View file @ 5db35a47
...@@ -53,9 +53,6 @@ EventGeneratorGammaDecay::EventGeneratorGammaDecay(){ ...@@ -53,9 +53,6 @@ EventGeneratorGammaDecay::EventGeneratorGammaDecay(){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventGeneratorGammaDecay::~EventGeneratorGammaDecay(){ EventGeneratorGammaDecay::~EventGeneratorGammaDecay(){
for(unsigned i = 0 ; i < m_CrossSectionHist.size() ; i++)
delete m_CrossSectionHist[i];
m_CrossSectionHist.clear(); m_CrossSectionHist.clear();
} }
......
NPSimulation/src/EventGeneratorParticleDecay.cc
+ 0
− 1
View file @ 5db35a47
...@@ -51,7 +51,6 @@ EventGeneratorParticleDecay::EventGeneratorParticleDecay(){ ...@@ -51,7 +51,6 @@ EventGeneratorParticleDecay::EventGeneratorParticleDecay(){
} }
EventGeneratorParticleDecay::~EventGeneratorParticleDecay(){ EventGeneratorParticleDecay::~EventGeneratorParticleDecay(){
delete m_CrossSectionHist;
} }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment