Changeset 17598

Timestamp:

03/02/14 14:01:42 (11 years ago)

Author:

Daniela Dorner

Message:

removed filling of outside temperatur (done in FillAuxTemp.sh), fixed check whether data was already filled

File:

• trunk/DataCheck/Processing/FillDrsTemp.sh (modified) (3 diffs)

trunk/DataCheck/Processing/FillDrsTemp.sh

@@ -69 +69 @@
    if [ "$doupdate" = "no" ]
    then
-      query=$query" AND ISNULL(fCameraTempMean) "
+      query=$query" AND ISNULL(fDrsTempMinMean) "
    fi
    printprocesslog "DEBUG get filenumbers from DB: QUERY: "$query
@@ -78 +78 @@
       printprocesslog "INFO No files found in the DB for night "$date
       continue
-   fi
-
-   magicweatherfile=$auxdir/$runnumber.MAGIC_WEATHER_DATA.fits
-   if ! [ -e $magicweatherfile ]
-   then 
-      printprocesslog "WARN "$magicweatherfile" not found."
-      echo "WARN "$magicweatherfile" not found."
-   else
-      weathernumerrors=`fverify $magicweatherfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
-      if [ $weathernumerrors -gt 0 ]
-      then 
-         printprocesslog "WARN for $magicweatherfile fverify returned "$weathernumerrors" error(s)."
-      fi
    fi
 
@@ -194 +181 @@
       #fCameraTempMeanRms: mean of rms of single sensors
       
-      # get information from weather: T
-      if [ -e $magicweatherfile ] && [ $weathernumerrors -eq 0 ]
-      then 
-         mtemps=( `root -q -b -l fact/processing/magictemp.C\("\"$magicweatherfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
-         if [ "${mtemps[0]}" == "" ]
-         then 
-            query=$query", fOutsideTempMean=NULL"
-         else
-            query=$query", fOutsideTempMean="${mtemps[0]}
-         fi
-         if [ "${mtemps[1]}" == "" ]
-         then 
-            query=$query", fOutsideTempRms=NULL"
-         else
-            query=$query", fOutsideTempRms="${mtemps[1]}
-         fi
-      else
-         query=$query", fOutsideTempMean=NULL"
-         query=$query", fOutsideTempRms=NULL"
-      fi
-      
       # add where condition
       query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum