Commit 07c8ec4aa9754c6663fb6c9458c2a344838052ca
1 parent
4274a67e
Use self.__class__.__name__ instead of class name strings in cscripts
Showing
15 changed files
with
16 additions
and
16 deletions
configure.ac
| ... | ... | @@ -32,8 +32,8 @@ AC_INIT([ctools], [1.5.0.dev1], [jurgen.knodlseder@irap.omp.eu], [ctools]) |
| 32 | 32 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) |
| 33 | 33 | AC_CONFIG_MACRO_DIR([m4]) |
| 34 | 34 | #AM_INIT_AUTOMAKE([gnu no-dependencies foreign]) |
| 35 | -#AM_INIT_AUTOMAKE([gnu -Wno-portability foreign]) | |
| 36 | -AM_INIT_AUTOMAKE([gnu -Wno-portability foreign serial-tests]) | |
| 35 | +AM_INIT_AUTOMAKE([gnu -Wno-portability foreign]) | |
| 36 | +#AM_INIT_AUTOMAKE([gnu -Wno-portability foreign serial-tests]) | |
| 37 | 37 | AC_CONFIG_HEADER([config.h]) |
| 38 | 38 | |
| 39 | 39 | ... | ... |
cscripts/csebins.py
| ... | ... | @@ -38,7 +38,7 @@ class csebins(ctools.csobservation): |
| 38 | 38 | Constructor |
| 39 | 39 | """ |
| 40 | 40 | # Initialise application by calling the appropriate class constructor |
| 41 | - self._init_csobservation('csebins', ctools.__version__, argv) | |
| 41 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 42 | 42 | |
| 43 | 43 | # Set members |
| 44 | 44 | self._ebounds = gammalib.GEbounds() | ... | ... |
cscripts/cslightcrv.py
| ... | ... | @@ -69,7 +69,7 @@ class cslightcrv(ctools.csobservation): |
| 69 | 69 | Constructor |
| 70 | 70 | """ |
| 71 | 71 | # Initialise application by calling the appropriate class constructor |
| 72 | - self._init_csobservation('cslightcrv', ctools.__version__, argv) | |
| 72 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 73 | 73 | |
| 74 | 74 | # Initialise some members |
| 75 | 75 | self._srcname = '' | ... | ... |
cscripts/csmodelselect.py
| ... | ... | @@ -37,7 +37,7 @@ class csmodelselect(ctools.csobservation): |
| 37 | 37 | Constructor |
| 38 | 38 | """ |
| 39 | 39 | # Initialise application by calling the appropriate class constructor |
| 40 | - self._init_csobservation('csmodelselect', ctools.__version__, argv) | |
| 40 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 41 | 41 | # Set name |
| 42 | 42 | |
| 43 | 43 | # Initialise class members | ... | ... |
cscripts/csobs2caldb.py
| ... | ... | @@ -47,7 +47,7 @@ class csobs2caldb(ctools.csobservation): |
| 47 | 47 | Constructor |
| 48 | 48 | """ |
| 49 | 49 | # Initialise application by calling the appropriate class constructor |
| 50 | - self._init_csobservation('csobs2caldb', ctools.__version__, argv) | |
| 50 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 51 | 51 | |
| 52 | 52 | # Initialise members |
| 53 | 53 | self._observation = gammalib.GCTAObservation() | ... | ... |
cscripts/csobsinfo.py
| ... | ... | @@ -37,7 +37,7 @@ class csobsinfo(ctools.csobservation): |
| 37 | 37 | Constructor. |
| 38 | 38 | """ |
| 39 | 39 | # Initialise application by calling the appropriate class constructor |
| 40 | - self._init_csobservation('csobsinfo', ctools.__version__, argv) | |
| 40 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 41 | 41 | |
| 42 | 42 | # Initialise class members |
| 43 | 43 | self._obj_dir = None | ... | ... |
cscripts/csobsselect.py
| ... | ... | @@ -37,7 +37,7 @@ class csobsselect(ctools.csobservation): |
| 37 | 37 | Constructor |
| 38 | 38 | """ |
| 39 | 39 | # Initialise application by calling the appropriate class constructor |
| 40 | - self._init_csobservation('csobsselect', ctools.__version__, argv) | |
| 40 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 41 | 41 | |
| 42 | 42 | # Return |
| 43 | 43 | return | ... | ... |
cscripts/csphagen.py
| ... | ... | @@ -39,7 +39,7 @@ class csphagen(ctools.csobservation): |
| 39 | 39 | Constructor |
| 40 | 40 | """ |
| 41 | 41 | # Initialise application by calling the appropriate class constructor |
| 42 | - self._init_csobservation('csphagen', ctools.__version__, argv) | |
| 42 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 43 | 43 | |
| 44 | 44 | # Initialise other variables |
| 45 | 45 | self._ebounds = gammalib.GEbounds() | ... | ... |
cscripts/csphasecrv.py
| ... | ... | @@ -57,7 +57,7 @@ class csphasecrv(ctools.csobservation): |
| 57 | 57 | Constructor |
| 58 | 58 | """ |
| 59 | 59 | # Initialise application by calling the appropriate class constructor |
| 60 | - self._init_csobservation('csphasecrv', ctools.__version__, argv) | |
| 60 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 61 | 61 | |
| 62 | 62 | # Initialise some members. Phases are stored in a nested list |
| 63 | 63 | # [[ph1min,ph1max], [ph2min,ph2max],..] | ... | ... |
cscripts/cspull.py
| ... | ... | @@ -38,7 +38,7 @@ class cspull(ctools.csobservation): |
| 38 | 38 | Constructor |
| 39 | 39 | """ |
| 40 | 40 | # Initialise application by calling the appropriate class constructor |
| 41 | - self._init_csobservation('cspull', ctools.__version__, argv) | |
| 41 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 42 | 42 | |
| 43 | 43 | # Initialise some members |
| 44 | 44 | self._edisp = False | ... | ... |
cscripts/csresmap.py
| ... | ... | @@ -38,7 +38,7 @@ class csresmap(ctools.csobservation): |
| 38 | 38 | Constructor |
| 39 | 39 | """ |
| 40 | 40 | # Initialise application by calling the appropriate class constructor |
| 41 | - self._init_csobservation('csresmap', ctools.__version__, argv) | |
| 41 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 42 | 42 | |
| 43 | 43 | # Initialise class members |
| 44 | 44 | self._resmap = None | ... | ... |
cscripts/cssens.py
| ... | ... | @@ -48,7 +48,7 @@ class cssens(ctools.csobservation): |
| 48 | 48 | Constructor. |
| 49 | 49 | """ |
| 50 | 50 | # Initialise application by calling the appropriate class constructor |
| 51 | - self._init_csobservation('cssens', ctools.__version__, argv) | |
| 51 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 52 | 52 | |
| 53 | 53 | # Initialise class members |
| 54 | 54 | self._ebounds = gammalib.GEbounds() | ... | ... |
cscripts/csspec.py
| ... | ... | @@ -40,7 +40,7 @@ class csspec(ctools.csobservation): |
| 40 | 40 | Constructor |
| 41 | 41 | """ |
| 42 | 42 | # Initialise application by calling the appropriate class constructor |
| 43 | - self._init_csobservation('csspec', ctools.__version__, argv) | |
| 43 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 44 | 44 | |
| 45 | 45 | # Initialise data members |
| 46 | 46 | self._ebounds = gammalib.GEbounds() | ... | ... |
cscripts/cstsdist.py
| ... | ... | @@ -40,7 +40,7 @@ class cstsdist(ctools.csobservation): |
| 40 | 40 | Constructor. |
| 41 | 41 | """ |
| 42 | 42 | # Initialise application by calling the appropriate class constructor |
| 43 | - self._init_csobservation('cstsdist', ctools.__version__, argv) | |
| 43 | + self._init_csobservation(self.__class__.__name__, ctools.__version__, argv) | |
| 44 | 44 | |
| 45 | 45 | # Initialise some members |
| 46 | 46 | self._srcname = '' | ... | ... |
cscripts/cstsmapsplit.py
| ... | ... | @@ -45,7 +45,7 @@ class cstsmapsplit(ctools.cslikelihood): |
| 45 | 45 | Constructor |
| 46 | 46 | """ |
| 47 | 47 | # Initialise application by calling the appropriate class constructor |
| 48 | - self._init_cslikelihood('cstsmapsplit', ctools.__version__, argv) | |
| 48 | + self._init_cslikelihood(self.__class__.__name__, ctools.__version__, argv) | |
| 49 | 49 | |
| 50 | 50 | # Set data members |
| 51 | 51 | self._outmap = gammalib.GFilename() | ... | ... |