Index: trunk/DataCheck/Tools/get_data.sh
===================================================================
--- trunk/DataCheck/Tools/get_data.sh	(revision 19567)
+++ trunk/DataCheck/Tools/get_data.sh	(revision 19568)
@@ -49,5 +49,5 @@
 # --------
 # time: time, delta time, start, stop, ontime
-# flux: excrate, excerr, corrate, corerr, CU CUerr, flux, fluxerr, 
+# flux: excrate, excerr, CU, CUerr,  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
@@ -61,5 +61,5 @@
 # -------------
 # time: time, delta time, start, stop, ontime
-# flux: excrate, excerr, corrate, corerr, flux, flux-err, significance
+# flux: excrate, excerr, corrate, corerr, CUcor CUcorerr, fluxcor, fluxcorrerr, significance
 # 
 # additional information to put:
@@ -208,9 +208,13 @@
    # some calculations
    excerr="ExcErr(Sum(fNumSigEvts), SUM(fNumBgEvts))"
-   CU="SUM("$correvts"/"$cufactor")/SUM("$ontimeif")*3600"
-   CUerr=$excerr"/SUM("$ontimeif")*3600*SUM("$correvts"/"$cufactor")/SUM(fNumExcEvts)"
+   CU="SUM(fNumExcEvts/"$cufactor")/SUM("$ontimeif")*3600"
+   CUerr=$excerr"/SUM("$ontimeif")*3600*SUM(fNumExcEvts/"$cufactor")/SUM(fNumExcEvts)"
+   CUcor="SUM("$correvts"/"$cufactor")/SUM("$ontimeif")*3600"
+   CUcorerr=$excerr"/SUM("$ontimeif")*3600*SUM("$correvts"/"$cufactor")/SUM(fNumExcEvts)"
    excerr2="ExcErr(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))"
+   CU2="SUM((o.sigevts-o.bgevts)/o.cufactor)/SUM(o.ot)*3600"
+   CUerr2=$excerr2"/SUM(o.ot)*3600*SUM((o.sigevts-o.bgevts)/o.cufactor)/(SUM(o.sigevts)-SUM(o.bgevts))"
+   CUcor2="SUM(o.corevts/o.cufactor)/SUM(o.ot)*3600"
+   CUcorerr2=$excerr2"/SUM(o.ot)*3600*SUM(o.corevts/o.cufactor)/(SUM(o.sigevts)-SUM(o.bgevts))"
    
    # columns to be selected
@@ -227,4 +231,6 @@
    cu=" ROUND("$CU", 2) AS cu"
    cuerr=" ROUND("$CUerr", 2) AS cuerr"
+   cucor=" ROUND("$CUcor", 2) AS cu"
+   cucorerr=" ROUND("$CUcorerr", 2) AS cuerr"
    flux="ROUND("$CU" * "$crabflux", 2) AS flux"
    fluxerr="ROUND("$CUerr" * "$crabflux", 2) AS fluxerr"
@@ -241,4 +247,6 @@
    cu2=" ROUND("$CU2", 2) AS cu"
    cuerr2=" ROUND("$CUerr2", 2) AS cuerr"
+   cucor2=" ROUND("$CUcor2", 2) AS cu"
+   cucorerr2=" ROUND("$CUcorerr2", 2) AS cuerr"
    flux2="ROUND("$CU2" * "$crabflux", "$fluxprec") AS flux"
    fluxerr2="ROUND("$CUerr2" *"$crabflux", "$fluxprec") AS fluxerr"
@@ -365,7 +373,7 @@
       # internal
       queryint=$querystart
-      queryint=$queryint" "$excrate", "$correxcrate", "$cu", "$flux", "
+      queryint=$queryint" "$excrate", "$cu", "$correxcrate", "$cucor", "$flux", "
       queryint=$queryint" "$deltat", "$ontime", "
-      queryint=$queryint" "$excrateerr", "$correxcrateerr", "$cuerr", "$fluxerr", "
+      queryint=$queryint" "$excrateerr", "$cuerr", "$correxcrateerr", "$cucorerr", "$fluxerr", "
       queryint=$queryint" "$significance", "
       queryint=$queryint" MIN(fNight) AS nightmin, MAX(fNight) AS nightmax, "
@@ -378,7 +386,7 @@
       # for collaborators
       querycol=$querystart
-      querycol=$querycol" "$excrate", "$correxcrate", "$cu", "$flux", "
+      querycol=$querycol" "$excrate", "$correxcrate", "$cucor", "$flux", "
       querycol=$querycol" "$deltat", "$ontime", "
-      querycol=$querycol" "$excrateerr", "$correxcrateerr", "$cuerr", "$fluxerr", "
+      querycol=$querycol" "$excrateerr", "$correxcrateerr", "$cucorerr", "$fluxerr", "
       querycol=$querycol" "$significance
       querycol=$querycol" "$querybase" "$querydch" "$queryend
@@ -405,7 +413,7 @@
       # internal
       queryint=$querystart
-      queryint=$queryint" "$excrate2", "$correxcrate2", "$cu2", "$flux2", "
+      queryint=$queryint" "$excrate2", "$cu2", "$correxcrate2", "$cucor2", "$flux2", "
       queryint=$queryint" "$deltat2", "$ontime2", "
-      queryint=$queryint" "$excrateerr2", "$correxcrateerr2", "$cuerr2", "$fluxerr2", "
+      queryint=$queryint" "$excrateerr2", "$cuerr2", "$correxcrateerr2", "$cucorerr2", "$fluxerr2", "
       queryint=$queryint" "$significance2", "
       queryint=$queryint" avg(o.night) AS night, "
@@ -467,6 +475,6 @@
    echo "# $queryint" >> $fileint
    echo "#" >> $fileint
-   headerint="# time["$timeunit"] start["$timeunit"] stop["$timeunit"] excess-rate[evts/h] corrected_excess-rate[evts/h] flux[CU] flux[e-11/cm2/s] (stop-start)/2["$timeunit"] ontime[min]"
-   headerint=$headerint" excess-rate_error[evts/h] corrected_excess-rate_error[evts/h] flux_error[CU] 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] 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=$headerint" zdmin zdmax thmin thmax avg(cufactor) avg(R750cor) avg(R750ref) "
    echo $headerint >> $fileint
@@ -490,6 +498,6 @@
    #echo "# $querycol" >> $filecol
    #echo "#" >> $filecol
-   headercol="# time["$timeunit"] start["$timeunit"] stop["$timeunit"] excess-rate[evts/h] corrected_excess-rate[evts/h] flux[CU] flux[e-11/cm2/s] (stop-start)/2["$timeunit"] ontime[min]"
-   headercol=$headercol" excess-rate_error[evts/h] corrected_excess-rate_error[evts/h] flux_error[CU] 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-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 "
    echo $headercol >> $filecol
    #echo "$querycol"
@@ -643,172 +651,5 @@
 # -------------------------------------------------------------------------------------- #
 
-
-# LC for INTEGRAL Proposal
-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
-# for other INTEGRAL proposal
-# Mrk 421
-bin=0
-source=1
-name="Mrk421_all_period"
-get_results
-
-exit
-
-
-# Crab
-source=5
-nightmin=20121214
-nightmax=20180418
-table="AnalysisResultsRunCutsLC" # CutsLC
-bin=-1
-zdmax=30
-thmax=330
-name="testCrabnightlycheck"
-get_results
-
-exit
-
-# Crab
-source=5
-nightmin=20121214
-nightmax=20180418
-table="AnalysisResultsRunCutsLC" # CutsLC
-bin=20
-name="testCrab20min"
-get_results
-
-exit
-
-# Crab
-source=5
-nightmin=20121214
-nightmax=20180418
-table="AnalysisResultsRunCutsLC" # CutsLC
-bin=-1
-name="testCrabnightly"
-get_results
-
-exit
-
-# Crab
-source=5
-#nightmin=20121214
-#nightmax=20180418
-table="AnalysisResultsRunCutsLC" # CutsLC
-bin=-1
-name="testCraball"
-get_results
-
-exit
-
-
-# Crab
-source=5
-nightmin=20121214
-nightmax=20180418
-table="AnalysisResultsRunCutsLC" # CutsLC
-bin=60
-name="testCrab"
-get_results
-
-exit
-
-
-# Mrk 501
-source=2
-zdmax=90
-thmax=1500
-# new analysis
-table="AnalysisResultsRunCutsLC" # CutsLC
-nightmin=20140622
-nightmax=20140624
-name="Mrk501_5min_Flare_newAnalysis_forHESS"
-bin=5
-get_results
-
-exit
-
-# for 2344 paper with MAGIC
-
-source=3
-zdmax=90
-thmax=1500
-
-# new analysis
-table="AnalysisResultsRunCutsLC" # CutsLC
-nightmin=20160618
-nightmax=20160815
-name="2344_2016flare_newAnalysis"
-bin=-7
-get_results
-overwrite="no"
-bin=-28
-nightmin=20160816
-nightmax=20161031
-get_results
-overwrite="yes"
-
-# ISDC analysis
-table="AnalysisResultsRunISDC"
-nightmin=20160618
-nightmax=20160815
-name="2344_2016flare_stdAnalysis"
-bin=-7
-get_results
-overwrite="no"
-bin=-28
-nightmin=20160816
-nightmax=20161031
-get_results
-overwrite="yes"
-
-
-usedch="no" 
-# new analysis
-table="AnalysisResultsRunCutsLC" # CutsLC
-nightmin=20160618
-nightmax=20160815
-name="2344_2016flare_newAnalysis_noDCh"
-bin=-7
-get_results
-overwrite="no"
-bin=-28
-nightmin=20160816
-nightmax=20161031
-get_results
-overwrite="yes"
-
-# ISDC analysis
-table="AnalysisResultsRunISDC"
-nightmin=20160618
-nightmax=20160815
-name="2344_2016flare_stdAnalysis_noDCh"
-bin=-7
-get_results
-overwrite="no"
-bin=-28
-nightmin=20160816
-nightmax=20161031
-get_results
-overwrite="yes"
-
-usedch="yes" 
-
-
-exit
-
 # Mrk 501
 source=2
@@ -830,4 +671,203 @@
 bin=5
 get_results
+nightmin=20140622
+nightmax=20140624
+name="Mrk501_5min_Flare_newAnalysis_forHESS"
+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
+
+# LC for INTEGRAL Proposal
+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
+# for other INTEGRAL proposal
+# Mrk 421
+bin=0
+source=1
+name="Mrk421_all_period"
+get_results
+
+exit
+
+
+# Crab
+source=5
+nightmin=20121214
+nightmax=20180418
+table="AnalysisResultsRunCutsLC" # CutsLC
+bin=-1
+zdmax=30
+thmax=330
+name="testCrabnightlycheck"
+get_results
+
+exit
+
+# Crab
+source=5
+nightmin=20121214
+nightmax=20180418
+table="AnalysisResultsRunCutsLC" # CutsLC
+bin=20
+name="testCrab20min"
+get_results
+
+exit
+
+# Crab
+source=5
+nightmin=20121214
+nightmax=20180418
+table="AnalysisResultsRunCutsLC" # CutsLC
+bin=-1
+name="testCrabnightly"
+get_results
+
+exit
+
+# Crab
+source=5
+#nightmin=20121214
+#nightmax=20180418
+table="AnalysisResultsRunCutsLC" # CutsLC
+bin=-1
+name="testCraball"
+get_results
+
+exit
+
+
+# Crab
+source=5
+nightmin=20121214
+nightmax=20180418
+table="AnalysisResultsRunCutsLC" # CutsLC
+bin=60
+name="testCrab"
+get_results
+
+exit
+
+
+# for 2344 paper with MAGIC
+
+source=3
+zdmax=90
+thmax=1500
+
+# new analysis
+table="AnalysisResultsRunCutsLC" # CutsLC
+nightmin=20160618
+nightmax=20160815
+name="2344_2016flare_newAnalysis"
+bin=-7
+get_results
+overwrite="no"
+bin=-28
+nightmin=20160816
+nightmax=20161031
+get_results
+overwrite="yes"
+
+# ISDC analysis
+table="AnalysisResultsRunISDC"
+nightmin=20160618
+nightmax=20160815
+name="2344_2016flare_stdAnalysis"
+bin=-7
+get_results
+overwrite="no"
+bin=-28
+nightmin=20160816
+nightmax=20161031
+get_results
+overwrite="yes"
+
+
+usedch="no" 
+# new analysis
+table="AnalysisResultsRunCutsLC" # CutsLC
+nightmin=20160618
+nightmax=20160815
+name="2344_2016flare_newAnalysis_noDCh"
+bin=-7
+get_results
+overwrite="no"
+bin=-28
+nightmin=20160816
+nightmax=20161031
+get_results
+overwrite="yes"
+
+# ISDC analysis
+table="AnalysisResultsRunISDC"
+nightmin=20160618
+nightmax=20160815
+name="2344_2016flare_stdAnalysis_noDCh"
+bin=-7
+get_results
+overwrite="no"
+bin=-28
+nightmin=20160816
+nightmax=20161031
+get_results
+overwrite="yes"
+
+usedch="yes" 
+
+
+exit
+
+# Mrk 501
+source=2
+zdmax=90
+thmax=1500
+# new analysis
+table="AnalysisResultsRunCutsLC" # CutsLC
+nightmin=20140520
+nightmax=20140930
+name="Mrk501_nightly_newAnalysis_forHESS"
+bin=-1
+get_results
+name="Mrk501_7d_newAnalysis_forHESS"
+bin=-7
+get_results
+nightmin=20140623
+nightmax=20140623
+name="Mrk501_5min_FlareNight_newAnalysis_forHESS"
+bin=5
+get_results
 # isdc analysis
 thmax=850