Adjust parameters

Jürgen Knödlseder
1 parent c65054ff
Showing 3 changed files with 15 additions and 4 deletions
inst/cta/src/GCTAResponse.cpp
src/model/GModelSky.cpp
src/obs/GObservation.cpp
@@ -2281,7 +2281,7 @@ double GCTAResponse::nedisp(const GSkyDir&amp;      srcDir,
                         GIntegral integral(&integrand);
  
                         // Set integration precision
-                        //integral.eps(1.0e-5);
+                        integral.eps(1.0e-3);
  
                         // Do Romberg integration
                         nedisp += integral.romb(e_log_min, e_log_max);
@@ -1400,7 +1400,7 @@ double GModelSky::integrate_energy(const GEvent&amp; event,
                 GIntegral integral(&integrand);
  
                 // Set integration precision
-                //integral.eps(1.0e-5);
+                integral.eps(1.0e-3);
  
                 // Do Romberg integration
                 emin   = std::log(emin);
@@ -1402,8 +1402,19 @@ double GObservation::npred_spec(const GModel&amp; model,
                                 const GTime&  obsTime) const
 {
     // Set integration energy interval in MeV
-    double emin = events()->ebounds().emin().MeV();
-    double emax = events()->ebounds().emax().MeV();
+    GEnergy e_min = events()->ebounds().emin();
+    GEnergy e_max = events()->ebounds().emax();
+
+    // If model is sky model and observation uses energy dispersion then
+    // add margin
+    if (dynamic_cast<const GModelSky*>(&model) != NULL && response().use_edisp()) {
+        e_min = response().ebounds_src(e_min).emin();
+        e_max = response().ebounds_src(e_max).emax();
+    }
+
+    // Get energy interval in MeV
+    double emin = e_min.MeV();
+    double emax = e_max.MeV();
  
     // Throw exception if energy range is not valid
     if (emax <= emin) {