Changeset 19908 for trunk/FACT++/src

Timestamp:

12/15/19 18:17:23 (5 years ago)

Author:

tbretz

Message:

Fixed some axis labels for the spectrum histograms.

File:

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

trunk/FACT++/src/spectrum.cc

@@ -2118 +2118 @@
             for (auto it=types.cbegin(); it!=types.cend(); it++)
             {
+                const bool integral = *ib=="Energy" && !it->empty();
+
                 hist.dir = *ib=="Theta" ? "Data/Theta" : (it->empty() ? "Data/Energy/Differential" : "Data/Energy/Integral");
 
                 hist.axisy = "Counts";
-                if (*ib=="Energy")
+                if (integral)
                     hist.axisy += " (E>E_{lo})";
 
@@ -2143 +2145 @@
                 hist.err   = "";
                 hist.axisy = "#sigma";
-                if (*ib=="Energy")
+                if (integral)
                     hist.axisy += " (E>E_{lo})";
                 WriteHistogram(connection, hist);
@@ -2151 +2153 @@
                 hist.err   = "";
                 hist.axisy = "<E_{est}>/GeV";
-                if (*ib=="Energy")
+                if (integral)
                     hist.axisy += " (E>E_{lo})";
                 WriteHistogram(connection, hist);
@@ -2159 +2161 @@
                 hist.err   = "ErrExcessRatio"+*it;
                 hist.axisy = "Ratio";
-                if (*ib=="Energy")
+                if (integral)
                     hist.axisy += " (E>E_{lo})";
                 WriteHistogram(connection, hist);
@@ -2165 +2167 @@
 
             hist.dir = *ib=="Theta" ? "Data/Theta" : "Data/Energy/Differential";
-            hist.axisy = "dN/dE ";
-            if (*ib=="Energy")
-                hist.axisy += "(E>E_{lo}) ";
-            hist.axisy += *ib=="Theta" ? "[cm^{-2} s^{-1}]" : "[cm^{-2} s^{-1} TeV^{-1}]";
+            hist.axisy = *ib=="Theta" ? "dN/dE [cm^{-2} s^{-1}]" : "dN/dE [cm^{-2} s^{-1} TeV^{-1}]";
 
             hist.name = "Spectrum";
@@ -2175 +2174 @@
             WriteHistogram(connection, hist);
 
-            hist.name = "SigmaFlux";
-            hist.v    = "SigmaFlux";
-            hist.err  = "";
+            hist.name  = "SigmaFlux";
+            hist.v     = "SigmaFlux";
+            hist.err   = "";
+            hist.axisy = "Relative standard deviations";
             WriteHistogram(connection, hist);
 
@@ -2190 +2190 @@
                 WriteHistogram(connection, hist);
 
+                hist.dir   = "Data/Energy/Differential";
+                hist.name  = "IntegratedSpectrum";
+                hist.v     = "IntegratedFlux";
+                hist.err   = "ErrIntegratedFlux";
+                WriteHistogram(connection, hist);
+
                 hist.dir   = "Data/Energy/Integral";
                 hist.name  = "SigmaFlux";
                 hist.v     = "SigmaFluxI";
                 hist.err   = "";
-                WriteHistogram(connection, hist);
-
-                hist.dir   = "Data/Energy/Differential";
-                hist.name  = "IntegratedSpectrum";
-                hist.v     = "IntegratedFlux";
-                hist.err   = "ErrIntegratedFlux";
+                hist.axisy = "Relative standard deviations (E>E_{lo})";
                 WriteHistogram(connection, hist);
             }