Changed 'raise gammalib.GException' to 'raise RuntimeError' in all occurences in cscripts

Jürgen Knödlseder
1 parent ea01af0f
Showing 6 changed files with 11 additions and 8 deletions
ChangeLog
NEWS
cscripts/csobsdef.py
cscripts/cssens.py
cscripts/csspec.py
cscripts/cstsdist.py
-2015-12-16  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2015-12-17  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
  
         * Version 1.0.0 released
         ========================
  
         Update end-user documentation
+        Change GException to RuntimeError in cscripts (#1604)
         Adapt to GammaLib interface changs (#1603)
         Implement handling of stacked data in csspec (#1566)
         Resolve Python test problem on El Capitan (#1563)
@@ -2,7 +2,7 @@ New Features and Important Changes in ctools 1.0.0
  
 Author(s) : Juergen Knoedlseder
  
-16 December 2015
+17 December 2015
  
  
 1. Introduction
@@ -111,6 +111,9 @@ requested energy binning, it selects for each spectral energy bin the
 relevant energy bins from the counts cube and performs a maximum likelihood
 analysis.
  
+All GExceptions are replaced by Python RuntimeErrors as the GException
+classes are not exposed to Python.
+
  
 20. Examples
 ------------
@@ -249,8 +249,7 @@ class csobsdef(ctools.cscript):
                 pntdir = gammalib.GSkyDir()
                 pntdir.lb_deg(lon,lat)
             else:
-                raise gammalib.GException.invalid_value(self.name,
-                      "No (ra,dec) or (lon,lat) columns found in pointing"
+                raise RuntimeError("No (ra,dec) or (lon,lat) columns found in pointing"
                       " definition file.")
             obs.pointing(gammalib.GCTAPointing(pntdir))
  
@@ -241,7 +241,7 @@ class cssens(ctools.cscript):
             else:
                 msg = "Invalid sensitivity type \""+self.m_type+"\" encountered."+ \
                       " Either use \"Differential\" or \"Integral\"."
-                raise gammalib.GException.invalid_value("cssens", msg)
+                raise RuntimeError(msg)
  
             # Determine sensitivity
             result = self.get_sensitivity(self.obs, emin, emax,
@@ -347,7 +347,7 @@ class cssens(ctools.cscript):
         if not model.has_par("Prefactor"):
             msg = "Model \""+self.m_srcname+"\" has no parameter \"Prefactor\"."+ \
                   " Only spectral models with a \"Prefactor\" parameter are supported."
-            raise gammalib.GException.invalid_value("cssens", msg)
+            raise RuntimeError(msg)
  
         # Set source position
         if self.m_ra != None and self.m_dec != None:
@@ -206,7 +206,7 @@ class csspec(ctools.cscript):
                       "cube does not overlap with specified energy range ["+ \
                       str(emin)+", "+str(emax)+"]. Specify "+ \
                       "overlapping energy range."
-                raise gammalib.GException.invalid_argument("csspec", msg)
+                raise RuntimeError(msg)
  
             # Determine number of layers to use for each spectral bin
             n_layers = int(len(use_layers) / self.m_enumbins)
@@ -275,7 +275,7 @@ class cstsdist(ctools.cscript):
         if not model.has_par("Prefactor"):
             msg = "Model \""+self.m_srcname+"\" has no parameter \"Prefactor\"."+ \
                   " Only spectral models with a \"Prefactor\" parameter are supported."
-            raise gammalib.GException.invalid_value("cssens", msg)
+            raise RuntimeError(msg)
  
         # Fit or fix spatial parameters
         if fitpos: