Merge branch 'integration' into devel

Jürgen Knödlseder
2 parents 8f8aa917 a9bf64c1
Showing 3 changed files with 14 additions and 3 deletions
ChangeLog
NEWS
src/ctbin/ctbin.cpp
-2015-06-05  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2015-06-09  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
  
         * Version 0.10.0 released
         =========================
  
+        Check existence of ROI in ctbin (#1476)
         Allocate optimizer in ctlike upon construction (#1471)
         Move cscripts into the ctools Python module (#1470)
  
@@ -2,7 +2,7 @@ New Features and Important Changes in ctools 0.10.0
  
 Author(s) : Juergen Knoedlseder
  
-5 June 2015
+9 June 2015
  
  
 1. Introduction
@@ -40,7 +40,8 @@ None
  
 7. ctbin - CTA event binning
 ----------------------------
-None
+ctbin now verifies if an ROI has been set properly, and throws an exception in
+case that no ROI information could be found.
  
  
 8. ctlike - Maximum likelihood fitting
@@ -455,6 +455,15 @@ void ctbin::fill_cube(GCTAObservation* obs)
         // Get the RoI
         const GCTARoi& roi = events->roi();
  
+        // Check for RoI sanity
+        if (!roi.is_valid()) {
+            std::string msg = "No RoI information found in input observation "
+                              "\""+obs->name()+"\". Run ctselect to specify "
+                              "an RoI for this observation before running "
+                              "ctbin.";
+            throw GException::invalid_value(G_FILL_CUBE, msg);
+        }
+
         // Initialise binning statistics
         int num_outside_roi  = 0;
         int num_outside_map  = 0;