Skip to content

Commit 0775804

Browse files
committed
Runs without the polarization_angle now default to polarization_direction and used either 0 (PARA) or 90 (PERP)
1 parent bf0dc5f commit 0775804

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

MCwrapper/MakeMC.csh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,15 @@ else
147147
endif
148148

149149
set polarization_angle=`rcnd $RUN_NUMBER polarization_angle | awk '{print $1}'`
150-
echo polarization angle: $polarization_angle
150+
151+
if ( "$polarization_angle" == "" ) then
152+
set poldir=`rcnd $RUN_NUMBER polarization_direction | awk '{print $1}'`
153+
if ( "$poldir" == "PARA" ) then
154+
set polarization_angle="0.0"
155+
else
156+
set polarization_angle="90.0"
157+
endif
158+
endif
151159

152160
set elecE=0
153161
set variation=$VERSION
@@ -264,6 +272,7 @@ echo "Electron beam current to use: "$beam_on_current" uA"
264272
echo "Electron beam energy to use: "$eBEAM_ENERGY" GeV"
265273
echo "Radiator Thickness to use: "$radthick" m"
266274
echo "Photon Energy between "$GEN_MIN_ENERGY" and "$GEN_MAX_ENERGY" GeV"
275+
echo "Polarization Angle: "$polarization_angle "degrees"
267276
echo "Coherent Peak position: "$COHERENT_PEAK
268277
echo "----------------------------------------------"
269278
echo "Run generation step? "$GENR" Will be cleaned?" $CLEANGENR

MCwrapper/MakeMC.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,17 @@ else
152152
fi
153153

154154
polarization_angle=`rcnd $RUN_NUMBER polarization_angle | awk '{print $1}'`
155-
echo polarization angle: $polarization_angle
155+
156+
if [[ "$polarization_angle" == "" ]]; then
157+
set poldir=`rcnd $RUN_NUMBER polarization_direction | awk '{print $1}'`
158+
if [[ "$poldir" == "PARA" ]]; then
159+
set polarization_angle="0.0"
160+
else
161+
set polarization_angle="90.0"
162+
fi
163+
fi
164+
165+
156166

157167
elecE=0
158168

@@ -264,6 +274,7 @@ echo "Electron beam current to use: "$beam_on_current" uA"
264274
echo "Electron beam energy to use: "$eBEAM_ENERGY" GeV"
265275
echo "Radiator Thickness to use: "$radthick" m"
266276
echo "Photon Energy between "$GEN_MIN_ENERGY" and "$GEN_MAX_ENERGY" GeV"
277+
echo "Polarization Angle: "$polarization_angle "degrees"
267278
echo "Coherent Peak position: "$COHERENT_PEAK
268279
echo "----------------------------------------------"
269280
echo "Run generation step? "$GENR" Will be cleaned?" $CLEANGENR

MCwrapper/gluex_MC.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def main(argv):
196196

197197
print "*********************************"
198198
print "Welcome to v1.11 of the MCwrapper"
199-
print "Thomas Britton 12/2/17"
199+
print "Thomas Britton 12/4/17"
200200
print "*********************************"
201201

202202
#load all argument passed in and set default options

0 commit comments

Comments
 (0)