GApplicationPar::filename() now returns GFilename instead of std::string.

Jürgen Knödlseder
1 parent c5a2d15f
Showing 8 changed files with 28 additions and 28 deletions
cscripts/csfindobs.py
cscripts/csiactcopy.py
cscripts/csiactobs.py
cscripts/csmodelinfo.py
cscripts/csobsinfo.py
cscripts/cspull.py
cscripts/cssens.py
cscripts/cstsdist.py
@@ -287,12 +287,12 @@ class csfindobs(ctools.cscript):
     def save(self, outfile):
         # Check for clobber
-        if os.path.isfile(outfile) and not self.clobber():
-            self.log("File "+outfile+" already exists. Set clobber=yes to overwrite file")
+        if outfile.exists() and not self.clobber():
+            self.log("File "+outfile.url()+" already exists. Set clobber=yes to overwrite file")
             self.log("\n")
         else:
             # Write runs to file
-            f = open(outfile,"w")
+            f = open(outfile.url(),"w")
             for run in self.runs:
                 f.write(str(run)+" \n")
             f.close()
@@ -103,9 +103,10 @@ class csiactcopy(ctools.cscript):
         """
         # Get Parameters
-        self.m_remote_master = gammalib.expand_env(self["remote_master"].filename())
-        if not os.path.isfile(self.m_remote_master):
-            raise RuntimeError("*** ERROR: FITS data not available. No master index file found in \""+self.m_remote_master+"\". Make sure remote file system is properly mounted")
+        self.m_remote_master = self["remote_master"].filename()
+        #if not os.path.isfile(self.m_remote_master):
+        if not self.m_remote_master.exists():
+            raise RuntimeError("*** ERROR: FITS data not available. No master index file found in \""+self.m_remote_master.url()+"\". Make sure remote file system is properly mounted")
         # Get parameters
         self.m_prodname = self["prodname"].string()
@@ -153,7 +154,7 @@ class csiactcopy(ctools.cscript):
         self.runlist = []
         # Check if runlist file is available
-        if os.path.isfile(self.m_runlist):
+        if self.m_runlist.exists():
             runfile = open(self.m_runlist)
             for line in runfile.readlines():
                 if len(line) == 0:
@@ -2,7 +2,7 @@
 # ==========================================================================
 # Generation of an IACT observation definition file.
 #
-# Copyright (C) 2015 Michael Mayer
+# Copyright (C) 2015-2016 Michael Mayer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -138,7 +138,7 @@ class csiactobs(ctools.cscript):
         # Read user parameters  
         self.m_prodname    = self["prodname"].string()
-        self.m_runlistfile = gammalib.expand_env(self["infile"].filename())
+        self.m_runlistfile = self["infile"].filename()
         self.m_bkgpars     = self["bkgpars"].integer()
         # Output model file
@@ -288,16 +288,15 @@ class csiactobs(ctools.cscript):
             prefactor  = 1.0
             index      = 0.0
             prefactor *= bkg_scale
-            spec = self.background_spectrum(obs_id, prefactor, index, emin, emax)
+            spec       = self.background_spectrum(obs_id, prefactor, index, emin, emax)
             # Create background model instance
             bck = gammalib.GCTAModelIrfBackground(spec)
         # Set AeffBackground   
         elif bkgtype == "aeff":
-        
             prefactor = bkg_scale * self.m_bkg_aeff_norm
-            spec = self.background_spectrum(obs_id, prefactor, self.m_bkg_aeff_index, emin, emax)
+            spec      = self.background_spectrum(obs_id, prefactor, self.m_bkg_aeff_index, emin, emax)
             # Create background model instance
             bck = gammalib.GCTAModelAeffBackground(spec)
@@ -393,7 +392,7 @@ class csiactobs(ctools.cscript):
         # Read runlist from file
         runlist = []
-        runfile = open(self.m_runlistfile)
+        runfile = open(self.m_runlistfile.url())
         for line in runfile.readlines():
             if len(line) == 0:
                 continue
@@ -420,12 +419,12 @@ class csiactobs(ctools.cscript):
             obs_selection = "[OBS_ID=="+str(obs_id)+"]"
             # Open HDU index file
-            hduindx = gammalib.GFits(self.m_hdu_index+"[HDU_INDEX]"+obs_selection)
+            hduindx     = gammalib.GFits(self.m_hdu_index+"[HDU_INDEX]"+obs_selection)
             hduindx_hdu = hduindx["HDU_INDEX"]
             # Initialise files and hdu names
             eventfile = aefffile = psffile = edispfile = bkgfile = ""
-            eventhdu = aeffhdu = ""
+            eventhdu  = aeffhdu  = ""
             types = []
             formats = []
@@ -533,7 +532,7 @@ class csiactobs(ctools.cscript):
             fits.close()
             # Open effective area file to look for threshold
-            aeff_fits = gammalib.GFits(aefffile)
+            aeff_fits  = gammalib.GFits(aefffile)
             aeff_table = aeff_fits[aeffhdu]
             # Set energy range from header keyword if present
@@ -2,7 +2,7 @@
 # ==========================================================================
 # Dump information about models into log file
 #
-# Copyright (C) 2015 Michael Mayer
+# Copyright (C) 2015-2016 Michael Mayer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -329,7 +329,7 @@ class csmodelinfo(ctools.cscript):
             self.log.header1("Save region file")
             # Open file   
-            f = open(self.ds9file,"w")
+            f = open(self.ds9file.url(),"w")
             # Write coordinate system
             f.write("fk5\n")
@@ -2,7 +2,7 @@
 # ==========================================================================
 # Dump information about observation into log file
 #
-# Copyright (C) 2015 Michael Mayer
+# Copyright (C) 2015-2016 Michael Mayer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -381,7 +381,7 @@ class csobsinfo(ctools.cscript):
         if not self.ds9file == "NONE":      
             # Open file   
-            f = open(self.ds9file,"w")
+            f = open(self.ds9file.url(),"w")
             # Write coordinate system
             f.write("fk5\n")
@@ -2,7 +2,7 @@
 # ==========================================================================
 # This script generates the pull distribution for all model parameters.
 #
-# Copyright (C) 2011-2015 Juergen Knoedlseder
+# Copyright (C) 2011-2016 Juergen Knoedlseder
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -319,11 +319,11 @@ class cspull(ctools.cscript):
             # Write out result immediately
             if seed == 0:
-                file = open(self.m_outfile, 'w')
+                file   = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(file, result['colnames'])
                 writer.writerow(dict((_,_) for _ in result['colnames']))
             else:
-                file = open(self.m_outfile, 'a')
+                file = open(self.m_outfile.url(), 'a')
             writer = csv.DictWriter(file, result['colnames'])
             writer.writerow(result['values'])
             file.close()
@@ -249,13 +249,13 @@ class cssens(ctools.cscript):
             # Write results
             if ieng == 0:
-                f      = open(self.m_outfile, 'w')
+                f      = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(f, colnames)
                 writer.writerow(dict((_,_) for _ in colnames))
                 writer.writerow(result)
                 f.close()
             else:
-                f = open(self.m_outfile, 'a')
+                f      = open(self.m_outfile.url(), 'a')
                 writer = csv.DictWriter(f, colnames)
                 writer.writerow(result)
                 f.close()
@@ -3,7 +3,7 @@
 # This script generates the TS distribution for a particular model based
 # on Monte-Carlo simulations.
 #
-# Copyright (C) 2011-2015 Juergen Knoedlseder
+# Copyright (C) 2011-2016 Juergen Knoedlseder
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -249,11 +249,11 @@ class cstsdist(ctools.cscript):
             # Write out result immediately
             if seed == 0:
-                file = open(self.m_outfile, 'w')
+                file   = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(file, result['colnames'])
                 writer.writerow(dict((_,_) for _ in result['colnames']))
             else:
-                file = open(self.m_outfile, 'a')
+                file = open(self.m_outfile.url(), 'a')
             writer = csv.DictWriter(file, result['colnames'])
             writer.writerow(result['values'])
             file.close()