Changeset 17322 for trunk/Mars

Timestamp:

11/16/13 19:37:30 (11 years ago)

Author:

tbretz

Message:

Fixed a bug which caused the macro to be executed twice.

File:

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

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

@@ -12 +12 @@
 wheredrs="(drs.fROI=single.fROI AND fDrsStep=2)"
 
-query="SELECT Concat(fNight, '_', fRunId, '_', (SELECT fRunId FROM RunInfo \`drs\` WHERE drs.fNight=single.fNight AND "$wheredrs" AND (single.fRunId-drs.fRunId)<10 limit 0,1)) AS num "
+query="SELECT Concat(fNight, '_', fRunId, '_', (SELECT fRunId FROM RunInfo \`drs\` WHERE drs.fNight=single.fNight AND "$wheredrs" AND (single.fRunId-drs.fRunId)<30 limit 0,1)) AS num "
 query=$query" FROM RunInfo \`single\` WHERE "$where
 
@@ -51 +51 @@
    cd ~/Mars
 
-   cmd="date; ROOT_HIST=0 ${ROOTSYS}/bin/root -q -b -l ${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 "echo ${cmd}; ${cmd}" | qsub -N e${name}-${runnum} -q test -cwd -e ${log}".err" -o ${log}".log"
+   echo "echo '${cmd}'; date; ${cmd}" | qsub -N e${name}${runnum} -q test -cwd -e ${log}".err" -o ${log}".log"
 
    cd - > /dev/null