Commit 84c8f22c308c7f7b3c735b99fa99de54dcfd3f35
Merge branch '1511-reduce-GObservations-verbosity' into integration
Showing
1 changed file
with
8 additions
and
6 deletions
src/obs/GObservations.cpp
| @@ -872,21 +872,23 @@ std::string GObservations::print(const GChatter& chatter) const | @@ -872,21 +872,23 @@ std::string GObservations::print(const GChatter& chatter) const | ||
| 872 | // Append information | 872 | // Append information |
| 873 | result.append("\n"+gammalib::parformat("Number of observations")); | 873 | result.append("\n"+gammalib::parformat("Number of observations")); |
| 874 | result.append(gammalib::str(size())); | 874 | result.append(gammalib::str(size())); |
| 875 | + result.append("\n"+gammalib::parformat("Number of models")); | ||
| 876 | + result.append(gammalib::str(m_models.size())); | ||
| 875 | result.append("\n"+gammalib::parformat("Number of predicted events")); | 877 | result.append("\n"+gammalib::parformat("Number of predicted events")); |
| 876 | result.append(gammalib::str(npred())); | 878 | result.append(gammalib::str(npred())); |
| 877 | 879 | ||
| 878 | - // NORMAL: Append observations | ||
| 879 | - if (chatter >= NORMAL) { | 880 | + // EXPLICIT: Append observations |
| 881 | + if (chatter >= EXPLICIT) { | ||
| 880 | for (int i = 0; i < size(); ++i) { | 882 | for (int i = 0; i < size(); ++i) { |
| 881 | result.append("\n"); | 883 | result.append("\n"); |
| 882 | result.append((*this)[i]->print()); | 884 | result.append((*this)[i]->print()); |
| 883 | } | 885 | } |
| 884 | - } // endif: chatter was normal | 886 | + } // endif: chatter was explicit |
| 885 | 887 | ||
| 886 | - // EXPLICIT: Append models | ||
| 887 | - if (chatter >= EXPLICIT) { | 888 | + // VERBOSE: Append models |
| 889 | + if (chatter == VERBOSE) { | ||
| 888 | result.append("\n"+m_models.print()); | 890 | result.append("\n"+m_models.print()); |
| 889 | - } // endif: chatter was explicit | 891 | + } // endif: chatter was verbose |
| 890 | 892 | ||
| 891 | } // endif: chatter was not silent | 893 | } // endif: chatter was not silent |
| 892 | 894 |