Changeset 15516

Timestamp:

05/07/13 23:22:05 (12 years ago)

Author:

Daniela Dorner

Message:

write output of macro to logfile and catch return value, move to svn mars version, define dates according to hour

File:

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

trunk/DataCheck/Processing/FillNumEvts.sh

@@ -7 +7 @@
 date >> $logfile
 
-# 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"` \
-        )
+# get current hour
+hour=`date +%k`
+if [ $hour -le 7 ] || [ $hour -ge 19 ]
+then
+   dates=( `date +%Y/%m/%d --date="-12hour"` )
+else
+   # 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"` \
+           )
+fi
+
 #dates=( `find -L $auxdata -mindepth 3 -type d | sort -r | grep -v bad | sed "s/\${auxdata_for_sed}//g" | sed -e 's/^\///'` ) #all available dates in /loc_data/zipraw
 
@@ -19 +27 @@
 echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
 
-echo ${dates[@]}
+#echo ${dates[@]}
 
-mars=/home/fact/Mars
+mars=/home/fact/SW.automatic.processing/Mars.svn.2013.04.29
 cd $mars
-pwd
-# use macro from different mars version until versions are sorted out
-mars2=/home/fact/SW.automatic.processing/Mars.svn.2013.04.12
 
 # do filling of aux data 
@@ -38 +43 @@
    fi
    
-   echo "run numevts.C for night "$runnumber" (run-wise processing) "
+   echo "run numevts.C for night "$runnumber" (run-wise processing) " >> $logfile 2>&1
    printprocesslog "run numevts.C for night "$runnumber" (run-wise processing) "
-   printprocesslog "root -q -b -l $mars2/fact/processing/numevents.C\("\"$runnumber"\"\,"\"$anapath"\"\,"\"$resulttable1"\"\,kFALSE\,kFALSE\)"
-   root -q -b -l $mars2/fact/processing/numevents.C\("\"$runnumber"\"\,"\"$anapath"\"\,"\"$resulttable1"\"\,kFALSE\,kFALSE\)
+   printprocesslog "root -q -b -l fact/processing/numevents.C\("\"$runnumber"\"\,"\"$anapath"\"\,"\"$resulttable1"\"\,kFALSE\,kFALSE\)"
+   check1=`root -q -b -l fact/processing/numevents.C\("\"$runnumber"\"\,"\"$anapath"\"\,"\"$resulttable1"\"\,kFALSE\,kFALSE\) | tee $logfile | intgrep`
+
+   case $check1 in
+      1)   printprocesslog "INFO filling numevts.C was successfully (check1=$check1)"
+           ;;
+      0)   printprocesslog "WARN connection to DB failed in numevts.C (check1=$check1)"
+           ;;
+      *)   printprocesslog "ERROR numevts.C failed (check1=$check1)"
+           ;;
+   esac
 
    #echo "run numevts.C for night "$runnumber" (night-wise processing) "