Fix ctbin::save() bug for empty observation container (#1835)

Jürgen Knödlseder
1 parent 591cfd99
Showing 5 changed files with 24 additions and 9 deletions
ChangeLog
NEWS
src/ctbin/ctbin.cpp
src/support/ctool.cpp
test/test_ctbin.py
@@ -3,6 +3,7 @@
         * Version 1.2.0 released
         ========================
+        Fix ctbin::save() bug for empty observation container (#1835)
         Fix exception when calling ctools clear() methods (#1835)
         Add support modules to cscripts (#1830)
         Fix lacking coverage measure for cscripts execution (#1827)
@@ -42,6 +42,10 @@ ctbin - CTA event binning
 The clear() method now calls GApplication::clear() to conserve the properties
 of the tool (#1835).
+The save() method led to a segmentation violation in case it was applied on an
+empty ctbin instance, and specifically in case that the instance contains an
+empty observation container. This bug has been fixed (#1835).
+
 ctlike - Maximum likelihood fitting
 -----------------------------------
@@ -304,8 +304,9 @@ void ctbin::save(void)
     // Get counts cube filename
     m_outcube = (*this)["outcube"].filename();
-    // Save only if filename is non-empty
-    if (!m_outcube.is_empty()) {
+    // Save only if filename is not empty and if there is at least one
+    // observation
+    if (!m_outcube.is_empty() && m_obs.size() > 0) {
         // Get CTA observation from observation container
         GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[0]);
@@ -276,7 +276,7 @@ void ctool::copy_members(const ctool&amp; app)
 void ctool::free_members(void)
 {
     // Write separator into logger
-    log_string(TERSE, "\n");
+    log_string(TERSE, "");
     // Return
     return;
@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # ==========================================================================
+import os
 import gammalib
 import ctools
 from testing import test
@@ -118,14 +119,22 @@ class Test(test):
         self.test_value(bin.cube().size(), 0,
              'Check that empty ctbin has an empty counts cube')
-        # Check that saving and publishing does nothing
-        bin['debug']   = True
+        # Check that saving does not nothing
+        bin['logfile'] = 'ctbin_py0.log'
         bin['outcube'] = 'ctbin_py0.fits'
-        #bin.save()          # Segfaults, see issue #1835
-        #bin.publish()       # Segfaults, see issue #1835
+        bin.logFileOpen()
+        bin.save()
+        self.test_assert(not os.path.isfile('ctbin_py0.fits'),
+             'Check that no counts cube has been created')
-        # Set ctbin parameters
-        bin = ctools.ctbin()
+        # Check that publishing does not lead to an exception or segfault
+        bin.publish()
+
+        # Check that clearing does not lead to an exception or segfault
+        bin.clear()
+
+        # Now set ctbin parameters
+        #bin = ctools.ctbin()
         bin['inobs']    = self._events
         bin['outcube']  = 'ctbin_py1.fits'
         bin['ebinalg']  = 'LOG'