Changeset 12644 for trunk/DataCheck

Timestamp:

11/25/11 06:07:06 (13 years ago)

Author:

Daniela Dorner

Message:

added roitm; added new option

File:

• trunk/DataCheck/CheckRawData.sh (modified) (6 diffs)

trunk/DataCheck/CheckRawData.sh

@@ -10 +10 @@
 doupdate="yes" # update all entries
 #doupdate="no" # fill only entries which are not yet existing
+
+fillonly="ifzipped" # fill only entries which are not yet existing + where zipped file is availabl
 
 echo ""  >> $logfile 2>&1
@@ -29 +31 @@
 
 # get last 3 nights
-dates=( `date +%Y/%m/%d` `date +%Y/%m/%d --date="-1day"` `date +%Y/%m/%d --date="-2day"` `date +%Y/%m/%d --date="-3day"` )
-dates=( `date +%Y/%m/%d --date="-6day"` )
-dates=( "2011/11/23" )
+dates=( `date +%Y/%m/%d --date="-12hour"` `date +%Y/%m/%d --date="-36hour"` )
 
 # do rsync for rawfiles of these dates
@@ -150 +150 @@
          fi
       fi
+      if [ "$result3" == "" ] && [ "$md5sum" == "" ] && [ "$fillonly" == "ifzipped" ]
+      then 
+         echo $file" is still missing zip => do not insert yet => continue " >> $logfile 2>&1
+         continue
+      fi
 
       runtype=
@@ -181 +186 @@
          runtype=`/home/fact/FACT++/fitsdump -h -t Events $file  2>/dev/null | grep RUNTYPE | grep -E -o "['][a-z-]+[']" | sed -e "s/'//g"`
          roi=`/home/fact/FACT++/fitsdump -h -t Events $file  2>/dev/null | grep NROI | grep -v NROITM | grep -E -o '[0-9]{1,4}'`
+         roitm=`/home/fact/FACT++/fitsdump -h -t Events $file  2>/dev/null | grep NROITM | grep -E -o '[0-9]{1,4}'`
          numevents=`/home/fact/FACT++/fitsdump -h -t Events $file  2>/dev/null | grep Events | grep -E -o '[0-9]+'`
          numphys=`/home/fact/FACT++/fitsdump -h -t Events $file  2>/dev/null | grep 'NTRG ' | grep -E -o '[0-9]+'`
@@ -273 +279 @@
       if [ $numfitserrors -eq 0 ]
       then 
-         query4=$query4", fNumEvents="$numevents", fROI="$roi
+         query4=$query4", fNumEvents="$numevents", fROI="$roi", fROITimeMarker="$roitm
          query4=$query4", fRunStart='"$runstart"', fRunStop='"$runstop"'"
          if [ "$numphys" != "" ]
@@ -330 +336 @@
       echo "  number error: "$numbererror >> $logfile 2>&1
       echo "  roi: "$roi >> $logfile 2>&1
+      echo "  roitm: "$roitm >> $logfile 2>&1
       echo "  runtype: "$runtype >> $logfile 2>&1
       echo "  numevents: "$numevents >> $logfile 2>&1