Index: trunk/DataCheck/Processing/FillAuxCurrents.sh
===================================================================
--- trunk/DataCheck/Processing/FillAuxCurrents.sh	(revision 16679)
+++ trunk/DataCheck/Processing/FillAuxCurrents.sh	(revision 16690)
@@ -34,5 +34,5 @@
 echo  `date`": processing the following night(s): "${dates[@]} >> $logfile 2>&1
 
-echo ${dates[@]}
+#echo ${dates[@]}
 
 cd $mars
@@ -44,8 +44,8 @@
    runnumber=`echo $date | sed -e 's/\///g'`
    
-#   if [ $runnumber -lt 20130301 ]
-#   then
-#      continue
-#   fi
+   if [ $runnumber -lt 20130301 ]
+   then
+      continue
+   fi
 
    # check if aux files are available from that night
@@ -97,9 +97,16 @@
    fi
 
-   echo "run calibrate.C for night "$runnumber
-   root -q -b -l fact/calibrate.C\($runnumber\)
-
-   calcurrentsfile=$auxdir/$runnumber.CALIBRATED_CURRENTS.fits
-   calcurrentsfile=/scratch_nfs/calibrated_currents/$runnumber.CALIBRATED_CURRENTS.fits
+   calcurrentsfile=$auxdir/$runnumber.FEEDBACK_CALIBRATED_CURRENTS.fits
+   if ! [ -e $calcurrentsfile ]
+   then 
+      printprocesslog "INFO run calibrate.C for night "$runnumber
+      echo "INFO run calibrate.C for night "$runnumber >> $logfile 2>&1
+      root -q -b -l fact/calibrate.C\($runnumber\)
+      calcurrentsfile=/gpfs/scratch/fact/calibrated_currents/$runnumber.CALIBRATED_CURRENTS.fits
+   fi
+
+   #calcurrentsfile=$auxdir/$runnumber.FEEDBACK_CALIBRATED_CURRENTS.fits
+   #calcurrentsfile=/scratch_nfs/calibrated_currents/$runnumber.CALIBRATED_CURRENTS.fits
+   #calcurrentsfile=/gpfs/scratch/fact/calibrated_currents/$runnumber.CALIBRATED_CURRENTS.fits
    if ! [ -e $calcurrentsfile ]
    then 
@@ -180,5 +187,6 @@
       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]*'` )
+         #currents=( `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/processing/currents.C\("\"$calcurrentsfile\""\,$tstart\,$tstop\) | grep "result" | grep -E -o '[0-9]+[.]?[0-9]*'` )
          if [ "${currents[0]}" == "" ]
          then 
@@ -229,5 +237,5 @@
       query=$query" WHERE fNight="$runnumber" AND fRunID="$filenum
       
-      echo $query
+      #echo $query
       # send query to DB
       sendquery >/dev/null