diff --git a/cscripts/csobsdef.par b/cscripts/csobsdef.par index 35818a9..5f7ac32 100644 --- a/cscripts/csobsdef.par +++ b/cscripts/csobsdef.par @@ -23,6 +23,7 @@ outobs, f, a, obs.xml,,, "Output observation definition XML file" # Common pointing parameter values #================================= duration, r, a, 1800.0,,, "Pointing duration (seconds)" +name, s, h, None,,, "Observation name" caldb, s, h, ,,, "Calibration database" irf, s, h, ,,, "Instrument response function" emin, r, h, UNDEF,,, "Lower energy limit (TeV)" diff --git a/cscripts/csobsdef.py b/cscripts/csobsdef.py index 29ae8c1..cc780c2 100755 --- a/cscripts/csobsdef.py +++ b/cscripts/csobsdef.py @@ -2,7 +2,7 @@ # ========================================================================== # Generation of an observation definition file # -# Copyright (C) 2015-2016 Juergen Knoedlseder +# Copyright (C) 2015-2017 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 @@ -85,7 +85,7 @@ class csobsdef(ctools.cscript): """ # Set name and version self._name = 'csobsdef' - self._version = '1.2.0' + self._version = '1.3.0' # Initialise class members self._obs = gammalib.GObservations() @@ -217,7 +217,7 @@ class csobsdef(ctools.cscript): if 'name' in header: name = self._pntdef[row, header.index('name')] else: - name = 'None' + name = self['name'].string() obs.name(name) # Set observation identifier. If no observation identified was diff --git a/doc/source/users/reference_manual/csobsdef.rst b/doc/source/users/reference_manual/csobsdef.rst index 7962157..732c7c6 100644 --- a/doc/source/users/reference_manual/csobsdef.rst +++ b/doc/source/users/reference_manual/csobsdef.rst @@ -62,6 +62,9 @@ General parameters ``duration [real]`` Duration of observation (in seconds). +``(name = "") [string]`` + Observation name. + ``(caldb = "") [string]`` Calibration database.