From 07c8ec4aa9754c6663fb6c9458c2a344838052ca Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Mon, 23 Oct 2017 17:06:11 +0200 Subject: [PATCH] Use self.__class__.__name__ instead of class name strings in cscripts --- configure.ac | 4 ++-- cscripts/csebins.py | 2 +- cscripts/cslightcrv.py | 2 +- cscripts/csmodelselect.py | 2 +- cscripts/csobs2caldb.py | 2 +- cscripts/csobsinfo.py | 2 +- cscripts/csobsselect.py | 2 +- cscripts/csphagen.py | 2 +- cscripts/csphasecrv.py | 2 +- cscripts/cspull.py | 2 +- cscripts/csresmap.py | 2 +- cscripts/cssens.py | 2 +- cscripts/csspec.py | 2 +- cscripts/cstsdist.py | 2 +- cscripts/cstsmapsplit.py | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 8851bd1..ee4482d 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ AC_INIT([ctools], [1.5.0.dev1], [jurgen.knodlseder@irap.omp.eu], [ctools]) AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) AC_CONFIG_MACRO_DIR([m4]) #AM_INIT_AUTOMAKE([gnu no-dependencies foreign]) -#AM_INIT_AUTOMAKE([gnu -Wno-portability foreign]) -AM_INIT_AUTOMAKE([gnu -Wno-portability foreign serial-tests]) +AM_INIT_AUTOMAKE([gnu -Wno-portability foreign]) +#AM_INIT_AUTOMAKE([gnu -Wno-portability foreign serial-tests]) AC_CONFIG_HEADER([config.h]) diff --git a/cscripts/csebins.py b/cscripts/csebins.py index 79d2d87..2760cd2 100755 --- a/cscripts/csebins.py +++ b/cscripts/csebins.py @@ -38,7 +38,7 @@ class csebins(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csebins', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Set members self._ebounds = gammalib.GEbounds() diff --git a/cscripts/cslightcrv.py b/cscripts/cslightcrv.py index 307410c..880454b 100755 --- a/cscripts/cslightcrv.py +++ b/cscripts/cslightcrv.py @@ -69,7 +69,7 @@ class cslightcrv(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('cslightcrv', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise some members self._srcname = '' diff --git a/cscripts/csmodelselect.py b/cscripts/csmodelselect.py index 9d8b85f..affa6dc 100755 --- a/cscripts/csmodelselect.py +++ b/cscripts/csmodelselect.py @@ -37,7 +37,7 @@ class csmodelselect(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csmodelselect', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Set name # Initialise class members diff --git a/cscripts/csobs2caldb.py b/cscripts/csobs2caldb.py index 00c81e4..74c12f8 100755 --- a/cscripts/csobs2caldb.py +++ b/cscripts/csobs2caldb.py @@ -47,7 +47,7 @@ class csobs2caldb(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csobs2caldb', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise members self._observation = gammalib.GCTAObservation() diff --git a/cscripts/csobsinfo.py b/cscripts/csobsinfo.py index 8e0c2cb..2d4458e 100755 --- a/cscripts/csobsinfo.py +++ b/cscripts/csobsinfo.py @@ -37,7 +37,7 @@ class csobsinfo(ctools.csobservation): Constructor. """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csobsinfo', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise class members self._obj_dir = None diff --git a/cscripts/csobsselect.py b/cscripts/csobsselect.py index 01c213b..470f8a0 100755 --- a/cscripts/csobsselect.py +++ b/cscripts/csobsselect.py @@ -37,7 +37,7 @@ class csobsselect(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csobsselect', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Return return diff --git a/cscripts/csphagen.py b/cscripts/csphagen.py index 06cc068..2810210 100755 --- a/cscripts/csphagen.py +++ b/cscripts/csphagen.py @@ -39,7 +39,7 @@ class csphagen(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csphagen', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise other variables self._ebounds = gammalib.GEbounds() diff --git a/cscripts/csphasecrv.py b/cscripts/csphasecrv.py index 008158f..194bddb 100755 --- a/cscripts/csphasecrv.py +++ b/cscripts/csphasecrv.py @@ -57,7 +57,7 @@ class csphasecrv(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csphasecrv', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise some members. Phases are stored in a nested list # [[ph1min,ph1max], [ph2min,ph2max],..] diff --git a/cscripts/cspull.py b/cscripts/cspull.py index 5c1893a..84ce150 100755 --- a/cscripts/cspull.py +++ b/cscripts/cspull.py @@ -38,7 +38,7 @@ class cspull(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('cspull', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise some members self._edisp = False diff --git a/cscripts/csresmap.py b/cscripts/csresmap.py index ab286cc..a5aab3b 100755 --- a/cscripts/csresmap.py +++ b/cscripts/csresmap.py @@ -38,7 +38,7 @@ class csresmap(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csresmap', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise class members self._resmap = None diff --git a/cscripts/cssens.py b/cscripts/cssens.py index f380784..e55589a 100755 --- a/cscripts/cssens.py +++ b/cscripts/cssens.py @@ -48,7 +48,7 @@ class cssens(ctools.csobservation): Constructor. """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('cssens', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise class members self._ebounds = gammalib.GEbounds() diff --git a/cscripts/csspec.py b/cscripts/csspec.py index 3f9518f..67993d2 100755 --- a/cscripts/csspec.py +++ b/cscripts/csspec.py @@ -40,7 +40,7 @@ class csspec(ctools.csobservation): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('csspec', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise data members self._ebounds = gammalib.GEbounds() diff --git a/cscripts/cstsdist.py b/cscripts/cstsdist.py index 6b4ebcc..41351d7 100755 --- a/cscripts/cstsdist.py +++ b/cscripts/cstsdist.py @@ -40,7 +40,7 @@ class cstsdist(ctools.csobservation): Constructor. """ # Initialise application by calling the appropriate class constructor - self._init_csobservation('cstsdist', ctools.__version__, argv) + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) # Initialise some members self._srcname = '' diff --git a/cscripts/cstsmapsplit.py b/cscripts/cstsmapsplit.py index 9544074..961710f 100755 --- a/cscripts/cstsmapsplit.py +++ b/cscripts/cstsmapsplit.py @@ -45,7 +45,7 @@ class cstsmapsplit(ctools.cslikelihood): Constructor """ # Initialise application by calling the appropriate class constructor - self._init_cslikelihood('cstsmapsplit', ctools.__version__, argv) + self._init_cslikelihood(self.__class__.__name__, ctools.__version__, argv) # Set data members self._outmap = gammalib.GFilename() -- libgit2 0.21.4