Changeset 19569

Timestamp:

07/26/19 21:43:32 (5 years ago)

Author:

Daniela Dorner

Message:

fixed bug, added uncorrect flux to internal files

File:

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

trunk/DataCheck/Tools/get_data.sh

@@ -49 +49 @@
 # --------
 # time: time, delta time, start, stop, ontime
-# flux: excrate, excerr, CU, CUerr,  corrate, corerr, CUcor CUcorerr, fluxcor, fluxcorerr, 
+# flux: excrate, excerr, CU, CUerr, flux, fluxerr corrate, corerr, CUcor CUcorerr, fluxcor, fluxcorerr, 
 # other info on flux: signif, cu-factor, num exc, num sig, num bg
 # other info: zd th R750cor R750ref
@@ -231 +231 @@
    cu=" ROUND("$CU", 2) AS cu"
    cuerr=" ROUND("$CUerr", 2) AS cuerr"
-   cucor=" ROUND("$CUcor", 2) AS cu"
-   cucorerr=" ROUND("$CUcorerr", 2) AS cuerr"
+   cucor=" ROUND("$CUcor", 2) AS cucor"
+   cucorerr=" ROUND("$CUcorerr", 2) AS cucorerr"
    flux="ROUND("$CU" * "$crabflux", 2) AS flux"
    fluxerr="ROUND("$CUerr" * "$crabflux", 2) AS fluxerr"
+   fluxcor="ROUND("$CUcor" * "$crabflux", 2) AS fluxcor"
+   fluxcorerr="ROUND("$CUcorerr" * "$crabflux", 2) AS fluxcorerr"
    # for minute binning
    ontime2=" ROUND(SUM(o.ot)/60., 1) AS ontime"
@@ -247 +249 @@
    cu2=" ROUND("$CU2", 2) AS cu"
    cuerr2=" ROUND("$CUerr2", 2) AS cuerr"
-   cucor2=" ROUND("$CUcor2", 2) AS cu"
-   cucorerr2=" ROUND("$CUcorerr2", 2) AS cuerr"
+   cucor2=" ROUND("$CUcor2", 2) AS cucor"
+   cucorerr2=" ROUND("$CUcorerr2", 2) AS cucorerr"
    flux2="ROUND("$CU2" * "$crabflux", "$fluxprec") AS flux"
    fluxerr2="ROUND("$CUerr2" *"$crabflux", "$fluxprec") AS fluxerr"
+   fluxcor2="ROUND("$CUcor2" * "$crabflux", "$fluxprec") AS fluxcor"
+   fluxcorerr2="ROUND("$CUcorerr2" *"$crabflux", "$fluxprec") AS fluxcorerr"
 
    case $timeunit in
@@ -373 +377 @@
       # internal
       queryint=$querystart
-      queryint=$queryint" "$excrate", "$cu", "$correxcrate", "$cucor", "$flux", "
+      queryint=$queryint" "$excrate", "$cu", "$flux", "$correxcrate", "$cucor", "$fluxcor", "
       queryint=$queryint" "$deltat", "$ontime", "
-      queryint=$queryint" "$excrateerr", "$cuerr", "$correxcrateerr", "$cucorerr", "$fluxerr", "
+      queryint=$queryint" "$excrateerr", "$cuerr", "$fluxerr", "$correxcrateerr", "$cucorerr", "$fluxcorerr", "
       queryint=$queryint" "$significance", "
       queryint=$queryint" MIN(fNight) AS nightmin, MAX(fNight) AS nightmax, "
@@ -386 +390 @@
       # for collaborators
       querycol=$querystart
-      querycol=$querycol" "$excrate", "$correxcrate", "$cucor", "$flux", "
+      querycol=$querycol" "$excrate", "$correxcrate", "$cucor", "$fluxcor", "
       querycol=$querycol" "$deltat", "$ontime", "
-      querycol=$querycol" "$excrateerr", "$correxcrateerr", "$cucorerr", "$fluxerr", "
+      querycol=$querycol" "$excrateerr", "$correxcrateerr", "$cucorerr", "$fluxcorerr", "
       querycol=$querycol" "$significance
       querycol=$querycol" "$querybase" "$querydch" "$queryend
@@ -413 +417 @@
       # internal
       queryint=$querystart
-      queryint=$queryint" "$excrate2", "$cu2", "$correxcrate2", "$cucor2", "$flux2", "
+      queryint=$queryint" "$excrate2", "$cu2", "$flux2", "$correxcrate2", "$cucor2", "$fluxcor2", "
       queryint=$queryint" "$deltat2", "$ontime2", "
-      queryint=$queryint" "$excrateerr2", "$cuerr2", "$correxcrateerr2", "$cucorerr2", "$fluxerr2", "
+      queryint=$queryint" "$excrateerr2", "$cuerr2", "$fluxerr2", "$correxcrateerr2", "$cucorerr2", "$fluxcorerr2", "
       queryint=$queryint" "$significance2", "
       queryint=$queryint" avg(o.night) AS night, "
@@ -425 +429 @@
       # for collaborators
       querycol=$querystart
-      querycol=$querycol" "$excrate2", "$correxcrate2", "$cu2", "$flux2", "
+      querycol=$querycol" "$excrate2", "$correxcrate2", "$cu2", "$fluxcor2", "
       querycol=$querycol" "$deltat2", "$ontime2", "
-      querycol=$querycol" "$excrateerr2", "$correxcrateerr2", "$cuerr2", "$fluxerr2", "
+      querycol=$querycol" "$excrateerr2", "$correxcrateerr2", "$cuerr2", "$fluxcorerr2", "
       querycol=$querycol" "$significance2
       querycol=$querycol" "$querybase
@@ -475 +479 @@
    echo "# $queryint" >> $fileint
    echo "#" >> $fileint
-   headerint="# time["$timeunit"] start["$timeunit"] stop["$timeunit"] excess-rate[evts/h] flux[CU] corrected_excess-rate[evts/h] corrected_flux[CU] corrected_flux[e-11/cm2/s] (stop-start)/2["$timeunit"] ontime[min]"
-   headerint=$headerint" excess-rate_error[evts/h] flux_error[CU] corrected_excess-rate_error[evts/h] corrected_flux_error[CU] corrected_flux_error[e-11/cm2/s] significance night num_exc num_sig num_bg "
+   headerint="# time["$timeunit"] start["$timeunit"] stop["$timeunit"] excess-rate[evts/h] flux[CU] flux[e-11TeV/cm2/s] corrected_excess-rate[evts/h] corrected_flux[CU] corrected_flux[e-11TeV/cm2/s] (stop-start)/2["$timeunit"] ontime[min]"
+   headerint=$headerint" excess-rate_error[evts/h] flux_error[CU] flux_error[e-11TeV/cm2/s] corrected_excess-rate_error[evts/h] corrected_flux_error[CU] corrected_flux_error[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
@@ -498 +502 @@
    #echo "# $querycol" >> $filecol
    #echo "#" >> $filecol
-   headercol="# time["$timeunit"] start["$timeunit"] stop["$timeunit"] excess-rate[evts/h] corrected_excess-rate[evts/h] corrected_flux[CU] corrected_flux[e-11/cm2/s] (stop-start)/2["$timeunit"] ontime[min]"
-   headercol=$headercol" excess-rate_error[evts/h] corrected_excess-rate_error[evts/h] corrected_flux_error[CU] corrected_flux_error[e-11/cm2/s] significance "
+   headercol="# time["$timeunit"] start["$timeunit"] stop["$timeunit"] excess-rate[evts/h] corrected_excess-rate[evts/h] corrected_flux[CU] corrected_flux[e-11TeV/cm2/s] (stop-start)/2["$timeunit"] ontime[min]"
+   headercol=$headercol" excess-rate_error[evts/h] corrected_excess-rate_error[evts/h] corrected_flux_error[CU] corrected_flux_error[e-11TeV/cm2/s] significance "
    echo $headercol >> $filecol
    #echo "$querycol"
@@ -651 +655 @@
 # -------------------------------------------------------------------------------------- #
 
+# some test
+table="AnalysisResultsRunCutsLC" # CutsLC
+bin=0
 # Mrk 501
+source=2
+name="Mrk501_all_P"
+get_results
+
+#exit
+
+# LC for ICRC
+table="AnalysisResultsRunCutsLC" # CutsLC
+bin=-1
+# Mrk 421
+source=1
+name="Mrk421_all_nightly"
+get_results
+# Mrk 501
+source=2
+name="Mrk501_all_nightly"
+get_results
+# 1959
+source=7
+name="1959_all_nightly"
+get_results
+
+# 2344
+source=3
+name="2344_all_nightly"
+get_results
+
+# Crab
+source=5
+name="Crab_all_nightly"
+get_results
+
+
+#exit
+
 # Mrk 501
 source=2
@@ -676 +718 @@
 bin=5
 get_results
-
-exit
-
-# LC for ICRC
-table="AnalysisResultsRunCutsLC" # CutsLC
-bin=-1
-# Mrk 421
-source=1
-name="Mrk421_all_nightly"
-get_results
-# Mrk 501
-source=2
-name="Mrk501_all_nightly"
-get_results
-# 1959
-source=7
-name="1959_all_nightly"
-get_results
-
 
 exit