Changeset 18098

Timestamp:

02/01/15 14:02:57 (10 years ago)

Author:

Daniela Dorner

Message:

fixed 2 bugs and improved logging

File:

• trunk/DataCheck/QuickLook/RunGanymed.sh (modified) (6 diffs)

trunk/DataCheck/QuickLook/RunGanymed.sh

@@ -17 +17 @@
 fi
 
-# getting coordinates from raw and drive
-date=`echo $starfile | grep -o -E '20[0-9][0-9]/[0-3][0-9]/[0-2][0-9]'`
+# getting coordinates from raw and drive or DB
+date=`echo $starfile | grep -o -E '20[0-9][0-9]/[0-3][0-9]/[0-3][0-9]'`
 drivefile=$auxdata"/"$date"/"`basename $starfile | cut -d_ -f1`".DRIVE_CONTROL_SOURCE_POSITION.fits"
 rawfile=$rawdata"/"$date"/"`basename $starfile | sed -e 's/_I.root/.fits.fz/'`
@@ -27 +27 @@
    tstopf=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep TSTOPF | grep -E -o '[.][0-9]+'`
    tstop=${tstopi}${tstopf}
+else
+   printprocesslog "WARN "$rawfile" not found."
+fi
+if [ "$tstop" == "" ]
+then
+   printprocesslog "WARN tstop empty "$rawfile
+fi
+if ! ls $drivefile >/dev/null 2>&1
+then 
+   printprocesslog "WARN "$drivefile" missing."
 fi
 if  ls $drivefile >/dev/null 2>&1  && ! [ "$tstop" == "" ]
@@ -45 +55 @@
    fi
 else
+   night=`echo $date | sed -e 's/\///g'`
+   runid=`basename $starfile | cut -d_ -f2`
    printprocesslog "INFO getting coordinates from DB."
    query="SELECT fSourceKEY FROM RunInfo WHERE fNight="$night" AND fRunID="$runid
@@ -50 +62 @@
    if [ "$sourcekey" == "" ]
    then
-      printprocesslog "WARN sourcekey empty - coordinates"${coordinates[@]}
-      #echo "WARN sourcekey empty - coordinates"${coordinates[@]}" for "$rawfile
+      printprocesslog "WARN sourcekey empty for "$night"_"$runid" - coordinates"${coordinates[@]}
       finish
    fi
@@ -58 +69 @@
    if [ "${coordinates[0]}" == "" ] || [ "${coordinates[1]}" == "" ]
    then
-      printprocesslog "WARN couldn't get coordinates ("${coordinates[@]}") from DB."
-      #echo "WARN couldn't get coordinates ("${coordinates[@]}") from "$drivefile
+      printprocesslog "WARN couldn't get coordinates ("${coordinates[@]}") for "$night"_"$runid" from DB."
       finish
    fi
    if [ "${coordinates[0]}" == "0" ] || [ "${coordinates[1]}" == "0" ]
    then
-      printprocesslog "WARN coordinates "${coordinates[@]}
-      #echo "WARN coordinates "${coordinates[@]}
+      printprocesslog "WARN coordinates "${coordinates[@]}" for "$night"_"$runid
       finish
    fi
@@ -76 +85 @@
 makedir $outpath
 
-output=$outpath/`basename $starfile | cut -dI -f1`
+output=$outpath/`basename $starfile | cut -d_ -f1-2`
 logfile=$output"-ganymed.log"
 ganymedfile=$output"-analysis.root"