Changeset 18471

Timestamp:

04/22/16 21:19:06 (8 years ago)

Author:

Daniela Dorner

Message:

fixed bug for very small TSTOPF

File:

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

trunk/DataCheck/Processing/FillAuxData.sh

@@ -183 +183 @@
       #mjdrefraw=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep 'MJDREF' | grep -E -o '[0-9]{5}'`
       tstarti=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep 'TSTARTI' | grep -E -o '[0-9]{5}'`
-      tstartf=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep 'TSTARTF' | grep -E -o '0[.][0-9]+'`
+      tstartf=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep 'TSTARTF' | grep -E -o '[0-9][.][0-9]+([E][\-][0-9][0-9])?' | sed -e 's/[E]+*/\\*10\\^/'`
       tstopi=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep 'TSTOPI' | grep -E -o '[0-9]{5}'`
-      tstopf=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep 'TSTOPF' | grep -E -o '0[.][0-9]+'`
+      tstopf=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep 'TSTOPF' | grep -E -o '[0-9][.][0-9]+([E][\-][0-9][0-9])?' | sed -e 's/[E]+*/\\*10\\^/'`
       if [ "$tstarti" == "" ] || [ "$tstopi" == "" ] || [ "$tstartf" == "" ] || [ "$tstopf" == "" ]
       then 
          printprocesslog "WARN: "$rawfile": one of the following keywords is empty or 0: TSTARTI TSTARTF TSTOPI TSTOPF "
+         echo "WARN: "$rawfile": one of the following keywords is empty or 0: TSTARTI TSTARTF TSTOPI TSTOPF "
          continue
       fi
+      echo $rawfile" "$tstarti" "$tstartf" "$tstopi" "$tstopf
       # assuming that at least TSTARTI and TSTOPI are consistent
       if [ $tstarti -gt 30000 ]
@@ -204 +206 @@
          tstop=`echo " $tstopi + $tstopf " | bc -l`
       fi
+      echo $rawfile" "$tstart" "$tstop
       # code for very old data
       #if [ $runnumber -eq 20111123 ]