Changeset 18770 for trunk

Timestamp:

02/20/17 13:58:17 (8 years ago)

Author:

Daniela Dorner

Message:

implemented usage of new function check_file_avail

Location:

trunk/DataCheck

Files:

• Processing/FillAuxData.sh (modified) (3 diffs)
• QuickLook/Step1.sh (modified) (2 diffs)

trunk/DataCheck/Processing/FillAuxData.sh

@@ -133 +133 @@
    # get daily fits files 
    trackingfile=$auxdir/$runnumber.DRIVE_CONTROL_TRACKING_POSITION.fits
-   if ! [ -e $trackingfile ]
-   then 
-      printprocesslog "WARN "$trackingfile" not found."
-   fi
+   check_file_avail $trackingfile
    
    sourceposfile=$auxdir/$runnumber.DRIVE_CONTROL_SOURCE_POSITION.fits
-   if ! [ -e $sourceposfile ]
+   if check_file_avail $sourceposfile 
    then 
-      printprocesslog "WARN "$sourceposfile" not found."
-   else
       sourceposfiletstarti=`$factpath/fitsdump -h $sourceposfile  2>/dev/null | grep 'TSTARTI' | grep -E -o '[0-9]{5}'`
       sourceposfiletstartf=`$factpath/fitsdump -h $sourceposfile  2>/dev/null | grep 'TSTARTF' | grep -E -o '0[.][0-9]+'`
@@ -154 +149 @@
    
    triggerratefile=$auxdir/$runnumber.FTM_CONTROL_TRIGGER_RATES.fits
-   if ! [ -e $triggerratefile ]
-   then 
-      printprocesslog "WARN "$triggerratefile" not found."
-   fi
+   check_file_avail $triggerratefile
    
    thresholdfile=$auxdir/$runnumber.FTM_CONTROL_STATIC_DATA.fits
-   if ! [ -e $thresholdfile ]
-   then 
-      printprocesslog "WARN "$thresholdfile" not found."
-   fi
+   check_file_avail $thresholdfile
    
    biasvoltagefile=$auxdir/$runnumber.BIAS_CONTROL_VOLTAGE.fits
-   if ! [ -e $biasvoltagefile ]
-   then 
-      printprocesslog "WARN "$biasvoltagefile" not found."
-   fi
+   check_file_avail $biasvoltagefile
 
    # fill auxiliary information for files
@@ -180 +166 @@
       # get information from rawfile
       rawfile=`ls $rawdir/$runnumber"_"\`printf %03d $filenum\`.fits* 2>/dev/null`
-      if ! [ -e $rawfile ]
-      then 
-         if [ $night -lt $checknight ] 
-         then 
-            printprocesslog "WARN "$rawfile" not found."
-         else
-            printprocesslog "INFO "$rawfile" not found."
-         fi
+      if ! check_file_avail $rawfile
+      then 
          continue
       fi

trunk/DataCheck/QuickLook/Step1.sh

@@ -63 +63 @@
 function rsync_aux_file()
 {
-   if ls $1 >/dev/null 2>&1
+   if check_file_avail $1
    then 
       printprocesslog "INFO rsync "$1
@@ -77 +77 @@
          printprocesslog "WARN rsync of "$1" failed."
       fi
-   else
-      printprocesslog "WARN "$1" missing."
    fi
 }