Merge pull request #31 from JeffersonLab/DEV

Dev
JeffersonLab · Dec 7, 2017 · 1fcd514 · 1fcd514
2 parents 4b2ca04 + 8557247
commit 1fcd514
Show file tree

Hide file tree

Showing 8 changed files with 3,119 additions and 374 deletions.
diff --git a/MCwrapper/Gcontrol.in b/MCwrapper/Gcontrol.in
@@ -113,13 +113,13 @@ c PLOG 1
 c TLOG 1
 c
 c   particle  momentum  theta  phi  delta_momentum delta_theta delta_phi
-KINE   108      0.5       90.  180.      0.            180.        360.
+cKINE   108      0.5       90.  180.      0.            180.        360.
 
 c The SCAP card determines the vertex position for the particle gun.  It
 c supports the following three arguments, all of which default to 0.
 c
 c    vertex_x vertex_y vertex_z
-SCAP    0.       0.      65.
+cSCAP    0.       0.      65.
 
 c The TGTWIDTH card is used to determine an extended volume from
 c which the particle gun will generate vertexes. The vertex position
@@ -438,5 +438,3 @@ c
 c DRAY 0 no delta ray production
 c      1 delta ray production with generation of secondaries (default)
 c      2 delta ray production without generation of secondaries
-
-END
diff --git a/MCwrapper/Generators/gen_2pi_amp/examples/gen_2pi_amp.cfg b/MCwrapper/Generators/gen_2pi_amp/examples/gen_2pi_amp.cfg
@@ -44,10 +44,8 @@
 define rho 0.775 0.146
 # some definitions for adjusting the beam polarization. In the equations beamX: Polarization>0, beamY: Polarization<0.
 # Phi is the azimuthal angle of the polarization vector in degrees (in the lab coordinates)
-define phipol 0  
-define polFrac 0.4
-define beamX 0 polFrac
-define beamY 90 polFrac
+define phipol TEMPPOLANGLE  
+define polFrac TEMPPOLFRAC
 
 # Uniform angles: flat=1; YLMs: flat=0;
 define flat 0

diff --git a/MCwrapper/Generators/gen_ee_hb/CFFs_DD_Feb2012.dat b/MCwrapper/Generators/gen_ee_hb/CFFs_DD_Feb2012.dat
diff --git a/MCwrapper/Generators/gen_omega_3pi/examples/gen_omega_3pi.cfg b/MCwrapper/Generators/gen_omega_3pi/examples/gen_omega_3pi.cfg
@@ -46,7 +46,7 @@ reaction Pi+Pi-Pi0 gamma p Pi+ Pi- Pi0
 # consider just x polarized amplitudes
 sum Pi+Pi-Pi0 xpol
 
-amplitude Pi+Pi-Pi0::xpol::omegaS ThreePiAnglesSchilling 0.0 0.0 0.0 0.0 0.0 0.0 0.4 0.0 -0.2
+amplitude Pi+Pi-Pi0::xpol::omegaS ThreePiAnglesSchilling 0.0 0.0 0.0 0.0 0.0 0.0 0.4 0.0 -0.2 TEMPPOLANGLE TEMPPOLFRAC
 amplitude Pi+Pi-Pi0::xpol::omegaS BreitWigner3body 0.783 0.008 234
 
 initialize Pi+Pi-Pi0::xpol::omegaS cartesian 1.0 0.0 

diff --git a/MCwrapper/Generators/particle_gun/examples/particle_gun.cfg b/MCwrapper/Generators/particle_gun/examples/particle_gun.cfg
@@ -0,0 +1,5 @@
+c   particle  momentum  theta  phi  delta_momentum delta_theta delta_phi
+KINE   108      0.5       90.  180.      0.            180.        360.
+
+c    vertex_x vertex_y vertex_z
+SCAP    0.       0.      65.