Added noexcept flags to optical package functions and methods.

Author: CnlPepper

raysect/optical/colour.pxd

@@ -31,19 +31,19 @@
 
 from raysect.optical.spectrum cimport Spectrum
 
-cpdef double[:,::1] resample_ciexyz(double min_wavelength, double max_wavelength, int bins)
+cpdef double[:,::1] resample_ciexyz(double min_wavelength, double max_wavelength, int bins) noexcept
 
-cpdef (double, double, double) spectrum_to_ciexyz(Spectrum spectrum, double[:,::1] resampled_xyz=*)
+cpdef (double, double, double) spectrum_to_ciexyz(Spectrum spectrum, double[:,::1] resampled_xyz=*) noexcept
 
-cpdef (double, double, double) ciexyy_to_ciexyz(double cx, double cy, double y)
+cpdef (double, double, double) ciexyy_to_ciexyz(double cx, double cy, double y) noexcept
 
-cpdef (double, double, double) ciexyz_to_ciexyy(double x, double y, double z)
+cpdef (double, double, double) ciexyz_to_ciexyy(double x, double y, double z) noexcept
 
-cdef double srgb_transfer_function(double v)
+cdef double srgb_transfer_function(double v) noexcept
 
-cpdef (double, double, double) ciexyz_to_srgb(double x, double y, double z)
+cpdef (double, double, double) ciexyz_to_srgb(double x, double y, double z) noexcept
 
-cdef double srgb_transfer_function_inverse(double v)
+cdef double srgb_transfer_function_inverse(double v) noexcept
 
-cpdef (double, double, double) srgb_to_ciexyz(double r, double g, double b)
+cpdef (double, double, double) srgb_to_ciexyz(double r, double g, double b) noexcept
 

raysect/optical/colour.pyx

@@ -120,7 +120,7 @@ d65_white = InterpolatedSF(d65_wavelength_samples, d65_white_samples)
 
 @cython.boundscheck(False)
 @cython.wraparound(False)
-cpdef double[:,::1] resample_ciexyz(double min_wavelength, double max_wavelength, int bins):
+cpdef double[:,::1] resample_ciexyz(double min_wavelength, double max_wavelength, int bins) noexcept:
     """
     Pre-calculates samples of XYZ sensitivity curves over desired spectral range.
 
@@ -155,7 +155,7 @@ cpdef double[:,::1] resample_ciexyz(double min_wavelength, double max_wavelength
 @cython.wraparound(False)
 @cython.boundscheck(False)
 @cython.initializedcheck(False)
-cpdef (double, double, double) spectrum_to_ciexyz(Spectrum spectrum, double[:,::1] resampled_xyz=None):
+cpdef (double, double, double) spectrum_to_ciexyz(Spectrum spectrum, double[:,::1] resampled_xyz=None) noexcept:
     """
     Calculates a tuple of CIE X, Y, Z values from an input spectrum
 
@@ -187,7 +187,7 @@ cpdef (double, double, double) spectrum_to_ciexyz(Spectrum spectrum, double[:,::
 
 
 @cython.cdivision(True)
-cpdef (double, double, double) ciexyy_to_ciexyz(double cx, double cy, double y):
+cpdef (double, double, double) ciexyy_to_ciexyz(double cx, double cy, double y) noexcept:
     """
     Performs conversion from CIE xyY to CIE XYZ colour space
 
@@ -202,7 +202,7 @@ cpdef (double, double, double) ciexyy_to_ciexyz(double cx, double cy, double y):
 
 
 @cython.cdivision(True)
-cpdef (double, double, double) ciexyz_to_ciexyy(double x, double y, double z):
+cpdef (double, double, double) ciexyz_to_ciexyy(double x, double y, double z) noexcept:
     """
     Performs conversion from CIE XYZ to CIE xyY colour space
 
@@ -220,7 +220,7 @@ cpdef (double, double, double) ciexyz_to_ciexyy(double x, double y, double z):
     return x / n, y / n, y
 
 
-cdef double srgb_transfer_function(double v):
+cdef double srgb_transfer_function(double v) noexcept:
 
     if v <= 0.0031308:
 
@@ -232,7 +232,7 @@ cdef double srgb_transfer_function(double v):
         return 1.055 * v**0.4166666666666667 - 0.055
 
 
-cpdef (double, double, double) ciexyz_to_srgb(double x, double y, double z):
+cpdef (double, double, double) ciexyz_to_srgb(double x, double y, double z) noexcept:
     """
     Convert CIE XYZ values to sRGB colour space.
 
@@ -266,7 +266,7 @@ cpdef (double, double, double) ciexyz_to_srgb(double x, double y, double z):
     return r, g, b
 
 
-cdef double srgb_transfer_function_inverse(double v):
+cdef double srgb_transfer_function_inverse(double v) noexcept:
 
     if v <= 0.04045:
 
@@ -279,7 +279,7 @@ cdef double srgb_transfer_function_inverse(double v):
         return (0.9478672985781991 * (v + 0.055))**2.4
 
 
-cpdef (double, double, double) srgb_to_ciexyz(double r, double g, double b):
+cpdef (double, double, double) srgb_to_ciexyz(double r, double g, double b) noexcept:
     """
     Convert sRGB values to CIE XYZ colour space.
 

raysect/optical/library/spectra/blackbody.pyx

@@ -88,7 +88,7 @@ cdef class BlackBody(NumericallyIntegratedSF):
         return self.__new__, (self.__class__, ), self.__getstate__()
 
     @cython.cdivision(True)
-    cpdef double function(self, double wavelength):
+    cpdef double function(self, double wavelength) noexcept:
         """
         Planck's Law.
          

raysect/optical/material/conductor.pxd

@@ -40,7 +40,7 @@ cdef class Conductor(Material):
         public SpectralFunction index
         public SpectralFunction extinction
 
-    cdef double _fresnel(self, double ci, double n, double k) nogil
+    cdef double _fresnel(self, double ci, double n, double k) noexcept nogil
 
 
 cdef class RoughConductor(ContinuousBSDF):
@@ -50,8 +50,8 @@ cdef class RoughConductor(ContinuousBSDF):
         public SpectralFunction extinction
         double _roughness
 
-    cdef double _d(self, Vector3D s_half)
-    cdef double _g(self, Vector3D s_incoming, Vector3D s_outgoing)
-    cdef double _g1(self, Vector3D v)
+    cdef double _d(self, Vector3D s_half) noexcept
+    cdef double _g(self, Vector3D s_incoming, Vector3D s_outgoing) noexcept
+    cdef double _g1(self, Vector3D v) noexcept
     cdef Spectrum _f(self, Spectrum spectrum, Vector3D s_outgoing, Vector3D s_normal)
-    cdef double _fresnel_conductor(self, double ci, double n, double k) nogil
+    cdef double _fresnel_conductor(self, double ci, double n, double k) noexcept nogil

raysect/optical/material/conductor.pyx

@@ -134,7 +134,7 @@ cdef class Conductor(Material):
         return spectrum
 
     @cython.cdivision(True)
-    cdef double _fresnel(self, double ci, double n, double k) nogil:
+    cdef double _fresnel(self, double ci, double n, double k) noexcept nogil:
 
         cdef double c12, k0, k1, k2, k3
 
@@ -200,7 +200,7 @@ cdef class RoughConductor(ContinuousBSDF):
         self._roughness = value
 
     @cython.cdivision(True)
-    cpdef double pdf(self, Vector3D s_incoming, Vector3D s_outgoing, bint back_face):
+    cpdef double pdf(self, Vector3D s_incoming, Vector3D s_outgoing, bint back_face) noexcept:
 
         cdef Vector3D s_half
 
@@ -283,7 +283,7 @@ cdef class RoughConductor(ContinuousBSDF):
         return self._f(spectrum, s_outgoing, s_half)
 
     @cython.cdivision(True)
-    cdef double _d(self, Vector3D s_half):
+    cdef double _d(self, Vector3D s_half) noexcept:
 
         cdef double r2, h2, k
 
@@ -293,12 +293,12 @@ cdef class RoughConductor(ContinuousBSDF):
         k = h2 * (r2 - 1) + 1
         return r2 / (M_PI * k * k)
 
-    cdef double _g(self, Vector3D s_incoming, Vector3D s_outgoing):
+    cdef double _g(self, Vector3D s_incoming, Vector3D s_outgoing) noexcept:
         # Smith's geometric shadowing model
         return self._g1(s_incoming) * self._g1(s_outgoing)
 
     @cython.cdivision(True)
-    cdef double _g1(self, Vector3D v):
+    cdef double _g1(self, Vector3D v) noexcept:
         # Smith's geometric component (G1) for GGX distribution
         cdef double r2 = self._roughness * self._roughness
         return 2 * v.z / (v.z + sqrt(r2 + (1 - r2) * (v.z * v.z)))
@@ -325,7 +325,7 @@ cdef class RoughConductor(ContinuousBSDF):
         return spectrum
 
     @cython.cdivision(True)
-    cdef double _fresnel_conductor(self, double ci, double n, double k) nogil:
+    cdef double _fresnel_conductor(self, double ci, double n, double k) noexcept nogil:
 
         cdef double c12, k0, k1, k2, k3
 

raysect/optical/material/dielectric.pxd

@@ -48,4 +48,4 @@ cdef class Dielectric(Material):
         public SpectralFunction transmission
         public bint transmission_only
 
-    cdef void _fresnel(self, double ci, double ct, double n1, double n2, double *reflectivity, double *transmission) nogil
+    cdef void _fresnel(self, double ci, double ct, double n1, double n2, double *reflectivity, double *transmission) noexcept nogil

raysect/optical/material/dielectric.pyx

@@ -100,7 +100,7 @@ cdef class Sellmeier(NumericallyIntegratedSF):
         return self.__new__, (self.__class__, ), self.__getstate__()
 
     @cython.cdivision(True)
-    cpdef double function(self, double wavelength):
+    cpdef double function(self, double wavelength) noexcept:
         """
         Returns a sample of the three term Sellmeier equation at the specified
         wavelength.
@@ -302,7 +302,7 @@ cdef class Dielectric(Material):
             return spectrum
 
     @cython.cdivision(True)
-    cdef void _fresnel(self, double ci, double ct, double n1, double n2, double *reflectivity, double *transmission) nogil:
+    cdef void _fresnel(self, double ci, double ct, double n1, double n2, double *reflectivity, double *transmission) noexcept nogil:
 
         reflectivity[0] = 0.5 * (((n1*ci - n2*ct) / (n1*ci + n2*ct))**2 + ((n1*ct - n2*ci) / (n1*ct + n2*ci))**2)
         transmission[0] = 1 - reflectivity[0]

raysect/optical/material/emitter/checkerboard.pxd

@@ -43,4 +43,4 @@ cdef class Checkerboard(NullVolume):
         public double scale1
         public double scale2
 
-    cdef bint _flip(self, bint v, double p) nogil
+    cdef bint _flip(self, bint v, double p) noexcept nogil

raysect/optical/material/emitter/checkerboard.pyx

@@ -128,7 +128,7 @@ cdef class Checkerboard(NullVolume):
         return spectrum
 
     @cython.cdivision(True)
-    cdef bint _flip(self, bint v, double p) nogil:
+    cdef bint _flip(self, bint v, double p) noexcept nogil:
 
         # round to avoid numerical precision issues (rounds to nearest nanometer)
         p = round(p * 1e9) / 1e9

raysect/optical/material/lambert.pyx

@@ -68,7 +68,7 @@ cdef class Lambert(ContinuousBSDF):
             reflectivity = ConstantSF(0.5)
         self.reflectivity = reflectivity
 
-    cpdef double pdf(self, Vector3D s_incoming, Vector3D s_outgoing, bint back_face):
+    cpdef double pdf(self, Vector3D s_incoming, Vector3D s_outgoing, bint back_face) noexcept:
         return hemisphere_sampler.pdf(s_outgoing)
 
     cpdef Vector3D sample(self, Vector3D s_incoming, bint back_face):