diff --git a/cscripts/cscaldb.py b/cscripts/cscaldb.py index 04f3683..8c52016 100755 --- a/cscripts/cscaldb.py +++ b/cscripts/cscaldb.py @@ -164,16 +164,6 @@ class cscaldb(ctools.cscript): # Public methods - def execute(self): - """ - Execute the script. - """ - # Run the script - self.run() - - # Return - return - def run(self): """ Run the script. @@ -238,6 +228,19 @@ class cscaldb(ctools.cscript): # Return return + def execute(self): + """ + Execute the script. + """ + # Open logfile + self._logFileOpen() + + # Run the script + self.run() + + # Return + return + # ======================== # # Main routine entry point # @@ -247,8 +250,5 @@ if __name__ == '__main__': # Create instance of application app = cscaldb(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/csfindobs.py b/cscripts/csfindobs.py index 485ed14..d807230 100755 --- a/cscripts/csfindobs.py +++ b/cscripts/csfindobs.py @@ -254,6 +254,9 @@ class csfindobs(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Run the script self.run() @@ -299,8 +302,5 @@ if __name__ == '__main__': # Create instance of application app = csfindobs(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/cslightcrv.py b/cscripts/cslightcrv.py index 8749055..9db8b5b 100755 --- a/cscripts/cslightcrv.py +++ b/cscripts/cslightcrv.py @@ -548,6 +548,9 @@ class cslightcrv(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Read ahead output parameters self._read_ahead(True) @@ -614,8 +617,5 @@ if __name__ == '__main__': # Create instance of application app = cslightcrv(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/csmodelinfo.par b/cscripts/csmodelinfo.par index a2516e5..5506773 100644 --- a/cscripts/csmodelinfo.par +++ b/cscripts/csmodelinfo.par @@ -7,9 +7,9 @@ # File: csmodelinfo.par # # Version: 1.1.0 # # # -# Author: Juergen Knoedlseder # -# Jurgen.Knodlseder@irap.omp.eu # -# IRAP # +# Author: Michael Mayer # +# michael.mayer@physik.hu-berlin.de # +# HU Berlin # # # # Purpose: Parameter file for the csmodelinfo script # # # diff --git a/cscripts/csmodelinfo.py b/cscripts/csmodelinfo.py index 6f6fc1e..1fcd7aa 100755 --- a/cscripts/csmodelinfo.py +++ b/cscripts/csmodelinfo.py @@ -59,7 +59,6 @@ class csmodelinfo(ctools.cscript): self._show_ext_type = True self._free_color = "green" self._fixed_color = "magenta" - self._read_ahead = False # Initialise application if len(argv) == 0: @@ -106,7 +105,7 @@ class csmodelinfo(ctools.cscript): self._fixed_color = self["fixed_color"].string() # Read ahead DS9 filename - if self._read_ahead: + if self._read_ahead(): self._ds9file = self["ds9file"].filename() # Write input parameters into logger @@ -500,8 +499,11 @@ class csmodelinfo(ctools.cscript): """ Execute the script. """ - # Set read ahead flag - self._read_ahead = True + # Open logfile + self._logFileOpen() + + # Read ahead output parameters + self._read_ahead(True) # Run the script self.run() @@ -521,8 +523,5 @@ if __name__ == '__main__': # Create instance of application app = csmodelinfo(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/csmodelmerge.par b/cscripts/csmodelmerge.par index 8f36965..c52ea90 100644 --- a/cscripts/csmodelmerge.par +++ b/cscripts/csmodelmerge.par @@ -7,9 +7,9 @@ # File: csmodelmerge.par # # Version: 1.1.0 # # # -# Author: Juergen Knoedlseder # -# Jurgen.Knodlseder@irap.omp.eu # -# IRAP # +# Author: Michael Mayer # +# michael.mayer@physik.hu-berlin.de # +# HU Berlin # # # # Purpose: Parameter file for the csmodelmerge script # # # diff --git a/cscripts/csmodelmerge.py b/cscripts/csmodelmerge.py index cfc20a0..ab8c71a 100755 --- a/cscripts/csmodelmerge.py +++ b/cscripts/csmodelmerge.py @@ -48,7 +48,6 @@ class csmodelmerge(ctools.cscript): self._files = None self._models = gammalib.GModels() self._outmodel = "NONE" - self._read_ahead = False # Initialise application if len(argv) == 0: @@ -105,7 +104,7 @@ class csmodelmerge(ctools.cscript): raise RuntimeError(msg) # Read ahead output filename - if self._read_ahead: + if self._read_ahead(): self.outmodel = self["outmodel"].filename() # Write input parameters into logger @@ -196,8 +195,11 @@ class csmodelmerge(ctools.cscript): """ Execute the script. """ - # Set read ahead flag - self._read_ahead = True + # Open logfile + self._logFileOpen() + + # Read ahead output parameters + self._read_ahead(True) # Run the script self.run() @@ -217,8 +219,5 @@ if __name__ == '__main__': # Create instance of application app = csmodelmerge(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/csobs2caldb.par b/cscripts/csobs2caldb.par index 9f8c8a0..21d2316 100644 --- a/cscripts/csobs2caldb.par +++ b/cscripts/csobs2caldb.par @@ -7,9 +7,9 @@ # File: csobs2caldb.par # # Version: 1.1.0 # # # -# Author: Juergen Knoedlseder # -# Jurgen.Knodlseder@irap.omp.eu # -# IRAP # +# Author: Michael Mayer # +# michael.mayer@physik.hu-berlin.de # +# HU Berlin # # # # Purpose: Parameter file for the csobs2caldb script # # # diff --git a/cscripts/csobs2caldb.py b/cscripts/csobs2caldb.py index 1dd5076..786a433 100755 --- a/cscripts/csobs2caldb.py +++ b/cscripts/csobs2caldb.py @@ -395,6 +395,9 @@ class csobs2caldb(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Run the script self.run() @@ -413,8 +416,5 @@ if __name__ == '__main__': # Create instance of application app = csobs2caldb(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/csobsdef.py b/cscripts/csobsdef.py index 67f4e0c..4c04b14 100755 --- a/cscripts/csobsdef.py +++ b/cscripts/csobsdef.py @@ -89,7 +89,6 @@ class csobsdef(ctools.cscript): self._chatter = 2 self._clobber = True self._debug = False - self._read_ahead = False # Initialise application if len(argv) == 0: @@ -123,7 +122,7 @@ class csobsdef(ctools.cscript): self._inpnt = self["inpnt"].filename() # Read ahead parameters - if self._read_ahead: + if self._read_ahead(): self._outobs = self["outobs"].filename() # Set some fixed parameters @@ -368,8 +367,11 @@ class csobsdef(ctools.cscript): """ Execute the script. """ - # Set read ahead flag - self._read_ahead = True + # Open logfile + self._logFileOpen() + + # Read ahead output parameters + self._read_ahead(True) # Run the script self.run() @@ -389,8 +391,5 @@ if __name__ == '__main__': # Create instance of application app = csobsdef(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/csobsinfo.par b/cscripts/csobsinfo.par index 23a3ab5..ac66a73 100644 --- a/cscripts/csobsinfo.par +++ b/cscripts/csobsinfo.par @@ -7,9 +7,9 @@ # File: csobsinfo.par # # Version: 1.1.0 # # # -# Author: Juergen Knoedlseder # -# Jurgen.Knodlseder@irap.omp.eu # -# IRAP # +# Author: Michael Mayer # +# michael.mayer@physik.hu-berlin.de # +# HU Berlin # # # # Purpose: Parameter file for the csobsinfo script # # # diff --git a/cscripts/csobsinfo.py b/cscripts/csobsinfo.py index fe6418d..15d8461 100755 --- a/cscripts/csobsinfo.py +++ b/cscripts/csobsinfo.py @@ -51,7 +51,8 @@ class csobsinfo(ctools.cscript): self._pnt_dec = [] self._ebounds = gammalib.GEbounds() self._gti = gammalib.GGti() - self._read_ahead = False + + # Initialise observation if len(argv) > 0 and isinstance(argv[0],gammalib.GObservations): self._obs = argv[0] argv = argv[1:] @@ -103,7 +104,7 @@ class csobsinfo(ctools.cscript): self._obj_dir.radec_deg(ra,dec) # Read ahead DS9 filename - if self._read_ahead: + if self._read_ahead(): self._ds9file = self["ds9file"].filename() # Write input parameters into logger @@ -455,8 +456,11 @@ class csobsinfo(ctools.cscript): """ Execute the script. """ - # Set read ahead flag - self._read_ahead = True + # Open logfile + self._logFileOpen() + + # Read ahead output parameters + self._read_ahead(True) # Run the script self.run() @@ -476,8 +480,5 @@ if __name__ == '__main__': # Create instance of application app = csobsinfo(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/cspull.py b/cscripts/cspull.py index 1e05f3f..b2b5df2 100755 --- a/cscripts/cspull.py +++ b/cscripts/cspull.py @@ -442,6 +442,9 @@ class cspull(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Run the script self.run() @@ -467,8 +470,5 @@ if __name__ == '__main__': # Create instance of application app = cspull(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/csresmap.par b/cscripts/csresmap.par index 533ea76..e529caf 100644 --- a/cscripts/csresmap.par +++ b/cscripts/csresmap.par @@ -7,9 +7,9 @@ # File: csresmap.par # # Version: 1.1.0 # # # -# Author: Juergen Knoedlseder # -# Jurgen.Knodlseder@irap.omp.eu # -# IRAP # +# Author: Michael Mayer # +# michael.mayer@physik.hu-berlin.de # +# HU Berlin # # # # Purpose: Parameter file for the csresmap script # # # diff --git a/cscripts/csresmap.py b/cscripts/csresmap.py index 9db3ea5..af5caa1 100755 --- a/cscripts/csresmap.py +++ b/cscripts/csresmap.py @@ -318,6 +318,9 @@ class csresmap(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Read ahead output parameters self._read_ahead(True) @@ -405,8 +408,5 @@ if __name__ == '__main__': # Create instance of application app = csresmap(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/cssens.py b/cscripts/cssens.py index 7d5eef0..2e7adf2 100755 --- a/cscripts/cssens.py +++ b/cscripts/cssens.py @@ -734,6 +734,9 @@ class cssens(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Run the script self.run() @@ -750,8 +753,5 @@ if __name__ == '__main__': # Create instance of application app = cssens(sys.argv) - # Open logfile - app._logFileOpen() - # Run application app.execute() diff --git a/cscripts/csspec.py b/cscripts/csspec.py index 327e029..8fa5361 100755 --- a/cscripts/csspec.py +++ b/cscripts/csspec.py @@ -132,7 +132,7 @@ class csspec(ctools.cscript): self._debug = self["debug"].boolean() # Read ahead output parameters - if (self._read_ahead()): + if self._read_ahead(): self._outfile = self["outfile"].filename() # Write input parameters into logger @@ -494,6 +494,9 @@ class csspec(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Read ahead output parameters self._read_ahead(True) @@ -560,8 +563,5 @@ if __name__ == '__main__': # Create instance of application app = csspec(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/cstsdist.py b/cscripts/cstsdist.py index 0af2a0a..db756f0 100755 --- a/cscripts/cstsdist.py +++ b/cscripts/cstsdist.py @@ -463,6 +463,9 @@ class cstsdist(ctools.cscript): """ Execute the script. """ + # Open logfile + self._logFileOpen() + # Run the script self.run() @@ -478,8 +481,5 @@ if __name__ == '__main__': # Create instance of application app = cstsdist(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute() diff --git a/cscripts/cstsmapmerge.par b/cscripts/cstsmapmerge.par index f195ec7..ce531b8 100644 --- a/cscripts/cstsmapmerge.par +++ b/cscripts/cstsmapmerge.par @@ -7,9 +7,9 @@ # File: cstsmapmerge.par # # Version: 1.1.0 # # # -# Author: Juergen Knoedlseder # -# Jurgen.Knodlseder@irap.omp.eu # -# IRAP # +# Author: Michael Mayer # +# michael.mayer@physik.hu-berlin.de # +# HU Berlin # # # # Purpose: Parameter file for the cstsmapmerge script # # # diff --git a/cscripts/cstsmapmerge.py b/cscripts/cstsmapmerge.py index af41ea8..12101ec 100755 --- a/cscripts/cstsmapmerge.py +++ b/cscripts/cstsmapmerge.py @@ -53,7 +53,6 @@ class cstsmapmerge(ctools.cscript): self._overwrite = True self._delete = False self._outmap = "NONE" - self._read_ahead = False # Initialise application if len(argv) == 0: @@ -120,7 +119,7 @@ class cstsmapmerge(ctools.cscript): self._delete = self["delete"].boolean() # Read ahead output filename - if self._read_ahead: + if self._read_ahead(): self._outmap = self["outmap"].filename() # Write input parameters into logger @@ -444,8 +443,11 @@ class cstsmapmerge(ctools.cscript): """ Execute the script. """ - # Set read ahead flag - self._read_ahead = True + # Open logfile + self._logFileOpen() + + # Read ahead output parameters + self._read_ahead(True) # Run the script self.run() @@ -465,8 +467,5 @@ if __name__ == '__main__': # Create instance of application app = cstsmapmerge(sys.argv) - # Open logfile - app._logFileOpen() - # Execute application app.execute()