Changeset 18770


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/DataCheck/Processing/FillAuxData.sh

    r18708 r18770  
    133133   # get daily fits files
    134134   trackingfile=$auxdir/$runnumber.DRIVE_CONTROL_TRACKING_POSITION.fits
    135    if ! [ -e $trackingfile ]
    136    then
    137       printprocesslog "WARN "$trackingfile" not found."
    138    fi
     135   check_file_avail $trackingfile
    139136   
    140137   sourceposfile=$auxdir/$runnumber.DRIVE_CONTROL_SOURCE_POSITION.fits
    141    if ! [ -e $sourceposfile ]
     138   if check_file_avail $sourceposfile
    142139   then
    143       printprocesslog "WARN "$sourceposfile" not found."
    144    else
    145140      sourceposfiletstarti=`$factpath/fitsdump -h $sourceposfile  2>/dev/null | grep 'TSTARTI' | grep -E -o '[0-9]{5}'`
    146141      sourceposfiletstartf=`$factpath/fitsdump -h $sourceposfile  2>/dev/null | grep 'TSTARTF' | grep -E -o '0[.][0-9]+'`
     
    154149   
    155150   triggerratefile=$auxdir/$runnumber.FTM_CONTROL_TRIGGER_RATES.fits
    156    if ! [ -e $triggerratefile ]
    157    then
    158       printprocesslog "WARN "$triggerratefile" not found."
    159    fi
     151   check_file_avail $triggerratefile
    160152   
    161153   thresholdfile=$auxdir/$runnumber.FTM_CONTROL_STATIC_DATA.fits
    162    if ! [ -e $thresholdfile ]
    163    then
    164       printprocesslog "WARN "$thresholdfile" not found."
    165    fi
     154   check_file_avail $thresholdfile
    166155   
    167156   biasvoltagefile=$auxdir/$runnumber.BIAS_CONTROL_VOLTAGE.fits
    168    if ! [ -e $biasvoltagefile ]
    169    then
    170       printprocesslog "WARN "$biasvoltagefile" not found."
    171    fi
     157   check_file_avail $biasvoltagefile
    172158
    173159   # fill auxiliary information for files
     
    180166      # get information from rawfile
    181167      rawfile=`ls $rawdir/$runnumber"_"\`printf %03d $filenum\`.fits* 2>/dev/null`
    182       if ! [ -e $rawfile ]
    183       then
    184          if [ $night -lt $checknight ]
    185          then
    186             printprocesslog "WARN "$rawfile" not found."
    187          else
    188             printprocesslog "INFO "$rawfile" not found."
    189          fi
     168      if ! check_file_avail $rawfile
     169      then
    190170         continue
    191171      fi
  • trunk/DataCheck/QuickLook/Step1.sh

    r18705 r18770  
    6363function rsync_aux_file()
    6464{
    65    if ls $1 >/dev/null 2>&1
     65   if check_file_avail $1
    6666   then
    6767      printprocesslog "INFO rsync "$1
     
    7777         printprocesslog "WARN rsync of "$1" failed."
    7878      fi
    79    else
    80       printprocesslog "WARN "$1" missing."
    8179   fi
    8280}
Note: See TracChangeset for help on using the changeset viewer.