Index: trunk/DataCheck/Tools/get_data.sh
===================================================================
--- trunk/DataCheck/Tools/get_data.sh	(revision 19036)
+++ trunk/DataCheck/Tools/get_data.sh	(revision 19037)
@@ -35,4 +35,6 @@
 # ToDo (notes DD): 
 # ----------------
+# - use get_data.sh for download*.php instead of Send_Data*.sh
+#   -> add policy 
 # - update function for correction
 # - update CU for QLA
@@ -42,6 +44,4 @@
 # - add E2dNdE?
 # - functionality to determine start time for seaon-binning
-# - can get_data.sh / Send_Data*.sh be combined? 
-#   get_data.sh should be able to run stand-alone and be kept simple for any user
 
 #
@@ -98,12 +98,12 @@
    # conversion to CU (determined by DD for QLA)
    # https://www.fact-project.org/logbook/showthread.php?tid=4927
-   cufactor=" Avg(CUQLA(fNight)) "
+   cufactor="CUQLA(fNight)" # missing: ISDC analysis
    # some calculations
    excerr="ExcErr(Sum(fNumSigEvts), SUM(fNumBgEvts))"
-   CU="SUM("$correvts"/CUQLA(fNight))/SUM("$ontimeif")*3600"
-   CUerr=$excerr"/SUM("$ontimeif")*3600*SUM("$correvts"/CUQLA(fNight))/SUM(fNumExcEvts)"
+   CU="SUM("$correvts"/"$cufactor")/SUM("$ontimeif")*3600"
+   CUerr=$excerr"/SUM("$ontimeif")*3600*SUM("$correvts"/"$cufactor")/SUM(fNumExcEvts)"
    excerr2="ExcErr(SUM(o.sigevts),SUM(o.bgevts))"
-   CU2="SUM(o.corevts/o.cu)/SUM(o.ot)*3600"
-   CUerr2=$excerr2"/SUM(o.ot)*3600*SUM(o.corevts/o.cu)/(SUM(o.sigevts)-SUM(o.bgevts))"
+   CU2="SUM(o.corevts/o.cufactor)/SUM(o.ot)*3600"
+   CUerr2=$excerr2"/SUM(o.ot)*3600*SUM(o.corevts/o.cufactor)/(SUM(o.sigevts)-SUM(o.bgevts))"
    
    # columns to be selected
@@ -138,9 +138,9 @@
 
    case $timeunit in
-      mjd)  delta="(Mjd(MAX(fRunStop))-Mjd(Min(fRunStart)))/2"
-            start=" Mjd(Min(fRunStart)) AS start"
+      mjd)  delta="(Mjd(MAX(fRunStop))-Mjd(MIN(fRunStart)))/2"
+            start=" Mjd(MIN(fRunStart)) AS start"
             stop=" Mjd(MAX(fRunStop)) AS stop"
             deltat=$delta" AS deltat"
-            time=" Mjd(Min(fRunStart))+"$delta" AS time"
+            time=" Mjd(MIN(fRunStart))+"$delta" AS time"
             delta2="(Mjd(MAX(o.stop))-Mjd(MIN(o.start)))/2"
             start2=" Mjd(MIN(o.start)) AS start"
@@ -149,25 +149,25 @@
             time2=" Mjd(MIN(o.start))+"$delta2" AS time"
             ;;
-      unix) delta="(Unix_timestamp(CONVERT_TZ(Max(fRunStop), '+00:00', 'SYSTEM')) - Unix_timestamp(CONVERT_TZ(Min(fRunStart), '+00:00', 'SYSTEM')))/2"
-            start="Unix_timestamp(CONVERT_TZ(Min(fRunStart), '+00:00', 'SYSTEM')) AS start"
-            stop="Unix_timestamp(CONVERT_TZ(Max(fRunStop), '+00:00', 'SYSTEM')) AS stop"
+      unix) delta="(Unix_timestamp(CONVERT_TZ(MAX(fRunStop), '+00:00', 'SYSTEM')) - Unix_timestamp(CONVERT_TZ(MIN(fRunStart), '+00:00', 'SYSTEM')))/2"
+            start="Unix_timestamp(CONVERT_TZ(MIN(fRunStart), '+00:00', 'SYSTEM')) AS start"
+            stop="Unix_timestamp(CONVERT_TZ(MAX(fRunStop), '+00:00', 'SYSTEM')) AS stop"
             deltat=$delta" AS deltat"
-            time=" Unix_timestamp(CONVERT_TZ(Min(fRunStart), '+00:00', 'SYSTEM'))+"$delta" AS time"
-            delta2="(Unix_timestamp(CONVERT_TZ(Max(o.stop), '+00:00', 'SYSTEM')) - Unix_timestamp(CONVERT_TZ(Min(o.start), '+00:00', 'SYSTEM')))/2"
+            time=" Unix_timestamp(CONVERT_TZ(MIN(fRunStart), '+00:00', 'SYSTEM'))+"$delta" AS time"
+            delta2="(Unix_timestamp(CONVERT_TZ(MAX(o.stop), '+00:00', 'SYSTEM')) - Unix_timestamp(CONVERT_TZ(MIN(o.start), '+00:00', 'SYSTEM')))/2"
             startstop2=" Unix_timestamp(CONVERT_TZ(MIN(o.start), '+00:00', 'SYSTEM')) AS start"
             startstop2=$starstop2" Unix_timestamp(CONVERT_TZ(MAX(o.stop), '+00:00', 'SYSTEM')) AS stop"
             deltat2=$delta2" AS deltat"
-            time2=" Unix_timestamp(CONVERT_TZ(Min(o.start), '+00:00', 'SYSTEM'))+"$delta2" AS time"
+            time2=" Unix_timestamp(CONVERT_TZ(MIN(o.start), '+00:00', 'SYSTEM'))+"$delta2" AS time"
             ;;
-      *)    delta="sec_to_time(time_to_sec(timediff(MAX(fRunStop), Min(fRunStart)))/2)"
+      *)    delta="sec_to_time(time_to_sec(timediff(MAX(fRunStop), MIN(fRunStart)))/2)"
             start=" MIN(fRunStart) AS start"
             stop=" MAX(fRunStop) AS stop"
             deltat=$delta" AS deltat"
-            time=" addtime(Min(fRunStart), "$delta") AS time"
-            delta2="sec_to_time(time_to_sec(timediff(MAX(o.stop), Min(o.start)))/2)"
+            time=" addtime(MIN(fRunStart), "$delta") AS time"
+            delta2="sec_to_time(time_to_sec(timediff(MAX(o.stop), MIN(o.start)))/2)"
             start2=" MIN(o.start) AS start"
             stop2=" MAX(o.stop) AS stop"
             deltat2=$delta" AS deltat"
-            time2=" addtime(Min(o.start), "$delta2") AS time"
+            time2=" addtime(MIN(o.start), "$delta2") AS time"
             ;;
    esac
@@ -222,8 +222,9 @@
       queryint=$queryint" "$excrateerr", "$correxcrateerr", "$cuerr", "$fluxerr", "
       queryint=$queryint" "$significance", "
-      queryint=$queryint" Min(fNight) AS nightmin, Max(fNight) AS nightmax, "
+      queryint=$queryint" MIN(fNight) AS nightmin, MAX(fNight) AS nightmax, "
       queryint=$queryint" "$numexc", "$numsig", "$numbg", "
-      queryint=$queryint" Min("$zenith"Min) AS zdmin, Max("$zenith"Max) AS zdmax, "
-      queryint=$queryint" Min("$thresh") AS thmin, Max("$thresh") AS thmax "
+      queryint=$queryint" MIN("$zenith"Min) AS zdmin, MAX("$zenith"Max) AS zdmax, "
+      queryint=$queryint" MIN("$thresh") AS thmin, MAX("$thresh") AS thmax, "
+      queryint=$queryint" ROUND(AVG("$cufactor"), 1) AS cufactor, ROUND(AVG(fR750Cor), 2) AS R750cor,  ROUND(AVG(fR750Ref), 2) AS R750ref "
       queryint=$queryint" "$querybase
       
@@ -247,13 +248,9 @@
       # final part of the query
       querybase=" FROM (SELECT fNight, fZenithDistanceMin AS zdmin, fZenithDistanceMax AS zdmax, "$thresh" AS th, "
-      querybase=$querybase" @ot:="$ontimeif" AS ot, fRunStart AS start, fRunStop AS stop, fNumSigEvts AS sigevts, fNumBgEvts AS bgevts, "
-      querybase=$querybase" "$correvts" AS corevts, CUQLA(fNight) AS cu, "
+      querybase=$querybase" fR750Cor as R750cor, fR750Ref as R750ref, "$cufactor" AS cufactor, "
+      querybase=$querybase" @ot:="$ontimeif" AS ot, fRunStart AS start, fRunStop AS stop, "
+      querybase=$querybase" fNumSigEvts AS sigevts, fNumBgEvts AS bgevts, "$correvts" AS corevts, "
       querybase=$querybase" IF (@night=fNight AND FLOOR((@os+@ot)/"$bin"./60.)<1, @bl, @bl := @bl + 1) AS block, "
       querybase=$querybase" IF (@night=fNight AND FLOOR((@os+@ot)/"$bin"./60.)<1, @os:=@os + @ot, @os := @ot) AS os, @night :=fNight AS night "
-#      querybase=$querybase" IF (@zdmin<fZenithDistanceMin, @zdmin:=@zdmin, @zdmin:=fZenithDistanceMin) as zdmin, "
-#      querybase=$querybase" IF (@zdmin>fZenithDistanceMax, @zdmax:=@zdmax, @zdmax:=fZenithDistanceMax) as zdmax, "
-#      querybase=$querybase" IF (@thmin<"$thresh", @thmin:=@thmin, @thmin:="$thresh") as thmin, "
-#      querybase=$querybase" IF (@thmax>"$thresh", @thmax:=@thmax, @thmax:="$thresh") as thmax, "
-#      querybase=$querybase" fZenithDistanceMin as zdmin, fZenithDistanceMax as zdmax, "$thresh" as thmin, "$thresh" as thmax "
       querybase=$querybase$from" CROSS JOIN (SELECT @night :=0, @ot :=0, @os :=0, @bl:=0) PARAMS "
       querybase=$querybase$where" ORDER BY fRunStart) o GROUP BY block HAVING ontime>0.75*"$bin" ORDER BY 'time'"
@@ -267,5 +264,6 @@
       queryint=$queryint" avg(o.night) AS night, "
       queryint=$queryint" "$numexc2", "$numsig2", "$numbg2", "
-      queryint=$queryint" Min(o.zdmin) AS zdmin, Max(o.zdmax) AS zdmax, Min(o.th) AS thmin, Max(o.th) AS thmax "
+      queryint=$queryint" MIN(o.zdmin) AS zdmin, MAX(o.zdmax) AS zdmax, MIN(o.th) AS thmin, MAX(o.th) AS thmax, "
+      queryint=$queryint" ROUND(AVG(o.cufactor), 1) AS cufactor, ROUND(AVG(o.R750cor), 2) AS R750cor,  ROUND(AVG(o.R750ref), 2) AS R750ref "
       queryint=$queryint" "$querybase
       
@@ -292,5 +290,6 @@
    fi
    headerint="# "$num" time["$timeunit"] start["$timeunit"] stop["$timeunit"] excrate[evts/h] corr.excrate[evts/h] flux[CU] flux[e-11/cm2/s] delta_time["$timeunit"] ontime[min]"
-   headerint=$headerint" excrate_err[evts/h] corr.excrate_err[evts/h] flux_err[CU] flux_err[e-11/cm2/s] significance night num_exc num_sig num_bg zdmin zdmax thmin thmax"
+   headerint=$headerint" excrate_err[evts/h] corr.excrate_err[evts/h] flux_err[CU] flux_err[e-11/cm2/s] significance night num_exc num_sig num_bg "
+   headerint=$headerint" zdmin zdmax thmin thmax avg(cufactor) avg(R750cor) avg(R750ref) "
    echo $headerint >> $fileint
    #echo "$queryint"