Moved iniitalisation of private XML instance from run() to constructor

Michael Mayer
1 parent a35f9317
Showing 2 changed files with 8 additions and 9 deletions
cscripts/csiactobs.py
test/test_csiactobs.py
@@ -80,6 +80,10 @@ class csiactobs(ctools.cscript):
         # Initialise application by calling the appropriate class constructor
         self._init_cscript(argv)
+        
+        # Append an observation list to XML instance
+        self._xml.append(gammalib.GXmlElement('observation_list title="observation list"'))
+        self._xml_obslist = self._xml.element('observation_list', 0)
         # Return
         return
@@ -555,12 +559,7 @@ class csiactobs(ctools.cscript):
         # Clear models
         self._models.clear()
-
-        # Clear XML file and append an observation list
-        self._xml.clear()
-        self._xml.append(gammalib.GXmlElement('observation_list title="observation list"'))
-        lib = self._xml.element('observation_list', 0)
-
+        
         # Log output
         msg = 'Looping over %d runs' % len(self._runlist)
         self._log_header1(gammalib.TERSE, msg)
@@ -709,7 +708,7 @@ class csiactobs(ctools.cscript):
                                                       run_emax.TeV()))
             # Append observation to XML and set attributes
-            obs = lib.append('observation')
+            obs = self._xml_obslist.append('observation')
             obs.attribute('name', object_name)
             obs.attribute('id', str(obs_id))
             obs.attribute('instrument', telescope)
@@ -764,7 +763,7 @@ class csiactobs(ctools.cscript):
         self._write_summary()
         # Write warning in no observation could be used from runlist
-        if lib.size() == 0:
+        if self._xml_obslist.size() == 0:
             self._log_string(gammalib.NORMAL, 'WARNING: No observation was '
                              'appended from specified runlist')
@@ -147,7 +147,7 @@ class Test(test):
         iactobs.save()
         # Check empty observation definition XML file
-        #self._check_obsdef('csiactobs_obs_py0.xml', 0) # See #1841
+        self._check_obsdef('csiactobs_obs_py0.xml', 0)
         # Check empty model definition XML file
         self._check_moddef('csiactobs_bgd_py0.xml', 0)