Changeset 19900 for trunk/FACT++/src

Timestamp:

12/15/19 00:34:27 (5 years ago)

Author:

tbretz

Message:

Some simplification for a better structured root file.

File:

• trunk/FACT++/src/spectrum.cc (modified) (12 diffs)

trunk/FACT++/src/spectrum.cc

@@ -1895 +1895 @@
                 const mysqlpp::Row &row = *ir;
 
-                const size_t bin      = row[*ib=="Theta" ? ".theta" : ".sparse_est"];
-                const double flux     = row["Flux"];
-                const double error    = row["ErrFlux"];
+                const size_t bin = row[*ib=="Theta" ? ".theta" : ".sparse_est"];
 
 #ifdef HAVE_ROOT
@@ -1903 +1901 @@
                 const double dat_bg   = row["Background"];
 
-                const double dat_isig = row["IntegralSignal"];
-                const double dat_ibg  = row["IntegralBackground"];
+                const double dat_isig = row["SignalI"];
+                const double dat_ibg  = row["BackgroundI"];
 
                 const double eff      = row["Efficiency"];
-                const double ieff     = row["IntegralEfficiency"];
+                const double ieff     = row["EfficiencyI"];
 
                 const double areatime = row["AreaTime"];
@@ -1926 +1924 @@
                 if (verbose>0)
                 {
-                    cout << setw(5)  << row["center"] << ": ";
-                    cout << setw(10) << row["Excess"] << " ";
-                    cout << setw(10) << flux << " ";
-                    cout << setw(10) << error << " ";
+                    cout << setw(5)  << row["center"]  << ": ";
+                    cout << setw(10) << row["Excess"]  << " ";
+                    cout << setw(10) << row["Flux"]    << " ";
+                    cout << setw(10) << row["ErrFlux"] << " ";
                     cout << setw(10) << row["Significance"] << '\n';
                 }
@@ -1935 +1933 @@
 
             Histogram hist;
-            hist.dir      = "Data/"+*ib;
             hist.table    = table;
             hist.binningx = *ib=="Theta" ? binning_theta : binning_sparse;
@@ -1942 +1939 @@
             hist.stats    = false;
 
-            const vector<string> types = *ib=="Theta" ? vector<string>{ "" } : vector<string>{ "", "Integral" };
+            const vector<string> types = *ib=="Theta" ? vector<string>{ "" } : vector<string>{ "", "I" };
             for (auto it=types.cbegin(); it!=types.cend(); it++)
             {
+                hist.dir = *ib=="Theta" ? "Data/Theta" : (it->empty() ? "Data/Energy/Differential" : "Data/Energy/Integral");
+
                 hist.axisy = "Counts";
                 if (*ib=="Energy")
@@ -1950 +1949 @@
 
                 hist.title = "";
-                hist.v     = *it+"Signal";
-                hist.err   = "Err"+*it+"Signal";
+                hist.v     = "Signal"+*it;
+                hist.err   = "ErrSignal"+*it;
                 WriteHistogram(connection, hist);
 
                 hist.title = "";
-                hist.v     = *it+"Background";
-                hist.err   = "Err"+*it+"Background";
+                hist.v     = "Background"+*it;
+                hist.err   = "ErrBackground"+*it;
                 WriteHistogram(connection, hist);
 
                 hist.title = "";
-                hist.v     = *it+"Excess";
-                hist.err   = "Err"+*it+"Excess";
+                hist.v     = "Excess"+*it;
+                hist.err   = "ErrExcess"+*it;
                 WriteHistogram(connection, hist);
 
                 hist.title = "";
-                hist.v     = *it+"Significance";
+                hist.v     = "Significance"+*it;
                 hist.err   = "";
                 hist.axisy = "#sigma";
@@ -1973 +1972 @@
 
                 hist.title = "";
-                hist.v     = *it+"AvgEnergyEst";
+                hist.v     = "AvgEnergyEst"+*it;
                 hist.err   = "";
                 hist.axisy = "<E_{est}>/GeV";
@@ -1981 +1980 @@
 
                 hist.title = "";
-                hist.v     = *it+"ExcessRatio";
-                hist.err   = "Err"+*it+"ExcessRatio";
+                hist.v     = "ExcessRatio"+*it;
+                hist.err   = "ErrExcessRatio"+*it;
                 hist.axisy = "Ratio";
                 if (*ib=="Energy")
@@ -1989 +1988 @@
             }
 
+            hist.dir = *ib=="Theta" ? "Data/Theta" : "Data/Energy/Differential";
             hist.axisy = "dN/dE ";
             if (*ib=="Energy")
@@ -2003 +2003 @@
                 hist.axisy = "dN/dE (E>E_{lo}) [cm^{-2} s^{-1}]";
 
-                hist.name  = "IntegralSpectrum";
-                hist.v     = "IntegralFlux";
-                hist.err   = "ErrIntegralFlux";
+                hist.dir   = "Data/Energy/Integral";
+                hist.name  = "Spectrum";
+                hist.v     = "FluxI";
+                hist.err   = "ErrFluxI";
                 WriteHistogram(connection, hist);
 
+                hist.dir   = "Data/Energy/Differential";
                 hist.name  = "IntegratedSpectrum";
                 hist.v     = "IntegratedFlux";
@@ -2015 +2017 @@
 
 #ifdef HAVE_ROOT
+            hist.dir   = *ib=="Theta" ? "Data/Theta" : "Data/Energy/Differential";
             hist.axisy = *ib=="Theta" ? "UL [cm^{-2} s^{-1}]" : "UL [cm^{-2} s^{-1} TeV^{-1}]";
 
@@ -2031 +2034 @@
             if (*ib=="Energy")
             {
-                hist.name = "IntegralRolkeUL";
+                hist.dir  = "Data/Energy/Integral";
+                hist.name = "RolkeUL";
                 WriteHistogram(connection, hist, rolke_int);
             }