Changeset 17090 for trunk/DataCheck/Processing

Timestamp:

09/06/13 15:47:40 (11 years ago)

Author:

Daniela Dorner

Message:

new macro paths, usage of getdates function, prepared script to be used in RunMoreNights.sh, minor logging changes

File:

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

trunk/DataCheck/Processing/FillDrsTemp.sh

@@ -1 +1 @@
 #!/bin/bash
 
-# option 
-doupdate="yes" # update all entries (needed when new fields have been added)
-#doupdate="no" # fill only entries which are not yet existing (default)
+# 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"/FillTemp-"$datetime".log"
+logfile=$runlogpath"/FillDrsTemp-"$datetime".log"
 date >> $logfile
 
@@ -21 +25 @@
 fi
 
-
-# get last 3, 6 or 9 nights
-dates=( `date +%Y/%m/%d --date="-12hour"` `date +%Y/%m/%d --date="-36hour"` `date +%Y/%m/%d --date="-60hour"` \
-#        `date +%Y/%m/%d --date="-84hour"` `date +%Y/%m/%d --date="-108hour"` `date +%Y/%m/%d --date="-132hour"` \
-#        `date +%Y/%m/%d --date="-156hour"` `date +%Y/%m/%d --date="-180hour"` `date +%Y/%m/%d --date="-204hour"` \
-        )
-dates=( `find -L $ziprawdata -mindepth 3 -type d | sort | sed "s/\${ziprawdata_for_sed}//g" | sed -e 's/^\///'` ) #all available dates in /loc_data/zipraw
+# 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
 
-echo ${dates[@]}
+#echo ${dates[@]}
 
 cd $mars
@@ -44 +53 @@
       continue
    fi
+   #echo $auxdir" @ "`date` 
 
    # check if aux files are available from that night
@@ -151 +161 @@
       if [ -e $drstempfile ] && [ $tempnumerrors -eq 0 ]
       then 
-         drstemps=( `root -q -b -l fact/drstemp.C\("\"$drstempfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
+         drstemps=( `root -q -b -l fact/processing/drstemp.C\("\"$drstempfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
          if [ "${drstemps[0]}" == "" ]
          then 
@@ -187 +197 @@
       if [ -e $magicweatherfile ] && [ $weathernumerrors -eq 0 ]
       then 
-         mtemps=( `root -q -b -l fact/magictemp.C\("\"$magicweatherfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
+         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 
@@ -208 +218 @@
       query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
       
-      echo $query
+      #echo $query
       # send query to DB
       sendquery >/dev/null