Merge pull request #11 from JeffersonLab/DEV

Dev. forgot the date, please ignore
JeffersonLab · May 19, 2017 · 45a3240 · 45a3240
2 parents 0bdd05f + 3cf8265
commit 45a3240
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/MCwrapper/MakeMC.csh b/MCwrapper/MakeMC.csh
@@ -301,10 +301,10 @@ if ( "$GENR" != "0" ) then
     else if ( "$GENERATOR" == "gen_2pi_amp" ) then
 	echo "RUNNING GEN_2PI_AMP" 
     set optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`
-	set RANDOMnum=`bash -c 'echo $RANDOM'`
+	#set RANDOMnum=`bash -c 'echo $RANDOM'`
 	echo $optionals_line
-	echo gen_2pi_amp -c $STANDARD_NAME.conf -o $STANDARD_NAME.hddm -hd $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -s $RANDOMnum $optionals_line
-	gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -s $RANDOMnum $optionals_line
+	echo gen_2pi_amp -c $STANDARD_NAME.conf -o $STANDARD_NAME.hddm -hd $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY $optionals_line
+	gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY $optionals_line
 	else if ( "$GENERATOR" == "gen_omega_3pi" ) then
 	echo "RUNNING GEN_OMEGA_3PI" 
     set optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`

diff --git a/MCwrapper/MakeMC.sh b/MCwrapper/MakeMC.sh
@@ -305,9 +305,9 @@ if [[ "$GENR" != "0" ]]; then
 	echo "RUNNING GEN_2PI_AMP" 
     optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`
 	echo $optionals_line
-	RANDOMnum=`bash -c 'echo $RANDOM'`
-	echo gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -s $RANDOMnum $optionals_line
-	gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY -s $RANDOMnum $optionals_line
+	#RANDOMnum=`bash -c 'echo $RANDOM'`
+	echo gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY $optionals_line
+	gen_2pi_amp -c $STANDARD_NAME.conf -hd $STANDARD_NAME.hddm -o $STANDARD_NAME.root -n $EVT_TO_GEN -r $RUN_NUMBER -a $GEN_MIN_ENERGY -b $GEN_MAX_ENERGY $optionals_line
 	elif [[ "$GENERATOR" == "gen_omega_3pi" ]]; then
 	echo "RUNNING GEN_OMEGA_3PI" 
         optionals_line=`head -n 1 $STANDARD_NAME.conf | sed -r 's/.//'`

diff --git a/MCwrapper/gluex_MC.py b/MCwrapper/gluex_MC.py
@@ -59,7 +59,7 @@ def swif_add_job(WORKFLOW, RUNNO, FILENO,SCRIPT,COMMAND, VERBOSE,PROJECT,TRACK,N
 	if(VERBOSE == True):
 		print "job add command is \n" + str(add_command)
 
-        if(int(NCORES)==1 and int(RAM[:-2]) >= 10 and RAM[-2:]=="GB"):
+        if(int(NCORES)==1 and int(RAM[:-2]) >= 10 and RAM[-2:]=="GB" ):
                 print "SciComp has a limit on RAM requested per thread, as RAM is the limiting factor."
                 print "This will likely cause an AUGER-SUBMIT error."
                 print "Please either increase NCORES or decrease RAM requested and try again."
@@ -149,7 +149,7 @@ def main(argv):
 
         print "*********************************"
         print "Welcome to v1.6 of the MCwrapper"
-        print "Thomas Britton 05/18/17"
+        print "Thomas Britton 05/19/17"
         print "*********************************"