diff --git a/inst/cta/src/GCTACubeBackground.cpp b/inst/cta/src/GCTACubeBackground.cpp index 5fb5d64..78da8fa 100644 --- a/inst/cta/src/GCTACubeBackground.cpp +++ b/inst/cta/src/GCTACubeBackground.cpp @@ -293,8 +293,11 @@ void GCTACubeBackground::fill(const GObservations& obs, GLog* log) // Skip observation if it's not CTA if (cta == NULL) { if (log != NULL) { - *log << "Warning: Skipping "+obs[i]->instrument()+" observation "; - *log << "\"" << obs[i]->name() << "\"" <instrument(); + *log << " observation "; + *log << "\"" << obs[i]->name() << "\""; + *log << " (id=" << obs[i]->id() << ")" << std::endl; } continue; } @@ -302,12 +305,24 @@ void GCTACubeBackground::fill(const GObservations& obs, GLog* log) // Skip observation if we have a binned observation if (cta->eventtype() == "CountsCube") { if (log != NULL) { - *log << "Warning: Skipping binned observation "; - *log << "\"" << cta->name() << "\"" <instrument(); + *log << " observation "; + *log << "\"" << cta->name() << "\""; + *log << " (id=" << cta->id() << ")" << std::endl; } continue; } + // Announce observation usage + if (log != NULL) { + *log << "Including "; + *log << cta->instrument(); + *log << " observation \"" << cta->name(); + *log << "\" (id=" << cta->id() << ")"; + *log << " in background cube computation." << std::endl; + } + // Extract region of interest from CTA observation GCTARoi roi = cta->roi(); diff --git a/inst/cta/src/GCTACubeExposure.cpp b/inst/cta/src/GCTACubeExposure.cpp index e42ba67..be2aeeb 100644 --- a/inst/cta/src/GCTACubeExposure.cpp +++ b/inst/cta/src/GCTACubeExposure.cpp @@ -389,8 +389,11 @@ void GCTACubeExposure::fill(const GObservations& obs, GLog* log) // Skip observation if it's not CTA if (cta == NULL) { if (log != NULL) { - *log << "Warning: Skipping "+obs[i]->instrument()+" observation "; - *log << "\"" << obs[i]->name() << "\"" <instrument(); + *log << " observation "; + *log << "\"" << obs[i]->name() << "\""; + *log << " (id=" << obs[i]->id() << ")" << std::endl; } continue; } @@ -398,8 +401,11 @@ void GCTACubeExposure::fill(const GObservations& obs, GLog* log) // Skip observation if we have a binned observation if (cta->eventtype() == "CountsCube") { if (log != NULL) { - *log << "Warning: Skipping binned observation "; - *log << "\"" << cta->name() << "\"" <instrument(); + *log << " observation "; + *log << "\"" << cta->name() << "\""; + *log << " (id=" << cta->id() << ")" << std::endl; } continue; } @@ -414,11 +420,24 @@ void GCTACubeExposure::fill(const GObservations& obs, GLog* log) // Skip observation if we don't have an unbinned observation if (rsp == NULL) { if (log != NULL) { - *log << "Warning: Observation \"" << cta->name(); - *log << "\" contains no IRF response." <instrument(); + *log << " observation \"" << cta->name(); + *log << "\" (id=" << cta->id() << ")"; + *log << " contains no IRF response."; + *log << " Skipping this observation." << std::endl; } continue; } + + // Announce observation usage + if (log != NULL) { + *log << "Including "; + *log << cta->instrument(); + *log << " observation \"" << cta->name(); + *log << "\" (id=" << cta->id() << ")"; + *log << " in exposure cube computation." << std::endl; + } // Loop over all pixels in sky map for (int pixel = 0; pixel < m_cube.npix(); ++pixel) { diff --git a/inst/cta/src/GCTACubePsf.cpp b/inst/cta/src/GCTACubePsf.cpp index 79a46ad..4804195 100644 --- a/inst/cta/src/GCTACubePsf.cpp +++ b/inst/cta/src/GCTACubePsf.cpp @@ -454,8 +454,11 @@ void GCTACubePsf::fill(const GObservations& obs, GLog* log) // Skip observation if it's not CTA if (cta == NULL) { if (log != NULL) { - *log << "Warning: Skipping "+obs[i]->instrument()+" observation "; - *log << "\"" << obs[i]->name() << "\"" <instrument(); + *log << " observation "; + *log << "\"" << obs[i]->name() << "\""; + *log << " (id=" << obs[i]->id() << ")" << std::endl; } continue; } @@ -463,8 +466,11 @@ void GCTACubePsf::fill(const GObservations& obs, GLog* log) // Skip observation if we have a binned observation if (cta->eventtype() == "CountsCube") { if (log != NULL) { - *log << "Warning: Skipping binned observation "; - *log << "\"" << cta->name() << "\"" <instrument(); + *log << " observation "; + *log << "\"" << cta->name() << "\""; + *log << " (id=" << cta->id() << ")" << std::endl; } continue; } @@ -479,12 +485,25 @@ void GCTACubePsf::fill(const GObservations& obs, GLog* log) // Skip observation if we don't have an unbinned observation if (rsp == NULL) { if (log != NULL) { - *log << "Warning: Observation \"" << cta->name(); - *log << "\" contains no IRF response." <instrument(); + *log << " observation \"" << cta->name(); + *log << "\" (id=" << cta->id() << ")"; + *log << " contains no IRF response."; + *log << " Skipping this observation." << std::endl; } continue; } + // Announce observation usage + if (log != NULL) { + *log << "Including "; + *log << cta->instrument(); + *log << " observation \"" << cta->name(); + *log << "\" (id=" << cta->id() << ")"; + *log << " in point spread function cube computation." << std::endl; + } + // Loop over all pixels in sky map for (int pixel = 0; pixel < m_cube.npix(); ++pixel) {