Changeset 17327 for trunk/Mars

Timestamp:

11/21/13 12:40:41 (11 years ago)

Author:

tbretz

Message:

Updated query to account for new sql version

File:

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

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

@@ -9 +9 @@
 cp ${macro} ${outpath}
 
-where="(((fNumPedestalTrigger=3000 OR fNumPedestalTrigger=5000) AND fRunTypeKEY=2) OR (fNumPedestalTrigger=10000 AND fRunTypeKEY=3) OR fRunTypeKEY=17)"
+where="(((fNumPedestalTrigger=3000 OR fNumPedestalTrigger=5000) AND fRunTypeKey=2) OR (fNumPedestalTrigger=10000 AND fRunTypeKey=3) OR fRunTypeKey=17)"
 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)<30 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<30+drs.fRunID ORDER BY ABS(CAST(single.fRunID AS SIGNED) - CAST(drs.fRunID AS SIGNED)) ASC LIMIT 0,1)) AS num "
 query=$query" FROM RunInfo \`single\` WHERE "$where
 
@@ -35 +35 @@
    drsnum=`printf %03d $drs`
 
-   path="/fact/raw/"$year"/"$month"/"$day
-   runfile=$path"/"$night"_"
-   drsfile=$path"/"$night"_"$drsnum.drs.fits.gz
+   #runpath="/archive/fact/fails/raw/"$year"/"$month"/"$day
+   #drspath="/fact/raw/"$year"/"$month"/"$day
+
+   runpath="/fact/raw/"$year"/"$month"/"$day
+   drspath="/fact/raw/"$year"/"$month"/"$day
+
+   runfile=$runpath"/"$night"_"
+   drsfile=$drspath"/"$night"_"$drsnum.drs.fits.gz
    log=$outpath"/"$night"_"$runnum