From 701aef535050d189e0fe0ba7a0604c8ba020bbcf Mon Sep 17 00:00:00 2001
From: Jürgen Knödlseder <jurgen.knodlseder@irap.omp.eu>
Date: Tue, 15 Mar 2016 01:32:05 +0100
Subject: [PATCH] Use gammalib.parformat for output filename logging.

---
 cscripts/csresmap.py | 13 +++++++------
 cscripts/csspec.py   | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cscripts/csresmap.py b/cscripts/csresmap.py
index e91fb6e..8559c87 100755
--- a/cscripts/csresmap.py
+++ b/cscripts/csresmap.py
@@ -49,7 +49,6 @@ class csresmap(ctools.cscript):
         self._algorithm    = "SUB"
         self._resmap       = None
         self._modcube      = "NONE"
-        self._outmap       = "NONE"
         self._use_maps     = False
         self._skip_binning = False
         self._publish      = False
@@ -158,7 +157,7 @@ class csresmap(ctools.cscript):
 
         # Read ahead output parameters
         if (self._read_ahead()):
-            self._outmap = self["outmap"].filename()
+            self["outmap"].filename()
 
         # Write input parameters into logger
         if self._logTerse():
@@ -324,17 +323,19 @@ class csresmap(ctools.cscript):
             self._log.header1("Save residual map")
 
         # Get outmap parameter
-        self._outmap = self["outmap"].filename()
+        outmap = self["outmap"].filename()
         
         # Continue only filename and residual map are valid
-        if self._outmap != "NONE" and self._resmap != None:
+        if self._resmap != None:
 
             # Log file name
             if self._logTerse():
-                self._log("Save residual map into \""+self._outmap+"\".\n")
+                self._log(gammalib.parformat("Residual map file"))
+                self._log(outmap.url())
+                self._log("\n")
 
             # Save residual map
-            self._resmap.save(self._outmap, self._clobber)
+            self._resmap.save(outmap, self._clobber)
 
         # Return
         return
diff --git a/cscripts/csspec.py b/cscripts/csspec.py
index 764c3e7..f011e20 100755
--- a/cscripts/csspec.py
+++ b/cscripts/csspec.py
@@ -51,7 +51,6 @@ class csspec(ctools.cscript):
         self._binned_mode = False
         self._srcname     = ""
         self._edisp       = False
-        self._outfile     = "NONE"
         self._calc_ulimit = True
         self._calc_ts     = True
         self._fix_bkg     = False
@@ -121,7 +120,7 @@ class csspec(ctools.cscript):
 
         # Read ahead output parameters
         if self._read_ahead():
-            self._outfile = self["outfile"].filename()
+            self["outfile"].filename()
 
         # Write input parameters into logger
         if self._logTerse():
@@ -507,17 +506,19 @@ class csspec(ctools.cscript):
             self._log.header1("Save spectrum")
 
         # Get outmap parameter
-        self._outfile = self["outfile"].filename()
+        outfile = self["outfile"].filename()
         
         # Continue only filename and residual map are valid
-        if self._outfile != "NONE" and self._fits != None:
+        if self._fits != None:
 
             # Log file name
             if self._logTerse():
-                self._log("Save spectrum into \""+self._outfile+"\".\n")
+                self._log(gammalib.parformat("Spectrum file"))
+                self._log(outfile.url())
+                self._log("\n")
 
             # Save spectrum
-            self._fits.saveto(self._outfile, self._clobber)
+            self._fits.saveto(outfile, self._clobber)
 
         # Return
         return
--
libgit2 0.21.4