Changeset 18944

Timestamp:

02/09/18 23:03:23 (7 years ago)

Author:

Daniela Dorner

Message:

added new values

File:

• trunk/DataCheck/Processing/FillAuxMagic.sh (modified) (4 diffs)

trunk/DataCheck/Processing/FillAuxMagic.sh

@@ -29 +29 @@
 then
    getdates $certaindate
+   echo  `date`": processing the following night(s): "${dates[@]} 
 else
    # get all night
@@ -87 +88 @@
       then 
          printprocesslog "WARN for $magicweatherfile fverify returned "$weathernumerrors" error(s)."
-      fi
-   fi
-
-   fsctempfile=$auxdir/$runnumber.FSC_CONTROL_TEMPERATURE.fits
-   if ! [ -e $fsctempfile ]
-   then 
-      printprocesslog "WARN "$fsctempfile" not found."
-   else
-      tempnumerrors=`fverify $fsctempfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
-      if [ $tempnumerrors -gt 0 ]
-      then 
-         printprocesslog "WARN for $fsctempfile fverify returned "$tempnumerrors" error(s)."
       fi
    fi
@@ -150 +139 @@
          tstop=`echo " $tstopi + $tstopf " | bc -l`
       fi
+      #echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum`" "$runtype
 
       # build query to update runinfo in DB
       query="UPDATE RunInfo SET "
 
-      # get information from fsc: T[31]
-      if [ -e $fsctempfile ] && [ $tempnumerrors -eq 0 ]
-      then 
-         fsctemps=( `root -q -b -l fact/processing/camtemp.C\("\"$fsctempfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
-         if [ "${fsctemps[0]}" == "" ]
-         then 
-            query=$query"fCameraTempMean=NULL"
-         else
-            query=$query"fCameraTempMean="${fsctemps[0]}
-         fi
-         if [ "${fsctemps[1]}" == "" ]
-         then 
-            query=$query", fCameraTempRms=NULL"
-         else
-            query=$query", fCameraTempRms="${fsctemps[1]}
-         fi
-         if [ "${fsctemps[2]}" == "" ]
-         then 
-            query=$query", fCameraTempRmsMean=NULL"
-         else
-            query=$query", fCameraTempRmsMean="${fsctemps[2]}
-         fi
-      else
-         query=$query" fCameraTempMean=NULL"
-         query=$query", fCameraTempRms=NULL"
-         query=$query", fCameraTempRmsMean=NULL"
-      fi
-      #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]*'` )
+         #echo $magicweatherfile" "$tstart" "$tstop
+         #root -q -b -l fact/processing/magicweather.C\("\"$magicweatherfile\""\,$tstart\,$tstop\) | grep "result"
+         mtemps=( `root -q -b -l fact/processing/magicweather.C\("\"$magicweatherfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[-]?[0-9]+[.]?[0-9]*'` )
+         #echo ${mtemps[@]}
          if [ "${mtemps[0]}" == "" ]
          then 
-            query=$query", fOutsideTempMean=NULL"
-         else
-            query=$query", fOutsideTempMean="${mtemps[0]}
+            query=$query"fOutsideTempMean=NULL"
+         else
+            query=$query"fOutsideTempMean="${mtemps[0]}
          fi
          if [ "${mtemps[1]}" == "" ]
@@ -199 +163 @@
             query=$query", fOutsideTempRms="${mtemps[1]}
          fi
+         if [ "${mtemps[2]}" == "" ]
+         then 
+            query=$query", fHumidityMean=NULL"
+         else
+            query=$query", fHumidityMean="${mtemps[2]}
+         fi
+         if [ "${mtemps[3]}" == "" ]
+         then 
+            query=$query", fHumidityRms=NULL"
+         else
+            query=$query", fHumidityRms="${mtemps[3]}
+         fi
+         if [ "${mtemps[4]}" == "" ]
+         then 
+            query=$query", fAirPressureMean=NULL"
+         else
+            query=$query", fAirPressureMean="${mtemps[4]}
+         fi
+         if [ "${mtemps[5]}" == "" ]
+         then 
+            query=$query", fAirPressureRms=NULL"
+         else
+            query=$query", fAirPressureRms="${mtemps[5]}
+         fi
+         if [ "${mtemps[6]}" == "" ]
+         then 
+            query=$query", fDewPointMean=NULL"
+         else
+            query=$query", fDewPointMean="${mtemps[6]}
+         fi
+         if [ "${mtemps[7]}" == "" ]
+         then 
+            query=$query", fDewPointRms=NULL"
+         else
+            query=$query", fDewPointRms="${mtemps[7]}
+         fi
+         if [ "${mtemps[8]}" == "" ]
+         then 
+            query=$query", fWindSpeedMean=NULL"
+         else
+            query=$query", fWindSpeedMean="${mtemps[8]}
+         fi
+         if [ "${mtemps[9]}" == "" ]
+         then 
+            query=$query", fWindSpeedRms=NULL"
+         else
+            query=$query", fWindSpeedRms="${mtemps[9]}
+         fi
+         if [ "${mtemps[10]}" == "" ]
+         then 
+            query=$query", fWindGustMean=NULL"
+         else
+            query=$query", fWindGustMean="${mtemps[10]}
+         fi
+         if [ "${mtemps[119]}" == "" ]
+         then 
+            query=$query", fWindGustRms=NULL"
+         else
+            query=$query", fWindGustRms="${mtemps[11]}
+         fi
       else
-         query=$query", fOutsideTempMean=NULL"
+         query=$query"fOutsideTempMean=NULL"
          query=$query", fOutsideTempRms=NULL"
-      fi
-      
+         query=$query", fHumidityMean=NULL"
+         query=$query", fHumidityRms=NULL"
+         query=$query", fAirPressureMean=NULL"
+         query=$query", fAirPressureRms=NULL"
+         query=$query", fDewPointMean=NULL"
+         query=$query", fDewPointRms=NULL"
+         query=$query", fWindSpeedMean=NULL"
+         query=$query", fWindSpeedRms=NULL"
+         query=$query", fWindGustMean=NULL"
+         query=$query", fWindGustRms=NULL"
+      fi
+
       # add where condition
       query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum