Changeset 18321 for trunk/DataCheck/Processing/FillAuxData.sh

Timestamp:

08/31/15 01:31:37 (9 years ago)

Author:

Daniela Dorner

Message:

removed check of certaindate-variable (now done in getdate())

File:

• trunk/DataCheck/Processing/FillAuxData.sh (modified) (11 diffs)

trunk/DataCheck/Processing/FillAuxData.sh

@@ -2 +2 @@
 
 # new version of the script to run on newdaq
+#   but can be also used at ISDC 
 
 # option whether to fill all row or only those where information is missing
@@ -28 +29 @@
 if [ "$certaindate" != "" ]
 then
-   checkstring=`echo $certaindate | grep -E -o '^20[0-9][0-9]\/[01][0-9]\/[0-3][0-9]$'`
-   if [ "$checkstring" = "" ]
-   then
-      echo "Please give the variable certaindate in the correct format (YYYY/MM/DD)"
-      finish
-   fi
    getdates $certaindate
 else
@@ -80 +75 @@
    then
       printprocesslog "WARN empty evaluation of statistic ("$@") for run "$date" "$file
-      #echo "   ---> "$@
-   fi
-   #echo "ev: "$evaluation
+   fi
    min=`echo $evaluation | grep -E -o 'Min:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Min:\ //'`
    max=`echo $evaluation | grep -E -o 'Max:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Max:\ //'`
@@ -88 +81 @@
    mean=`echo $evaluation | grep -E -o 'Avg:\ [-]?[0-9]+[.]?[0-9]*' | sed -e 's/Avg:\ //'`
    rms=`echo $evaluation | grep -E -o 'Rms:\ [-]?[0-9]+[.]?[0-9]*[e]?[-]?[0-9]+' | sed -e 's/Rms:\ //'`
-   #echo "eval: "$min" "$max" "$med" "$mean" "$rms
 }
 
@@ -105 +97 @@
    else
       printprocesslog "INFO processing files in "$auxdir
-      #echo "INFO processing files in "$auxdir
    fi
 
@@ -179 +170 @@
       printprocesslog "INFO processing file number "$runnumber"_"`printf %03d $filenum`
       echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum` >> $logfile 2>&1
-      echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum`
+      #echo  `date`": processing file number "$runnumber"_"`printf %03d $filenum`
  
       # get information from rawfile
@@ -200 +191 @@
          continue
       fi
-      echo $runtype
       # assuming that at least TSTARTI and TSTOPI are consistent
-      #echo $rawfile
-      #echo $tstarti
-      #echo $tstopi
-      #echo $tstartf
-      #echo $tstopf
       if [ $tstarti -gt 30000 ]
       then 
@@ -219 +204 @@
          tstop=`echo " $tstopi + $tstopf " | bc -l`
       fi
-      #echo $tstart
-      #echo $tstop
+      # code for very old data
       #if [ $runnumber -eq 20111123 ] 
       #then 
@@ -317 +301 @@
             fi
          fi
-         echo $runstart $runstop
          #numevents=`$factpath/fitsdump -h -t Events $rawfile  2>/dev/null | grep Events | grep -E -o '[0-9]+'`
          numevents=`$factpath/fitsdump -h $rawfile  2>/dev/null | grep Events | grep -E -o '[0-9]+'`
@@ -420 +403 @@
          # RA
          evaluatestatistics "Ra" $trackingstats
-         #echo $min"_"$max"_"$
          if [ "$evaluation" != "" ]
          then
@@ -623 +605 @@
       # add where condition
       query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
-      echo $query
 
       # send query to DB