Changeset 17071 for trunk/Mars/fact

Timestamp:

09/05/13 11:29:01 (11 years ago)

Author:

tbretz

Message:

Some small improvements. Ignore NULL (no proper combination found); echo the command to the console; do not outpout anything when changing directory back.

File:

• trunk/Mars/fact/analysis/gain/runanalysis.sh (modified) (4 diffs)

trunk/Mars/fact/analysis/gain/runanalysis.sh

@@ -1 +1 @@
 #!/bin/bash
 
-script=$PWD/runsinglepe.sh
 threshold=5
 maxdist=14
@@ -15 +14 @@
 query=$query" FROM RunInfo \`single\` WHERE "$where
 
+echo Query database...
+
 runpairs=( `mysql -u factread --password=r3adfac! --host=lp-fact factdata -s -e "$query"` )
 
 for runpair in ${runpairs[@]}
 do
+   if [ $runpair = 'NULL' ]
+   then
+      echo NULL: $runpair
+      continue
+   fi
+
    year=`echo $runpair | cut -c1-4`
    month=`echo $runpair | cut -c5-6`
@@ -40 +47 @@
       continue
    fi
+   
+   
 
    echo "Submitting "${night}"_"${runnum}"["${drsnum}"]"
@@ -45 +54 @@
    cd ~/Mars
 
-   cmd="${ROOTSYS}/root -q -b ${macro}+\($maxdist,$threshold,\\\"$runfile\\\",$run,$run,\\\"$drsfile\\\",\\\"${outpath}\\\"\)"
+   cmd="ROOT_HIST=0 ${ROOTSYS}/bin/root -q -b -l ${macro}+\($maxdist,$threshold,\\\"$runfile\\\",$run,$run,\\\"$drsfile\\\",\\\"${outpath}\\\"\)"
 
-   echo ${cmd} | qsub -b yes -q test -cwd -e ${log}".err" -o ${log}".log"
+   echo "echo ${cmd}; ${cmd}" | qsub -N e${night}-${runnum} -q test -cwd -e ${log}".err" -o ${log}".log"
 
-   cd -
+   cd - > /dev/null
 done