ExoIris 0.23.0__py3-none-any.whl → 0.23.2__py3-none-any.whl

exoiris/exoiris.py

@@ -163,7 +163,7 @@ class ExoIris:
 
     def __init__(self, name: str, ldmodel, data: TSDataGroup | TSData, nk: int = 50, nldc: int = 10, nthreads: int = 1,
                  tmpars: dict | None = None, noise_model: Literal["white", "fixed_gp", "free_gp"] = 'white',
-                 interpolation: Literal['nearest', 'linear', 'pchip', 'makima', 'bspline', 'bspline-quadratic'] = 'makima'):
+                 interpolation: Literal['nearest', 'linear', 'pchip', 'makima', 'bspline', 'bspline-quadratic', 'bspline-cubic'] = 'linear'):
         """
         Parameters
         ----------
@@ -529,6 +529,16 @@ class ExoIris:
         """
         self._tsa.set_k_knots(knot_wavelengths)
 
+    def free_radius_ratio_knot_locations(self, knot_ids: list[int] | ndarray) -> None:
+        """Add the wavelength locations of chosen radius ratio knots to the model as free parameters.
+
+        Parameters
+        ----------
+        knot_ids
+            List of radius ratio knot indices to be made free parameters.
+        """
+        self._tsa.free_k_knot_locations(knot_ids)
+
     def create_dense_radius_ratio_block(self, wlmin: float, wlmax: float) -> None:
         """Create a block of radius ratio knots using the full data resolution.
 

exoiris/tslpf.py

@@ -40,8 +40,9 @@ from numpy import (
     dstack,
     diff,
     ascontiguousarray,
+    nan,
 )
-from numpy.linalg import lstsq
+from numpy.linalg import lstsq, LinAlgError
 from numpy.random import default_rng
 from pytransit.lpf.logposteriorfunction import LogPosteriorFunction
 from pytransit.orbits import as_from_rhop, i_from_ba
@@ -133,11 +134,11 @@ def add_knots(x_new, x_old):
     return sort(concatenate([x_new, x_old]))
 
 
-interpolator_choices = ("bspline", "pchip", "makima", "nearest", "linear", "bspline-quadratic")
+interpolator_choices = ("bspline", "pchip", "makima", "nearest", "linear", "bspline-quadratic", "bspline-cubic")
 
 
-interpolators = {'bspline': ip_bspline, 'bspline-quadratic': ip_bspline_quadratic, 'pchip': ip_pchip,
-                 'makima': ip_makima, 'nearest': ip_nearest, 'linear': ip_linear}
+interpolators = {'bspline': ip_bspline, 'bspline-cubic': ip_bspline, 'bspline-quadratic': ip_bspline_quadratic,
+                 'pchip': ip_pchip, 'makima': ip_makima, 'nearest': ip_nearest, 'linear': ip_linear}
 
 
 def clean_knots(knots, min_distance, lmin=0, lmax=inf):
@@ -181,7 +182,7 @@ def clean_knots(knots, min_distance, lmin=0, lmax=inf):
 class TSLPF(LogPosteriorFunction):
     def __init__(self, runner, name: str, ldmodel, data: TSDataGroup, nk: int = 50, nldc: int = 10, nthreads: int = 1,
                  tmpars = None, noise_model: Literal["white", "fixed_gp", "free_gp"] = 'white',
-                 interpolation: Literal['nearest', 'linear', 'pchip', 'makima', 'bspline', 'bspline-quadratic'] = 'makima'):
+                 interpolation: Literal['nearest', 'linear', 'pchip', 'makima', 'bspline', 'bspline-quadratic', 'bspline-cubic'] = 'linear'):
         super().__init__(name)
         self._runner = runner
         self._original_data: TSDataGroup | None = None
@@ -549,7 +550,14 @@ class TSLPF(LogPosteriorFunction):
             self._mc_chains = fmcn.reshape([mco.shape[0], mco.shape[1], ndn])
             self.sampler = None
 
-    def set_free_k_knots(self, ids):
+    def set_free_k_knots(self, ids: list[int] | ndarray) -> None:
+        """Add the wavelength locations of chosen radius ratio knots as free model parameters.
+
+        Parameters
+        ----------
+        ids : list of int
+            List of radius ratio knot indices to be made free parameters.
+        """
         self.free_k_knot_ids = ids
 
         # Remove existing parameter block if one exists
@@ -749,8 +757,11 @@ class TSLPF(LogPosteriorFunction):
         for i, d in enumerate(self.data):
             for ipv in range(npv):
                 res = d.fluxes / mtransit[i][ipv]
-                coeffs = nlstsq(d.covs, res, d.mask, d._wlmask, d._wls_with_nan)
-                self._baseline_models[i][ipv, :, :] = (d.covs @ coeffs).T
+                try:
+                    coeffs = nlstsq(d.covs, res, d.mask, d._wlmask, d._wls_with_nan)
+                    self._baseline_models[i][ipv, :, :] = (d.covs @ coeffs).T
+                except LinAlgError:
+                    self._baseline_models[i][ipv, :, :] = nan
         return self._baseline_models
 
     def flux_model(self, pv):

exoiris/wlpf.py

@@ -128,7 +128,7 @@ class WhiteLPF(BaseLPF):
         pv = self._local_minimization.x
         a = as_from_rhop(pv[1], pv[0])
         i = i_from_ba(pv[2], a)
-        t14 = d_from_pkaiews(pv[0], sqrt(pv[4]), a, i, 0., 0., 1, 14)
+        t14 = d_from_pkaiews(pv[0], sqrt(pv[self._start_k2]), a, i, 0., 0., 1, 14)
         return t14
 
     def plot(self, axs=None, figsize=None, ncols=2) -> Figure:

{exoiris-0.23.0.dist-info → exoiris-0.23.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ExoIris
-Version: 0.23.0
+Version: 0.23.2
 Summary: Easy and robust exoplanet transmission spectroscopy.
 Author-email: Hannu Parviainen <hannu@iac.es>
 License: GPLv3

{exoiris-0.23.0.dist-info → exoiris-0.23.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 exoiris/__init__.py,sha256=LU5jAE7_OVPLHFO0UAOGS0e0wuWV6rdSD0Qveet11K8,1147
 exoiris/binning.py,sha256=-Y9hdK0jZj8DOS82keaprneid2lZ4rCx-keWlKi0LP8,6455
 exoiris/ephemeris.py,sha256=dthBkJztT5yAP6VnnO7jGvxikboFUQBUGPUfBCFrA3w,1316
-exoiris/exoiris.py,sha256=-N0fvkHRIUftkSNXaD1ioWeylG7vAb7gtTWWMQtNdDQ,60956
+exoiris/exoiris.py,sha256=zu-_RP1DvHUjvNNT81PBpsVd8aMrAZ134vBveJ4Z6HA,61355
 exoiris/ldtkld.py,sha256=7H1r1xail3vSKdsNKorMTqivnRKU9WrOVH-uE4Ky2jM,3495
 exoiris/loglikelihood.py,sha256=lVm7kMyzy-xxP5VvZMV7kJY3KovbhlEz3u_6O7R6zgI,6309
 exoiris/spotmodel.py,sha256=9-DxvVzGzxf6AjQfrzZreyJB4Htw0gsIAD3nWl0tQMc,7160
 exoiris/tsdata.py,sha256=s3R6sByy7Ud26F3TdaRaXNQi-rYeJHnm7XHk2FLd1Go,36622
-exoiris/tslpf.py,sha256=iBagXEuTp2vNuH9jpGMXP7Ti5N9Hz0vzchaZpdD5Mr4,33343
+exoiris/tslpf.py,sha256=DcnwuqFNL0ZW9RLWmppJxN6UOlrtdQAzd21ZedfA6Es,33830
 exoiris/tsmodel.py,sha256=6NaGY48fWHUT_7ti6Ao618PN-LgyoIhfQd8lZQqZ7hU,5160
 exoiris/util.py,sha256=uNv_c3Kuv1lml8MuDAuyElO4s3f1tRIQ1QMlLaI7Yak,5921
-exoiris/wlpf.py,sha256=g6h1cLk2-nKD8u_FzwXNVVGFK4dry8fBr0A70LA5gJw,6281
-exoiris-0.23.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-exoiris-0.23.0.dist-info/METADATA,sha256=fiRuio6EYjCval6pR1nV31KdL2wjvlgQxGMyOL743Hc,5084
-exoiris-0.23.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-exoiris-0.23.0.dist-info/top_level.txt,sha256=EoNxT6c5mQDcM0f_LUQB-ETsYg03lNaV3o2L_Yc6-aE,8
-exoiris-0.23.0.dist-info/RECORD,,
+exoiris/wlpf.py,sha256=ixEsDXLHSglYOWhJKA87NJPrLWqhEk4DYhn1IaShN8U,6294
+exoiris-0.23.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+exoiris-0.23.2.dist-info/METADATA,sha256=j_sUV7HhzWwtgZpN9PPItE3M4fdJufnsRO1YIRav_U8,5084
+exoiris-0.23.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+exoiris-0.23.2.dist-info/top_level.txt,sha256=EoNxT6c5mQDcM0f_LUQB-ETsYg03lNaV3o2L_Yc6-aE,8
+exoiris-0.23.2.dist-info/RECORD,,