Changeset 19029 for trunk

Timestamp:

06/26/18 23:50:49 (6 years ago)

Author:

Daniela Dorner

Message:

some cleanup

File:

• trunk/DataCheck/Tools/get_data.sh (modified) (9 diffs)

trunk/DataCheck/Tools/get_data.sh

@@ -1 +1 @@
 #!/bin/bash
 
-# add: 
-# - fkt f dch value? 
-# - function for correction factor
-# - x-day binning
-# < 20121212 data
-# zd, th for internal
-
-# todo: check cu-factor for <20121212)
-
-# comparison: 
-#  function with select/table: 18.4 sec
-#  function with if: 5.7 sec
-# function with if: 
-#  vorteil: schneller
-#  nachteil: keine history
-#  nachteil: es braucht 2 fkt (qla, isdc)
-
-# create function CU(night int, ana tinyint) returns double(4,1) deterministic begin declare cu double; set cu=0; select fCU into cu from CU where fValid=1 and fAnalysis=ana and fNight<night order by fNight desc limit 0,1; return cu; end $$
-
-# floor((mjd(timestamp)-mjd(startnight)+0.5)/numdays)
-# floor((mjd(timestamp)-mjd(startnight)-0.5)/numdays)
-
+# todo
+# - update function for correction
+# - update CU for QLA
+# - add CU for ISDC analysis
+# - add zd, th for internal
+# - add < 20121212 data for QLA
+# - check crab flux
+# - add E2dNdE?
 
 function get_results()
@@ -51 +37 @@
    crabflux="3.37"
    fluxprec=2
-#   crabflux="2.8e-11"
-#   crabflux="3.9e-11"
-   # range of crab fluxes: 
-   # Dortmund: 2.8e-11
-   # HESS: 3.37e-11
-   # HAWC: 3.01e-11
-   # Wue: 3.39e-11 - 3.9e-11 (ISDC analysis)
-   # 15-20% difference
    
    case $timeunit in
@@ -128 +106 @@
    flux2="$cu2*"$crabflux
    fluxerr2="$cuerr2*"$crabflux
-   
-# order information such that it is easily readable by tgraph
-# tgraph: X, Y 
-# tgraph errors: X, Y, EX, EY
 
 # internal 
@@ -148 +122 @@
 # 
 # 
-# exter nal
+# external
 # --------
 # time, delta time, start, stop
@@ -175 +149 @@
       queryint=$queryint" "$numsig" as numsig, "
       queryint=$queryint" "$numbg" as numbg "
-      #queryint=$queryint" now() as now "
       
       queryext="SELECT "
@@ -189 +162 @@
       queryext=$queryext" round("$correxcrateerr", 1) as correxcrateerr, round($fluxerr, "$fluxprec") as fluxerr, "
       queryext=$queryext" round("$significance", 1) as significance "
-      #queryext=$queryext" now() as now "
       
       querybase=$from$where
-      #if [ $bin -eq -1 ]
-      #then
-      #   querybase=$querybase" GROUP BY fNight "
-      #fi
-      #querybase=$querybase" GROUP BY FLOOR((Mjd(fRunStart)-Mjd("$nightmin")-0.5)/"`echo $bin | sed -e 's/-//'`".)"
       querybase=$querybase" GROUP BY num "
-      #echo "-----------------"$querybase
       if [ "$ontimelimit" = "" ]
       then 
-         querybase=$querybase" HAVING SUM("$ontimeif")>1200 AND NOT SUM(fNumBgEvts)=SUM(fNumSigEvts) ORDER BY num " # 20 min
+         querybase=$querybase" HAVING SUM("$ontimeif")>1200 ORDER BY num " # 20 min
       else
-         querybase=$querybase" HAVING SUM("$ontimeif")>"$ontimelimit" AND NOT SUM(fNumBgEvts)=SUM(fNumSigEvts) ORDER BY num "
+         querybase=$querybase" HAVING SUM("$ontimeif")>"$ontimelimit" ORDER BY num "
       fi
       
@@ -221 +187 @@
       queryint=$queryint" "$numsig2" as numsig, "
       queryint=$queryint" "$numbg2" as numbg "
-      #queryint=$queryint" now() as now "
       
       queryext="SELECT "
@@ -229 +194 @@
       queryext=$queryext" round("$correxcrateerr2", 1) as correxcrateerr, round("$fluxerr2", "$fluxprec") as fluxerr, "
       queryext=$queryext" round("$significance2", 1) as significance "
-      #queryext=$queryext" now() as now "
       
       querybase=" FROM (SELECT fNight, @ot:="$ontimeif" AS ot, fRunStart AS start, fRunStop AS stop, fNumSigEvts AS sigevts, fNumBgEvts AS bgevts, "
@@ -236 +200 @@
       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$from" CROSS JOIN (SELECT @night :=0, @ot :=0, @os :=0, @bl:=0) PARAMS "
-      querybase=$querybase$where" ORDER BY fRunStart) o GROUP BY block HAVING NOT sum(o.bgevts)=sum(o.sigevts) AND ontime>0.75*"$bin
-      # AND NOT SUM(fNumBgEvts)=SUM(fNumSigEvts)
+      querybase=$querybase$where" ORDER BY fRunStart) o GROUP BY block HAVING ontime>0.75*"$bin
       
       queryint=$queryint" "$querybase" order by 'time'"