Changeset 14880 for trunk

Timestamp:

02/07/13 08:05:28 (12 years ago)

Author:

Daniela Dorner

Message:

added new values

File:

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

trunk/DataCheck/Processing/FillAuxCurrents.sh

@@ -3 +3 @@
 # option 
 doupdate="yes" # update all entries (needed when new fields have been added)
-doupdate="no" # fill only entries which are not yet existing (default)
+#doupdate="no" # fill only entries which are not yet existing (default)
 
 source `dirname $0`/../Sourcefile.sh
@@ -23 +23 @@
 
 # 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"` \
+#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"` \
-        )
+##        `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 -r | sed "s/\${ziprawdata_for_sed}//g" | sed -e 's/^\///'` ) #all available dates in /loc_data/zipraw
+
+#dates=( "2013/01/31" )
+
 printprocesslog "INFO processing the following night(s): "${dates[@]}
 echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
@@ -40 +43 @@
    auxdir=$auxdata/$date
    runnumber=`echo $date | sed -e 's/\///g'`
-   #if [ $runnumber -lt 20120301 ]
-   #then
-   #   continue
-   #fi
-   #if [ $runnumber -gt 20120714 ]
-   #then
-   #   continue
-   #fi
 
    # check if aux files are available from that night
@@ -179 +174 @@
       if [ -e $calcurrentsfile ] && [ $calnumerrors -eq 0 ]
       then 
+         #root -q -b -l fact/curavg.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) # | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'
          currents=( `root -q -b -l fact/curavg.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
          if [ "${currents[0]}" == "" ]
          then 
-            query=$query"fCurrentsMean=NULL"
-         else
-            query=$query"fCurrentsMean="${currents[0]}
+            query=$query"fCurrentsMedMean=NULL"
+         else
+            query=$query"fCurrentsMedMean="${currents[0]}
          fi
          if [ "${currents[1]}" == "" ]
          then 
-            query=$query", fCurrentsRms=NULL"
-         else
-            query=$query", fCurrentsRms="${currents[1]}
+            query=$query", fCurrentsMedRms=NULL"
+         else
+            query=$query", fCurrentsMedRms="${currents[1]}
+         fi
+         if [ "${currents[2]}" == "" ]
+         then 
+            query=$query", fCurrentsDevMean=NULL"
+         else
+            query=$query", fCurrentsDevMean="${currents[2]}
+         fi
+         if [ "${currents[3]}" == "" ]
+         then 
+            query=$query", fCurrentsDevRms=NULL"
+         else
+            query=$query", fCurrentsDevRms="${currents[3]}
          fi
       else
-         query=$query" fCurrentsMean=NULL"
-         query=$query", fCurrentsRms=NULL"
+         query=$query" fCurrentsMedMean=NULL"
+         query=$query", fCurrentsMedRms=NULL"
+         query=$query", fCurrentsDevMean=NULL"
+         query=$query", fCurrentsDevRms=NULL"
       fi