Correct a bunch of Sonar issues.

Jürgen Knödlseder
1 parent d2145d7f
Showing 7 changed files with 22 additions and 26 deletions
cscripts/csmodelmerge.py
cscripts/csobsdef.py
cscripts/csobsinfo.py
cscripts/cspull.py
cscripts/cssens.py
cscripts/cstsdist.py
cscripts/cstsmapmerge.py
@@ -47,7 +47,6 @@ class csmodelmerge(ctools.cscript):
         # Initialise class members
         self._files      = None
         self._models     = gammalib.GModels()
-        self._outmodel   = "NONE"
  
         # Initialise application
         if len(argv) == 0:
@@ -105,7 +104,7 @@ class csmodelmerge(ctools.cscript):
  
         # Read ahead output filename
         if self._read_ahead():
-            self.outmodel = self["outmodel"].filename()
+            self["outmodel"].filename()
  
         # Write input parameters into logger
         if self._logTerse():
@@ -177,16 +176,16 @@ class csmodelmerge(ctools.cscript):
             self._log.header1("Save models")
  
         # Get output filename in case it was not read ahead
-        self._outmodel = self["outmodel"].filename()
+        outmodel = self["outmodel"].filename()
  
         # Log filename
         if self._logTerse():
             self._log(gammalib.parformat("Model definition XML file"))
-            self._log(self._outmodel.url())
+            self._log(outmodel.url())
             self._log("\n")
  
         # Save models
-        self._models.save(self._outmodel)
+        self._models.save(outmodel)
  
         # Return
         return
@@ -85,7 +85,6 @@ class csobsdef(ctools.cscript):
         self._obs        = gammalib.GObservations()
         self._inpnt      = ""
         self._tmin       = 0.0
-        self._outobs     = "NONE"
         self._chatter    = 2
         self._clobber    = True
         self._debug      = False
@@ -123,7 +122,7 @@ class csobsdef(ctools.cscript):
  
         # Read ahead parameters
         if self._read_ahead():
-            self._outobs = self["outobs"].filename()
+            self["outobs"].filename()
  
         # Set some fixed parameters
         self._chatter = self["chatter"].integer()
@@ -346,19 +345,19 @@ class csobsdef(ctools.cscript):
             self._log.header1("Save observation definition XML file")
  
         # Get output filename in case it was not read ahead
-        self._outobs = self["outobs"].filename()
+        outobs = self["outobs"].filename()
  
         # Check if observation definition XML file is valid
-        if self._outobs != "NONE":      
+        if outobs.url() != "NONE":      
  
             # Log filename
             if self._logTerse():
                 self._log(gammalib.parformat("Observation XML file"))
-                self._log(self._outobs.url())
+                self._log(outobs.url())
                 self._log("\n")
  
             # Save observation definition XML file
-            self._obs.save(self._outobs)
+            self._obs.save(outobs)
  
         # Return
         return
@@ -43,7 +43,6 @@ class csobsinfo(ctools.cscript):
         # Initialise class members
         self._obj_dir        = None
         self._compute_offset = False
-        self._ds9file        = ""
         self._offsets        = []
         self._zeniths        = []
         self._azimuths       = []
@@ -105,7 +104,7 @@ class csobsinfo(ctools.cscript):
  
         # Read ahead DS9 filename
         if self._read_ahead():
-            self._ds9file = self["ds9file"].filename()
+            self["ds9file"].filename()
  
         # Write input parameters into logger
         if self._logTerse():
@@ -388,19 +387,19 @@ class csobsinfo(ctools.cscript):
             self._log.header1("Save pointings in DS9 file")
  
         # Get output filename in case it was not read ahead
-        self._ds9file = self["ds9file"].filename()
+        ds9file = self["ds9file"].filename()
  
         # Check if DS9 file is valid
-        if self._ds9file != "NONE":      
+        if ds9file.url() != "NONE":      
  
             # Log filename
             if self._logTerse():
                 self._log(gammalib.parformat("DS9 filename"))
-                self._log(self._ds9file.url())
+                self._log(ds9file.url())
                 self._log("\n")
  
             # Open file   
-            f = open(self._ds9file.url(),"w")
+            f = open(ds9file.url(),"w")
  
             # Write coordinate system
             f.write("fk5\n")
@@ -310,10 +310,10 @@ class cspull(ctools.cscript):
  
         # Fit model
         if self._profile:
-            models = _obs.models()
+            models = self._obs.models()
             for i in range(models.size()):
                 model_name = models[i].name()
-                like       = obsutils.cterror(_obs, model_name,
+                like       = obsutils.cterror(self._obs, model_name,
                                               log=self._log_clients,
                                               debug=self._debug,
                                               chatter=self._chatter)
@@ -54,7 +54,7 @@ class cssens(ctools.cscript):
         self._obs         = gammalib.GObservations()
         self._ebounds     = gammalib.GEbounds()
         self._srcname     = ""
-        self._outfile     = ""
+        self._outfile     = gammalib.GFilename()
         self._ra          = None
         self._dec         = None
         self._edisp       = False
@@ -55,7 +55,7 @@ class cstsdist(ctools.cscript):
         self._enumbins    = 0
         self._npix        = 0
         self._binsz       = 0.0
-        self._outfile     = "ts.dat"
+        self._outfile     = gammalib.GFilename("ts.dat")
         self._ntrials     = 10
         self._edisp       = False
         self._debug       = False
@@ -52,7 +52,6 @@ class cstsmapmerge(ctools.cscript):
         self._merged_files = []
         self._overwrite    = True
         self._delete       = False
-        self._outmap       = "NONE"
  
         # Initialise application
         if len(argv) == 0:
@@ -120,7 +119,7 @@ class cstsmapmerge(ctools.cscript):
  
         # Read ahead output filename
         if self._read_ahead():
-            self._outmap = self["outmap"].filename()
+            self["outmap"].filename()
  
         # Write input parameters into logger
         if self._logTerse():
@@ -390,12 +389,12 @@ class cstsmapmerge(ctools.cscript):
             self._log.header1("Save TS map")
  
         # Get output filename in case it was not read ahead
-        self._outmap = self["outmap"].filename()
+        outmap = self["outmap"].filename()
  
         # Log filename
         if self._logTerse():
             self._log(gammalib.parformat("TS map file"))
-            self._log(self._outmap.url())
+            self._log(outmap.url())
             self._log("\n")
  
         # Create FITS file
@@ -425,7 +424,7 @@ class cstsmapmerge(ctools.cscript):
             fits[fits.size()-1].extname("STATUS MAP")
  
         # Save FITS file
-        fits.saveto(self._outmap, self._clobber())
+        fits.saveto(outmap, self._clobber())
  
         # Delete TS input maps if requested
         if self._delete: