Index: trunk/DataCheck/QuickLook/FlareAlerts.sh
===================================================================
--- trunk/DataCheck/QuickLook/FlareAlerts.sh	(revision 18906)
+++ trunk/DataCheck/QuickLook/FlareAlerts.sh	(revision 19473)
@@ -5,4 +5,5 @@
 # finalize DB-entries for being called
 # prepare directly template for email
+#  maybe prepare website with all necessary links and information
 # add x-ray trigger as trigger type or 
 #    add note for values > 70 evts/h for X-ray triggers
@@ -68,5 +69,6 @@
 threshold="IF (ISNULL(fThresholdMinSet), fThresholdMedian, fThresholdMinSet)"
 #cu="20.0"
-cu="CUQLA(fNight)"
+#cu="CUQLA(fNight)"
+cu="fCU"
 corr="1"
 # missing: corrected excessrates
@@ -80,18 +82,18 @@
    query=$query"fNight AS night, MIN(fRunID) AS runmin, MAX(fRunID) AS runmax, "
    query=$query"MIN(fRunStart) AS start, MAX(fRunStop) AS stop, "
-   query=$query"ROUND(SUM("$ontime")/3600.,1) AS ontime, "
+   query=$query"ROUND(SUM("$ontime")/3600.,2) AS ontime, "
    query=$query"SUM(fNumSigEvts) AS sig, SUM(fNumBgEvts) AS bg, "
-   query=$query"ROUND(SUM(fNumBgEvts)/SUM("$ontime")*3600,1) AS bgrate, "
+   query=$query"ROUND(SUM(fNumBgEvts)/SUM("$ontime")*3600,2) AS bgrate, "
    query=$query"SUM(fNumExcEvts) AS exc, "
-   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts)), 1) AS excerr, "
-   query=$query"ROUND(SUM(fNumExcEvts)/SUM("$ontime")*3600,1) AS excrate, "
-   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600, 1) AS excrateerr, "
-   query=$query"ROUND(SUM(fNumExcEvts*"$corr")/SUM("$ontime")*3600,1) as corexcrate, " # put here correction factor
-   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600*SUM(fNumExcEvts)/SUM(fNumExcEvts*"$corr"), 1) AS corexcrateerr, " # correctionfactor = exc / exc_cor, put here correction factor
-   query=$query"ROUND(LiMa(SUM(fNumSigEvts), SUM(fNumBgEvts)),1) AS signif, "
-   query=$query"ROUND(SUM(fNumExcEvts)/SUM("$ontime")*3600/"$cu",1) AS cu, " # make value time dependent
-   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600/"$cu", 1) AS cuerr, " # make value time dependent
-   query=$query"ROUND(SUM(fNumExcEvts*"$corr")/SUM("$ontime")*3600/"$cu",1) as corcu, " # make value time dependent # put here correction factor
-   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600*SUM(fNumExcEvts)/SUM(fNumExcEvts*"$corr")/"$cu", 1) AS corcuerr, " # correctionfactor = exc / exc_cor # make value time dependent # put here correction factor
+   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts)), 2) AS excerr, "
+   query=$query"ROUND(SUM(fNumExcEvts)/SUM("$ontime")*3600,2) AS excrate, "
+   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600, 2) AS excrateerr, "
+   query=$query"ROUND(SUM(fNumExcEvts*"$corr")/SUM("$ontime")*3600,2) as corexcrate, " # put here correction factor
+   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600*SUM(fNumExcEvts)/SUM(fNumExcEvts*"$corr"), 2) AS corexcrateerr, " # correctionfactor = exc / exc_cor, put here correction factor
+   query=$query"ROUND(LiMa(SUM(fNumSigEvts), SUM(fNumBgEvts)),2) AS signif, "
+   query=$query"ROUND(SUM(fNumExcEvts)/SUM("$ontime")*3600/"$cu",2) AS cu, " # make value time dependent
+   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600/"$cu", 2) AS cuerr, " # make value time dependent
+   query=$query"ROUND(SUM(fNumExcEvts*"$corr")/SUM("$ontime")*3600/"$cu",2) as corcu, " # make value time dependent # put here correction factor
+   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600*SUM(fNumExcEvts)/SUM(fNumExcEvts*"$corr")/"$cu", 2) AS corcuerr, " # correctionfactor = exc / exc_cor # make value time dependent # put here correction factor
    query=$query"MIN(fZenithDistanceMin) as zdmin, MAX(fZenithDistanceMax) as zdmax, "
    query=$query"MIN("$threshold") as thmin, MAX("$threshold") as thmax "
@@ -117,18 +119,18 @@
    query=$query"MIN(o.n) AS night, MIN(o.run) AS runmin, MAX(o.run) AS runmax, "
    query=$query"MIN(o.start) AS start, MAX(o.stop) AS stop, "
-   query=$query"ROUND(SUM(o.ot)/60.,1) AS ontime, "
+   query=$query"ROUND(SUM(o.ot)/60.,2) AS ontime, "
    query=$query"SUM(o.sig) AS sig, SUM(o.bg) AS bg, "
-   query=$query"ROUND(SUM(o.bg)/SUM(o.ot)*3600,1) AS bgrate, "
+   query=$query"ROUND(SUM(o.bg)/SUM(o.ot)*3600,2) AS bgrate, "
    query=$query"SUM(o.exc) AS exc, "
-   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg)), 1) AS excerr, "
-   query=$query"ROUND(SUM(o.exc)/SUM(o.ot)*3600,1) AS excrate, "
-   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600, 1) AS excrateerr, "
-   query=$query"ROUND(SUM(o.exccor)/SUM(o.ot)*3600,1) as corexcrate, "
-   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600*SUM(o.exc)/SUM(o.exccor), 1) AS corexcrateerr, " # correctionfactor = exc / exc_cor
-   query=$query"ROUND(LiMa(SUM(o.sig), SUM(o.bg)),1) AS signif, "
-   query=$query"ROUND(SUM(o.exc)/SUM(o.ot)*3600/o.cu,1) AS cu, "
-   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600/o.cu, 1) AS cuerr, "
-   query=$query"ROUND(SUM(o.exccor)/SUM(o.ot)*3600/o.cu,1) as corcu, "
-   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600*SUM(o.exc)/SUM(o.exccor)/o.cu, 1) AS corcuerr, " # correctionfactor = exc / exc_cor
+   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg)), 2) AS excerr, "
+   query=$query"ROUND(SUM(o.exc)/SUM(o.ot)*3600,2) AS excrate, "
+   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600, 2) AS excrateerr, "
+   query=$query"ROUND(SUM(o.exccor)/SUM(o.ot)*3600,2) as corexcrate, "
+   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600*SUM(o.exc)/SUM(o.exccor), 2) AS corexcrateerr, " # correctionfactor = exc / exc_cor
+   query=$query"ROUND(LiMa(SUM(o.sig), SUM(o.bg)),2) AS signif, "
+   query=$query"ROUND(SUM(o.exc)/SUM(o.ot)*3600/AVG(o.cu),2) AS cu, "
+   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600/Avg(o.cu), 2) AS cuerr, "
+   query=$query"ROUND(SUM(o.exccor)/SUM(o.ot)*3600/Avg(o.cu),2) as corcu, "
+   query=$query"ROUND(ExcErr(SUM(o.sig), SUM(o.bg))/SUM(o.ot)*3600*SUM(o.exc)/SUM(o.exccor)/Avg(o.cu), 2) AS corcuerr, " # correctionfactor = exc / exc_cor
    query=$query"MIN(o.zdmin) as zdmin, MAX(o.zdmax) as zdmax, "
    query=$query"MIN(o.th) as thmin, MAX(o.th) as thmax "
@@ -283,4 +285,5 @@
 {
    oldexc=0
+   oldnightlyexc=0
    exc=0
    excold=0
@@ -320,4 +323,5 @@
 
       # fast rise/decay trigger
+      #  this trigger type currently doesn't handle nightly binning
       if [ $triggertype -eq 3 ]
       then
@@ -409,6 +413,10 @@
             then 
                oldnightlyexc=`grep "corr. cu:      [0-9].[0-9] " ${changedfiles[@]} | grep -o -E ' [0-9].[0-9] ' | sort | tail -1`
+               if [ "$oldnightlyexc" = "" ]
+               then
+                  oldnightlyexc=-1000
+               fi
                trigger2=`echo " $exc > $oldnightlyexc " | bc -l`
-               echo "trigger2: "$trigger2" (exc: "$exc", oldexc: "$oldnightlyexc")"
+               #echo "trigger2: "$trigger2" (exc: "$exc", oldexc: "$oldnightlyexc")"
                echo "trigger2: "$trigger2" (exc: "$exc", oldexc: "$oldnightlyexc")" >> $logfile
             fi
@@ -504,5 +512,5 @@
          if ! [ -e $donetriggerfile ] 
          then 
-            query="INSERT FlareAlerts.FlareTriggers SET fTriggerInserted=Now(), fNight="$night", fRunID="$runid", fTriggerType="$triggertype
+            query="INSERT FlareAlerts.FlareTriggers SET fTriggerInserted=Now(), fNight="$night", fRunID="$runid", fTriggerType="$triggertype", fSourceKey="$sourcekey
             if [ "$bin" = "" ]
             then
@@ -532,5 +540,5 @@
                echo "sending["$triggertype"] "$triggerfile
                echo "sending["$triggertype"] "$triggerfile >> $logfile
-               cat $triggerfile | mail -s 'test flare alert ' -b $emailfrom -r $emailfrom $emailto
+               cat $triggerfile | mail -s 'flare alert' -b $emailfrom -r $emailfrom $emailto
                #cat $triggerfile | mail -s "test flare alert for $sourcename " $emailto
                # that's also the cases for making a call
@@ -551,7 +559,7 @@
 {
    # query average flux from DB
-   query="SELECT ROUND(SUM(fNumExcEvts)/SUM("$ontime")*3600,1) as excrate,  "
-   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600, 1) AS excerr, "
-   query=$query"ROUND(SUM("$ontime")/3600.,1) AS ontime "
+   query="SELECT ROUND(SUM(fNumExcEvts)/SUM("$ontime")*3600,2) as excrate,  "
+   query=$query"ROUND(ExcErr(SUM(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontime")*3600, 2) AS excerr, "
+   query=$query"ROUND(SUM("$ontime")/3600.,2) AS ontime "
    query=$query"FROM AnalysisResultsRunLP "
    query=$query"LEFT JOIN RunInfo USING (fNight, fRunID) "
@@ -645,5 +653,5 @@
    then 
       siglimit=3.0
-      exclimit=2.0 # cu
+      exclimit=1.5 # cu
       printprocesslog "INFO checking for [Trigger to MAGIC 501 proposal]" >> $logfile
       echo "[Trigger to MAGIC 501 proposal]" >> $logfile
@@ -655,5 +663,5 @@
       evaluate_result
       # 20 min binning
-      bin=20
+      bin=30
       echo " "$bin" min binning..." >> $logfile
       get_query_minute_binning $bin