Definitely remove true energy clipping from stacked response cubes

Jürgen Knödlseder
1 parent 4103eb89
Showing 3 changed files with 0 additions and 58 deletions
inst/cta/src/GCTACubeEdisp.cpp
inst/cta/src/GCTACubeExposure.cpp
inst/cta/src/GCTACubePsf.cpp
@@ -54,7 +54,6 @@
 /* __ Macros _____________________________________________________________ */
 /* __ Coding definitions _________________________________________________ */
-//#define G_CLIP_ETRUES         //!< Clip true energies to reconstructed ones
 /* __ Debug definitions __________________________________________________ */
@@ -848,9 +847,6 @@ void GCTACubeEdisp::fill_cube(const GCTAObservation&amp; obs,
                               GSkyMap*               exposure,
                               GLog*                  log)
 {
-    // Set energy margin
-    static const GEnergy margin(1.0, "MeV");
-
     // Only continue if we have an event list
     if (obs.eventtype() == "EventList") {
@@ -948,22 +944,6 @@ void GCTACubeEdisp::fill_cube(const GCTAObservation&amp; obs,
                 // Loop over all energy bins
                 for (int iebin = 0; iebin < m_energies.size(); ++iebin) {
-                    // Skip energy dispersion cube energy if the energy is
-                    // outside the observation energy. The energy dispersion
-                    // cube energies are true energies while the observation
-                    // energy boundaries are reconstructed energies, hence
-                    // this is only an approximation, but probably the only
-                    // we can really do.
-                    // We allow here for a small margin in case of rounding
-                    // errors in the energy boundaries.
-                    #if defined(G_CLIP_ETRUES)
-                    if (!(obs_ebounds.contains(m_energies[iebin])        ||
-                          obs_ebounds.contains(m_energies[iebin]-margin) ||
-                          obs_ebounds.contains(m_energies[iebin]+margin))) {
-                        continue;
-                    }
-                    #endif
-
                     // Get log10 of true energy in TeV
                     double logEsrc = m_energies[iebin].log10TeV();
@@ -41,7 +41,6 @@
 /* __ Macros _____________________________________________________________ */
 /* __ Coding definitions _________________________________________________ */
-//#define G_CLIP_ETRUES         //!< Clip true energies to reconstructed ones
 /* __ Debug definitions __________________________________________________ */
@@ -639,9 +638,6 @@ void GCTACubeExposure::free_members(void)
  ***************************************************************************/
 void GCTACubeExposure::fill_cube(const GCTAObservation& obs, GLog* log)
 {
-    // Set energy margin
-    static const GEnergy margin(1.0, "MeV");
-
     // Only continue if we have an event list
     if (obs.eventtype() == "EventList") {
@@ -728,21 +724,6 @@ void GCTACubeExposure::fill_cube(const GCTAObservation&amp; obs, GLog* log)
                 // Loop over all exposure cube energies
                 for (int iebin = 0; iebin < m_energies.size(); ++iebin){
-                    // Skip exposure cube energy if the energy is outside the
-                    // observation energy. The exposure cube energies are true
-                    // energies while the observation energy boundaries are
-                    // reconstructed energies, hence this is only an
-                    // approximation, but probably the only we can really do.
-                    // We allow here for a small margin in case of rounding
-                    // errors in the energy boundaries.
-                    #if defined(G_CLIP_ETRUES)
-                    if (!(obs_ebounds.contains(m_energies[iebin])        ||
-                          obs_ebounds.contains(m_energies[iebin]-margin) ||
-                          obs_ebounds.contains(m_energies[iebin]+margin))) {
-                        continue;
-                    }
-                    #endif
-
                     // Get logE/TeV
                     double logE = m_energies[iebin].log10TeV();
@@ -48,7 +48,6 @@
 /* __ Macros _____________________________________________________________ */
 /* __ Coding definitions _________________________________________________ */
-//#define G_CLIP_ETRUES         //!< Clip true energies to reconstructed ones
 #define G_SMOOTH_PSF                        //!< Guarantee no singularities
 #define G_QUADRATIC_BINNING                //!< Use quadratic delta spacing
@@ -769,9 +768,6 @@ void GCTACubePsf::fill_cube(const GCTAObservation&amp; obs,
                             GSkyMap*               exposure,
                             GLog*                  log)
 {
-    // Set energy margin
-    static const GEnergy margin(1.0, "MeV");
-
     // Only continue if we have an event list
     if (obs.eventtype() == "EventList") {
@@ -858,21 +854,6 @@ void GCTACubePsf::fill_cube(const GCTAObservation&amp; obs,
                 // Loop over all energy bins
                 for (int iebin = 0; iebin < m_energies.size(); ++iebin) {
-                    // Skip PSF cube energy if the energy is outside the
-                    // observation energy. The PSF cube energies are true
-                    // energies while the observation energy boundaries are
-                    // reconstructed energies, hence this is only an
-                    // approximation, but probably the only we can really do.
-                    // We allow here for a small margin in case of rounding
-                    // errors in the energy boundaries.
-                    #if defined(G_CLIP_ETRUES)
-                    if (!(obs_ebounds.contains(m_energies[iebin])        ||
-                          obs_ebounds.contains(m_energies[iebin]-margin) ||
-                          obs_ebounds.contains(m_energies[iebin]+margin))) {
-                        continue;
-                    }
-                    #endif
-
                     // Get logE/TeV
                     double logE = m_energies[iebin].log10TeV();