Various updates:

[u/mrichter/AliRoot.git] / PWGLF / FORWARD / analysis2 / sim / doit.sh

diff --git a/PWGLF/FORWARD/analysis2/sim/doit.sh b/PWGLF/FORWARD/analysis2/sim/doit.sh
index 06f24091b534fc0b23a5f5d2c4f35ee5d7d6b5b1..d9f837058cbe30067cbeed23722e3a5e3ecba44b 100755 (executable)
--- a/PWGLF/FORWARD/analysis2/sim/doit.sh
+++ b/PWGLF/FORWARD/analysis2/sim/doit.sh
@@ -7,7 +7,6 @@ stage=0
 upload=0 
 jobs=2
 events=1
-gen=default
 aliroot="v5-04-Rev-20"
 root=""
 geant=""
@@ -25,7 +24,6 @@ Options:
        -t|--tag       TAG      Job tag [****] ($tag)
        -i|--id        NAME     Name of production ($id)
        -R|--run       RUN_NO   Run number ($run)
-       -e|--generator NAME     Event generator ($gen)
        -c|--copy               Copy files to AliEn
        -n|--jobs      JOBS     Set number of jobs[**] ($jobs)
        -m|--events    EVENTS   Set events/job[**] ($events)
@@ -248,6 +246,7 @@ push()
        Simulate.C              \
        Config.C                \
        BaseConfig.C            \
+       EGConfig.C              \
        DetConfig.C             \
        OCDBConfig.C            \
        Reconstruct.C           \
@@ -352,7 +351,6 @@ while test $# -gt 0 ; do
        -t|--tag)       tag=$2          ; shift ;; 
        -i|--id)        id=$2           ; shift ;; 
        -R|--run)       run=$2          ; shift ;; 
-       -e|--generator) gen=$2          ; shift ;;
        -c|--copy)      upload=1        ;; 
        -n|--jobs)      jobs=$2         ; shift ;;
        -m|--events)    events=$2       ; shift ;;
@@ -367,6 +365,7 @@ while test $# -gt 0 ; do
        -f|--final)     minmerge=$2     ; shift ;;
        -A|--archive)   archive         ; exit 0 ;;
        -x|--dry-run)   noact=1         ;;
+       --) shift ; break ;;
        *) log_err "Unknown option" "$1" ;  exit 1  ;;
     esac
     shift 
@@ -424,7 +423,8 @@ if test $stage -le 0 ; then
 
     log_msg "" "Submitting \e[33mRun.jdl\e[0m for \e[34m$id run\e[0m (\e[34m$jobs\e[0m jobs w/\e[34m$events)"
     if test $noact -lt 1 ; then 
-       alien_submit alien:${adir}/Run.jdl ${run} ${jobs} ${events} ${id} ${gen}
+       echo "alien_submit alien:${adir}/Run.jdl ${run} ${jobs} ${events} ${id} $@"
+       alien_submit alien:${adir}/Run.jdl ${run} ${jobs} ${events} ${id} "$@"
        ret=$?
     fi 
     log_end "" $ret