From e2630ad567e3f55a64c6c37e69f453a6eb1a1323 Mon Sep 17 00:00:00 2001
From: tbritton <tbritton@jlab.org>
Date: Mon, 17 Apr 2017 16:18:48 -0400
Subject: [PATCH] tweaks and enhancements

---
 MCwrapper/MakeMC.csh  |  9 +++++++--
 MCwrapper/MakeMC.sh   | 10 +++++++---
 MCwrapper/gluex_MC.py |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/MCwrapper/MakeMC.csh b/MCwrapper/MakeMC.csh
index f2221a2d..7d44d68c 100755
--- a/MCwrapper/MakeMC.csh
+++ b/MCwrapper/MakeMC.csh
@@ -213,8 +213,11 @@ if ( "$GENR" != "0" ) then
 	set STANDARD_NAME="genr_pi0_"$STANDARD_NAME
 	cp $CONFIG_FILE ./$STANDARD_NAME.conf
     endif
-    set config_file_name=`basename "$CONFIG_FILE"`
+
+	if ( "$gen_pre" != "file" ) then
+    config_file_name=`basename "$CONFIG_FILE"`
     echo $config_file_name
+    endif
     
     if ( "$GENERATOR" == "genr8" ) then
 	echo "RUNNING GENR8"
@@ -417,7 +420,9 @@ if ( "$GENR" != "0" ) then
     endif
 endif
 
-    mv $PWD/*.conf $OUTDIR/configurations/
+if ( "$gen_pre" != "file" ) then
+mv $PWD/*.conf $OUTDIR/configurations/
+fi
     mv $PWD/*.hddm $OUTDIR/hddm/
 #    mv $PWD/*.root $OUTDIR/root/ #just in case
 echo `date`
diff --git a/MCwrapper/MakeMC.sh b/MCwrapper/MakeMC.sh
index 07e20277..e01c311e 100755
--- a/MCwrapper/MakeMC.sh
+++ b/MCwrapper/MakeMC.sh
@@ -164,7 +164,7 @@ if [[ "$GENR" != "0" ]]; then
     fi
     
 	if [[ "$gen_pre" == "file" ]]; then
-		set gen_in_file=`echo $GENERATOR | sed -r 's/^.{5}//'`
+		gen_in_file=`echo $GENERATOR | sed -r 's/^.{5}//'`
 		echo "bypassing generation"
 		if [[ -f $gen_in_file ]]; then
 			echo "using pre-generated file: "$gen_in_file
@@ -213,9 +213,12 @@ if [[ "$GENR" != "0" ]]; then
 	STANDARD_NAME="genr_pi0_"$STANDARD_NAME
 	cp $CONFIG_FILE ./$STANDARD_NAME.conf
     fi
+	
+	if [[ "$gen_pre" != "file" ]]; then
     config_file_name=`basename "$CONFIG_FILE"`
     echo $config_file_name
-    
+    fi
+
     if [[ "$GENERATOR" == "genr8" ]]; then
 	echo "RUNNING GENR8"
 	RUNNUM=$formatted_runNumber+$formatted_fileNumber
@@ -418,7 +421,8 @@ if [[ "$GENR" != "0" ]]; then
 	fi
     fi
 fi
-
+if [[ "$gen_pre" != "file" ]]; then
 mv $PWD/*.conf $OUTDIR/configurations/
+fi
 mv $PWD/*.hddm $OUTDIR/hddm/
 #mv $PWD/*.root $OUTDIR/root/ #just in case
diff --git a/MCwrapper/gluex_MC.py b/MCwrapper/gluex_MC.py
index 21e92c58..1dad29c5 100755
--- a/MCwrapper/gluex_MC.py
+++ b/MCwrapper/gluex_MC.py
@@ -117,7 +117,7 @@ def main(argv):
         ENVFILE = "my-environment-file"#change this to your own environment file
         
         GENERATOR = "genr8"
-        GENCONFIG = "genrator config file"
+        GENCONFIG = "NA"
 
         eBEAM_ENERGY="12"
         COHERENT_PEAK="9"