Fix bug #1850 (segfault in ctbin), add unit test to test for this case in the future

Michael Mayer
1 parent bb1a2031
Showing 2 changed files with 19 additions and 3 deletions
src/ctbin/ctbin.cpp
test/test_ctbin.py
@@ -523,9 +523,9 @@ void ctbin::fill_cube(GCTAObservation* obs)
         // Skip event if the corresponding counts cube energy bin is not
         // fully contained in the event list energy range. This avoids
         // having partially filled bins.
-        if (!usage[iebin]) {
-            num_outside_ebds++;
-            continue;
+        if (iebin == -1 || !usage[iebin]) {
+        	num_outside_ebds++;
+        	continue;
         }
         // Fill event in skymap
@@ -100,6 +100,22 @@ class Test(test):
         # Check if execution failed
         self.test_assert(self._execute(cmd) != 0,
              'Check invalid input file when executed from command line')
+        
+        # Setup ctbin command with different ebounds than input
+        cmd = ctbin+' inobs="'+self._events+'"'+ \
+                    ' outcube="cntmap_cmd3.fits"'+\
+                    ' emin=0.5 emax=20.0 enumbins=10 ebinalg="LOG"'+ \
+                    ' nxpix=40 nypix=40 binsz=0.1 coordsys="CEL"'+ \
+                    ' xref=83.63 yref=22.01 proj="CAR"'+ \
+                    ' logfile="ctbin_cmd3.log" chatter=3'
+
+        # Check if execution was successful
+        self.test_value(self._execute(cmd), 0,
+             'Check successful execution from command line')
+
+        # Load counts cube and check content.
+        evt = gammalib.GCTAEventCube('cntmap_cmd3.fits')
+        self._check_cube(evt, 890)
         # Setup ctbin --help option
         cmd = ctbin+' --help'