Changeset 17597 for trunk/DataCheck/Processing/FillAuxThresholds.sh

Timestamp:

03/02/14 13:41:25 (11 years ago)

Author:

Daniela Dorner

Message:

give warning about missing files only when runinfo in DB available

File:

• trunk/DataCheck/Processing/FillAuxThresholds.sh (modified) (2 diffs)

trunk/DataCheck/Processing/FillAuxThresholds.sh

@@ -50 +50 @@
    runnumber=`echo $date | sed -e 's/\///g'`
 
-   # check if aux files are available from that night
-   if ! [ -d $auxdir ]
-   then
-      printprocesslog "INFO no data available in "$auxdir
-      continue
-   else
-      printprocesslog "INFO processing files in "$auxdir
-   fi
-   
-   rawdir=$rawdata/$date
-   # check if raw files are available from that night
-   if ! [ -d $rawdir ]
-   then
-      logtext="INFO"
-   else
-      logtext="WARN"
-   fi
-
-   thresholdfile=$auxdir/$runnumber.RATE_CONTROL_THRESHOLD.fits
-   printprocesslog "INFO processing "$thresholdfile
-   echo "INFO processing "$thresholdfile >> $logfile 2>&1
-   if ! [ -e $thresholdfile ]
-   then 
-      printprocesslog $logtext" "$thresholdfile" not found."
-      continue
-   else
-      threshnumerrors=`fverify $thresholdfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
-      if [ $threshnumerrors -gt 0 ]
-      then 
-         printprocesslog "WARN for $thresholdfile fverify returned "$threshnumerrors" error(s)."
-      fi
-   fi
-
-   thresholdfile2=$auxdir/$runnumber.FTM_CONTROL_STATIC_DATA.fits
-   #ls $thresholdfile2
-   if ! [ -e $thresholdfile2 ]
-   then 
-      printprocesslog $logtext" "$thresholdfile2" not found."
-      continue
-   else
-      threshnumerrors2=`fverify $thresholdfile2 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
-      if [ $threshnumerrors2 -gt 0 ]
-      then 
-         printprocesslog "WARN for $thresholdfile2 fverify returned "$threshnumerrors2" error(s)."
-      fi
-   fi
-
-
-
    # get file numbers from DB
    #   but only for not-corrupted files
@@ -106 +57 @@
       query=$query" AND ISNULL(fThresholdMedMean) AND ISNULL(fThresholdMinSet) "
    fi
-
    printprocesslog "DEBUG get filenumbers from DB: QUERY: "$query
    filenumbers=( `sendquery $query` )
+   # proceed only if there are files available
    if [ ${#filenumbers} -eq 0 ]
    then
       printprocesslog "INFO No files found in the DB for night "$date
       continue
+   fi
+
+   # check if aux files are available from that night
+   if ! [ -d $auxdir ]
+   then
+      printprocesslog "INFO no data available in "$auxdir
+      continue
+   else
+      printprocesslog "INFO processing files in "$auxdir
+   fi
+   
+   thresholdfile=$auxdir/$runnumber.RATE_CONTROL_THRESHOLD.fits
+   printprocesslog "INFO processing "$thresholdfile
+   echo "INFO processing "$thresholdfile >> $logfile 2>&1
+   if ! [ -e $thresholdfile ]
+   then 
+      printprocesslog "WARN "$thresholdfile" not found."
+      continue
+   else
+      threshnumerrors=`fverify $thresholdfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
+      if [ $threshnumerrors -gt 0 ]
+      then 
+         printprocesslog "WARN for $thresholdfile fverify returned "$threshnumerrors" error(s)."
+      fi
+   fi
+
+   thresholdfile2=$auxdir/$runnumber.FTM_CONTROL_STATIC_DATA.fits
+   #ls $thresholdfile2
+   if ! [ -e $thresholdfile2 ]
+   then 
+      printprocesslog "WARN "$thresholdfile2" not found."
+      continue
+   else
+      threshnumerrors2=`fverify $thresholdfile2 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
+      if [ $threshnumerrors2 -gt 0 ]
+      then 
+         printprocesslog "WARN for $thresholdfile2 fverify returned "$threshnumerrors2" error(s)."
+      fi
    fi