Skip to content

Commit

Permalink
tweaks and enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
T-Britton committed Apr 17, 2017
1 parent c3fefc9 commit e2630ad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
9 changes: 7 additions & 2 deletions MCwrapper/MakeMC.csh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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`
10 changes: 7 additions & 3 deletions MCwrapper/MakeMC.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion MCwrapper/gluex_MC.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit e2630ad

Please sign in to comment.