Index: trunk/DataCheck/QuickLook/FlareAlerts.sh
===================================================================
--- trunk/DataCheck/QuickLook/FlareAlerts.sh	(revision 18895)
+++ trunk/DataCheck/QuickLook/FlareAlerts.sh	(revision 18906)
@@ -3,8 +3,8 @@
 
 # missing: 
-# implement DB-entries for being called
+# finalize DB-entries for being called
 # prepare directly template for email
-# use current value for CU in triggers
-# add note for values > 70 evts/h for X-ray triggers
+# add x-ray trigger as trigger type or 
+#    add note for values > 70 evts/h for X-ray triggers
 #
 # add more information: 
@@ -67,8 +67,8 @@
 ontime="IF(ISNULL(fEffectiveOn), fOnTimeAfterCuts, TIME_TO_SEC(TIMEDIFF(fRunStop,fRunStart))*fEffectiveOn)"
 threshold="IF (ISNULL(fThresholdMinSet), fThresholdMedian, fThresholdMinSet)"
-cu="20.0"
+#cu="20.0"
+cu="CUQLA(fNight)"
 corr="1"
 # missing: corrected excessrates
-# missing: time-dependent CU
 
 
@@ -359,14 +359,18 @@
          1)   #echo "std trigger: criteria ( $exc >= $exclimit && $sig >= $siglimit && $higher )"
               trigger=`echo " $exc >= $exclimit && $sig >= $siglimit && $higher " | bc -l`
+              limits=$exclimit"_"$siglimit
               ;;
          2)   #echo "magic 501: criteria ( $exc >= $exclimit && $sig >= $siglimit && $higher )"
               trigger=`echo " $exc >= $exclimit && $sig >= $siglimit && $higher " | bc -l`
+              limits=$exclimit"_"$siglimit
               ;;
          3)   #echo "magic fast rise/decay"
               #trigger=`echo " $slope >= $slopelimit && $slopeprev >= $slopelimit && $slope60 >= $slopelimit && $sig >= $siglimit " | bc -l`
               trigger=`echo " ( ( $slope >= $slopelimit && $slopeprev >= $slopelimit && $slope60 >= $slopelimit ) || ( - $slope >= $slopelimit && - $slopeprev >= $slopelimit && - $slope60 >= $slopelimit  ) ) && $sig >= $siglimit " | bc -l`
+              limits=$slopelimit"_"$siglimit
               ;;
-         4)   #echo "std trigger: criteria ( $exc >= $exclimit && $sig >= $siglimit && $higher )"
+         5)   #echo "std trigger: criteria ( $exc >= $exclimit && $sig >= $siglimit && $higher )"
               trigger=`echo " $exc >= $exclimit && $sig >= $siglimit && $higher " | bc -l`
+              limits=$exclimit"_"$siglimit
               ;;
          *)   echo $triggertype" not yet implemented" >> $logfile
@@ -389,27 +393,43 @@
             # or check value if it's increasing? 
             # missing: get information from previous trigger + interpret
-            triggerfile=$flarealertspath"/"$night"-"$exclimit"_"$siglimit"-source"$sourcekey".trigger"$triggertype
+            triggerfile=$flarealertspath"/"$night"-"$limits"-source"$sourcekey".trigger"$triggertype
          else
             # smaller binning: check if trigger is identical
-            triggerfile=$flarealertspath"/"$night"_"`printf %03d $runid`"-"$exclimit"_"$siglimit"-source"$sourcekey".trigger"$triggertype
-            donetriggerfile=$triggerfile".done"
-            #ls $donetriggerfile
-            # write new file only if old files do not agree
-            if [ "$donetriggerfile" != "" ] && [ -e $donetriggerfile ]
+            triggerfile=$flarealertspath"/"$night"_"`printf %03d $runid`"-"$limits"-source"$sourcekey".trigger"$triggertype
+         fi
+         donetriggerfile=$triggerfile".done"
+         #ls $donetriggerfile
+
+         # check if nightly flux increased
+         if [ "$bin" = "" ]
+         then 
+            trigger2=1
+            changedfiles=( `ls $donetriggerfile"-changed-"* 2>/dev/null` )
+            if [ ${#changedfiles[@]} -gt 0 ]
+            then 
+               oldnightlyexc=`grep "corr. cu:      [0-9].[0-9] " ${changedfiles[@]} | grep -o -E ' [0-9].[0-9] ' | sort | tail -1`
+               trigger2=`echo " $exc > $oldnightlyexc " | bc -l`
+               echo "trigger2: "$trigger2" (exc: "$exc", oldexc: "$oldnightlyexc")"
+               echo "trigger2: "$trigger2" (exc: "$exc", oldexc: "$oldnightlyexc")" >> $logfile
+            fi
+         fi
+         
+         # write new file only if old files do not agree
+         if [ -e $donetriggerfile ]
+         then
+            diff $donetriggerfile $triggerfile >/dev/null
+            checkstatus=`echo $?`
+            if [ $checkstatus -eq 0 ]
             then
-               diff $donetriggerfile $triggerfile >/dev/null
-               checkstatus=`echo $?`
-               if [ $checkstatus -eq 0 ]
-               then
-                  echo "  alert already done "$donetriggerfile >> $logfile
-                  i=`echo $i +1 | bc -l`
-                  continue
-               fi
+               echo "  alert already done "$donetriggerfile >> $logfile
+               i=`echo $i +1 | bc -l`
+               continue
             fi
-            if [ -e $triggerfile ]
-            then
-               mv $triggerfile $donetriggerfile
-            fi
-         fi
+         fi
+         if [ -e $triggerfile ]
+         then
+            mv $triggerfile $donetriggerfile
+         fi
+         
          #echo $night"_"$runid" "$sourcekey" -> "$triggerfile
          echo "  writing "$triggerfile >> $logfile
@@ -418,5 +438,5 @@
          echo "-------------- " >> $triggerfile
          echo "  type: "$triggertype >> $triggerfile
-         echo "  excess limit: "$exclimit" evts/h" >> $triggerfile
+         echo "  excess limit: "$exclimit" CU" >> $triggerfile
          echo "  significance limit: "$siglimit" sigma" >> $triggerfile
          if [ "$bin" = "" ]   
@@ -468,5 +488,5 @@
          fi
          
-         if [ "$donetriggerfile" != "" ] && [ -e $donetriggerfile ]
+         if [ -e $donetriggerfile ]
          then
             diff $donetriggerfile $triggerfile >/dev/null
@@ -482,8 +502,18 @@
          
          # send email only of $donetriggerfile doesn't exists
-         if ! [ -e $donetriggerfile ]
+         if ! [ -e $donetriggerfile ] 
          then 
+            query="INSERT FlareAlerts.FlareTriggers SET fTriggerInserted=Now(), fNight="$night", fRunID="$runid", fTriggerType="$triggertype
+            if [ "$bin" = "" ]
+            then
+               query=$query", fBinning=NULL"
+            else
+               query=$query", fBinning="$bin
+            fi
+            echo $query
+            sendquery >> $logfile
+            
             # AMON case: create VOEvent-File
-            if [ $triggertype -eq 4 ]
+            if [ $triggertype -eq 5 ]
             then
                voeventfile=$voeventpath"/"`basename $triggerfile`".xml"
@@ -495,13 +525,17 @@
                print_voevent_file > $voeventfile
                # in amon-case no email needs to be sent
-               continue
+            else
+               if [ "$bin" = "" ] && [ $trigger2 -eq 0 ]
+               then
+                  continue
+               fi
+               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 "test flare alert for $sourcename " $emailto
+               # that's also the cases for making a call
+               # fill DB for shifthelper
             fi
-
-            cat $triggerfile | mail -s 'test flare alert ' -b $emailfrom -r $emailfrom $emailto
-         fi
-         
-         #cat $triggerfile | mail -s "test flare alert for $sourcename " $emailto
-         # that's also the cases for making a call
-         
+         fi
       fi
 
@@ -570,5 +604,5 @@
    printprocesslog "INFO Evaluation for $sourcename ... "
    echo "Evaluation for $sourcename ... " >> $logfile
-   echo " average fluxes: "$avgfluxmonth"+-"$errormonth" "$avgfluxyear"+-"$erroryear" "$avgflux"+-"$error >> $logfile
+   echo " average fluxes: "$avgfluxmonth"+-"$errormonth" evts/h (last month) "$avgfluxyear"+-"$erroryear" evts/h (last year) "$avgflux"+-"$error" evts/h (all)" >> $logfile
    
    # missing: get limits from DB (structure needs to be defined)
@@ -649,6 +683,10 @@
    fi
    
+   # X-ray ToO
+   triggertype=4
+   # to be added
+   
    # AMON - automatic triggers using VOEvent files
-   triggertype=4
+   triggertype=5
    printprocesslog "INFO checking for [Trigger to AMON]" >> $logfile
    echo "[Trigger to AMON]" >> $logfile