Index: trunk/DataCheck/Processing/FillAuxCam.sh
===================================================================
--- trunk/DataCheck/Processing/FillAuxCam.sh	(revision 18941)
+++ trunk/DataCheck/Processing/FillAuxCam.sh	(revision 18941)
@@ -0,0 +1,169 @@
+#!/bin/bash
+
+# option whether to fill all row or only those where information is missing
+# $doupdate might be given as environment variable
+if [ "$doupdate" = "" ]
+then
+   doupdate="yes" # update all entries (needed when new fields have been added)
+   doupdate="no" # fill only entries which are not yet existing (default)
+fi
+
+source `dirname $0`/../Sourcefile.sh
+printprocesslog "INFO starting $0 with option doupdate="$doupdate
+
+logfile=$runlogpath"/FillAusCamHum-"$datetime".log"
+date >> $logfile
+
+# setup to use ftools
+source $HEADAS/headas-init.sh
+
+# check if software is available
+if ! ls $factpath/fitsdump >/dev/null 2>&1
+then 
+   printprocesslog "ERROR "$factpath"/fitsdump is not available."
+   finish
+fi
+
+# get dates
+if [ "$certaindate" != "" ]
+then
+   getdates $certaindate
+else
+   # get all night
+   #getdates "all"
+   # get last 6 nights
+   getdates 6
+fi
+
+
+
+printprocesslog "INFO processing the following night(s): "${dates[@]}
+echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
+
+cd $mars
+
+# do filling of aux data 
+for date in ${dates[@]}
+do 
+   auxdir=$auxdata/$date
+   runnumber=`echo $date | sed -e 's/\///g'`
+   if [ $runnumber -lt 20120328 ]
+   then
+      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
+
+   # get file numbers from DB
+   #   but only for not-corrupted files
+   query="SELECT fRunID from RunInfo WHERE fNight="$runnumber" AND fFitsFileErrors=0 "
+   if [ "$doupdate" = "no" ]
+   then
+      query=$query" AND ISNULL(fCamHumidityMean) "
+   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
+
+   fschumfile=$auxdir/$runnumber.FSC_CONTROL_HUMIDITY.fits
+   if ! [ -e $fschumfile ]
+   then 
+      printprocesslog "WARN "$fschumfile" not found."
+   else
+      humnumerrors=`fverify $fschumfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
+      if [ $humnumerrors -gt 0 ]
+      then 
+         printprocesslog "WARN for "$fschumfile" fverify returned "$humnumerrors" error(s)."
+      fi
+   fi
+
+   # fill auxiliary information for files
+   for filenum in ${filenumbers[@]}
+   do
+      printprocesslog "INFO processing file number "$runnumber"_"`printf %03d $filenum`
+      echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum` >> $logfile 2>&1
+      # get information from rawfile
+      rawfile=$ziprawdata/$date/$runnumber"_"`printf %03d $filenum`.fits.fz
+      if ! [ -e $rawfile ]
+      then 
+         if [ $runnumber -lt $checknight ] 
+         then 
+            printprocesslog "WARN "$rawfile" not found."
+         else
+            printprocesslog "INFO "$rawfile" not found."
+         fi
+         continue
+      fi
+      #checkfitsfile=`fverify $rawfile  2>/dev/null | grep '0 error(s)'`
+      #if [ "$checkfitsfile" == "" ]
+      #then
+      #   numfitserrors=1
+      #   printprocesslog "WARN: "$rawfile" probably corrupted."
+      #   continue
+      #fi
+      runtype=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep RUNTYPE | grep -E -o "['][a-z-]+[']" | sed -e "s/'//g"`
+      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-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-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 "
+         continue
+      fi
+      # assuming that at least TSTARTI and TSTOPI are consistent
+      if [ $tstarti -gt 30000 ]
+      then 
+         tstart=`echo " $tstarti + $tstartf - 40587 " | bc -l`
+         tstart2=`echo " $tstarti + $tstartf - 40587 - 0.00011574 " | bc -l`  # 10 sec
+         #tstart2=`echo " $tstarti + $tstartf - 40587 - 0.000023148 " | bc -l` # 2 sec
+         tstop=`echo " $tstopi + $tstopf - 40587 " | bc -l`
+      else
+         tstart=`echo " $tstarti + $tstartf " | bc -l`
+         tstart2=`echo " $tstarti + $tstartf - 0.00011574 " | bc -l`  # 10 sec
+         #tstart2=`echo " $tstarti + $tstartf - 0.000023148 " | bc -l` # 2 sec
+         tstop=`echo " $tstopi + $tstopf " | bc -l`
+      fi
+
+      # build query to update runinfo in DB
+      query="UPDATE RunInfo SET "
+
+      # get information from fsc: T[31]
+      if [ -e $fschumfile ] && [ $humnumerrors -eq 0 ]
+      then 
+         hums=( `root -q -b -l fact/processing/camhum.C\("\"$fschumfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
+         if [ "${hums[0]}" == "" ]
+         then 
+            query=$query"fCamHumidityMean=NULL"
+         else
+            query=$query"fCamHumidityMean="${hums[0]}
+         fi
+      else
+         query=$query" fCamHumidityMean=NULL"
+      fi
+      #fCameraTempMeanRms: mean of rms of single sensors
+      
+      # add where condition
+      query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
+      
+      # send query to DB
+      sendquery >/dev/null
+   done
+done
+
+finish
+
+
Index: trunk/DataCheck/Processing/FillAuxCamHum.sh
===================================================================
--- trunk/DataCheck/Processing/FillAuxCamHum.sh	(revision 18940)
+++ 	(revision )
@@ -1,169 +1,0 @@
-#!/bin/bash
-
-# option whether to fill all row or only those where information is missing
-# $doupdate might be given as environment variable
-if [ "$doupdate" = "" ]
-then
-   doupdate="yes" # update all entries (needed when new fields have been added)
-   doupdate="no" # fill only entries which are not yet existing (default)
-fi
-
-source `dirname $0`/../Sourcefile.sh
-printprocesslog "INFO starting $0 with option doupdate="$doupdate
-
-logfile=$runlogpath"/FillAusCamHum-"$datetime".log"
-date >> $logfile
-
-# setup to use ftools
-source $HEADAS/headas-init.sh
-
-# check if software is available
-if ! ls $factpath/fitsdump >/dev/null 2>&1
-then 
-   printprocesslog "ERROR "$factpath"/fitsdump is not available."
-   finish
-fi
-
-# get dates
-if [ "$certaindate" != "" ]
-then
-   getdates $certaindate
-else
-   # get all night
-   #getdates "all"
-   # get last 6 nights
-   getdates 6
-fi
-
-
-
-printprocesslog "INFO processing the following night(s): "${dates[@]}
-echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
-
-cd $mars
-
-# do filling of aux data 
-for date in ${dates[@]}
-do 
-   auxdir=$auxdata/$date
-   runnumber=`echo $date | sed -e 's/\///g'`
-   if [ $runnumber -lt 20120328 ]
-   then
-      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
-
-   # get file numbers from DB
-   #   but only for not-corrupted files
-   query="SELECT fRunID from RunInfo WHERE fNight="$runnumber" AND fFitsFileErrors=0 "
-   if [ "$doupdate" = "no" ]
-   then
-      query=$query" AND ISNULL(fCamHumidityMean) "
-   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
-
-   fschumfile=$auxdir/$runnumber.FSC_CONTROL_HUMIDITY.fits
-   if ! [ -e $fschumfile ]
-   then 
-      printprocesslog "WARN "$fschumfile" not found."
-   else
-      humnumerrors=`fverify $fschumfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
-      if [ $humnumerrors -gt 0 ]
-      then 
-         printprocesslog "WARN for "$fschumfile" fverify returned "$humnumerrors" error(s)."
-      fi
-   fi
-
-   # fill auxiliary information for files
-   for filenum in ${filenumbers[@]}
-   do
-      printprocesslog "INFO processing file number "$runnumber"_"`printf %03d $filenum`
-      echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum` >> $logfile 2>&1
-      # get information from rawfile
-      rawfile=$ziprawdata/$date/$runnumber"_"`printf %03d $filenum`.fits.fz
-      if ! [ -e $rawfile ]
-      then 
-         if [ $runnumber -lt $checknight ] 
-         then 
-            printprocesslog "WARN "$rawfile" not found."
-         else
-            printprocesslog "INFO "$rawfile" not found."
-         fi
-         continue
-      fi
-      #checkfitsfile=`fverify $rawfile  2>/dev/null | grep '0 error(s)'`
-      #if [ "$checkfitsfile" == "" ]
-      #then
-      #   numfitserrors=1
-      #   printprocesslog "WARN: "$rawfile" probably corrupted."
-      #   continue
-      #fi
-      runtype=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep RUNTYPE | grep -E -o "['][a-z-]+[']" | sed -e "s/'//g"`
-      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-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-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 "
-         continue
-      fi
-      # assuming that at least TSTARTI and TSTOPI are consistent
-      if [ $tstarti -gt 30000 ]
-      then 
-         tstart=`echo " $tstarti + $tstartf - 40587 " | bc -l`
-         tstart2=`echo " $tstarti + $tstartf - 40587 - 0.00011574 " | bc -l`  # 10 sec
-         #tstart2=`echo " $tstarti + $tstartf - 40587 - 0.000023148 " | bc -l` # 2 sec
-         tstop=`echo " $tstopi + $tstopf - 40587 " | bc -l`
-      else
-         tstart=`echo " $tstarti + $tstartf " | bc -l`
-         tstart2=`echo " $tstarti + $tstartf - 0.00011574 " | bc -l`  # 10 sec
-         #tstart2=`echo " $tstarti + $tstartf - 0.000023148 " | bc -l` # 2 sec
-         tstop=`echo " $tstopi + $tstopf " | bc -l`
-      fi
-
-      # build query to update runinfo in DB
-      query="UPDATE RunInfo SET "
-
-      # get information from fsc: T[31]
-      if [ -e $fschumfile ] && [ $humnumerrors -eq 0 ]
-      then 
-         hums=( `root -q -b -l fact/processing/camhum.C\("\"$fschumfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
-         if [ "${hums[0]}" == "" ]
-         then 
-            query=$query"fCamHumidityMean=NULL"
-         else
-            query=$query"fCamHumidityMean="${hums[0]}
-         fi
-      else
-         query=$query" fCamHumidityMean=NULL"
-      fi
-      #fCameraTempMeanRms: mean of rms of single sensors
-      
-      # add where condition
-      query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
-      
-      # send query to DB
-      sendquery >/dev/null
-   done
-done
-
-finish
-
-