asteroid_spinprops 1.3.0__py3-none-any.whl → 1.3.2__py3-none-any.whl

asteroid_spinprops/ssolib/modelfit.py

@@ -6,7 +6,7 @@ import asteroid_spinprops.ssolib.periodest as periodest
 
 from fink_utils.sso.spins import (
     estimate_sso_params,
-    func_hg1g2_with_spin,
+    func_shg1g2,
 )
 from asteroid_spinprops.ssolib.periodest import (
     get_multiterm_period_estimate,
@@ -222,7 +222,7 @@ def get_fit_params(
                                 G2 = shg1g2_params[f"G2_{ff}"]
                                 R = shg1g2_params["R"]
 
-                                C = func_hg1g2_with_spin(
+                                C = func_shg1g2(
                                     pha, H, G1, G2, R, np.radians(ra0), np.radians(dec0)
                                 )
 
@@ -401,7 +401,7 @@ def get_fit_params(
                     ra=np.radians(data["ra"].values[0]),
                     dec=np.radians(data["dec"].values[0]),
                     jd=data["cjd"].values[0],
-                    model="SSHG1G2",  # We should call this SOCCA
+                    model="SOCCA",
                     p0=p0,
                 )
                 return Afit
@@ -419,7 +419,7 @@ def get_fit_params(
                         ra=np.radians(data["ra"].values[0]),
                         dec=np.radians(data["dec"].values[0]),
                         jd=data["cjd"].values[0],
-                        model="SSHG1G2",
+                        model="SOCCA",
                         p0=p0,
                         terminator=terminator,
                         ra_s=np.radians(data["ra_s"].values[0]),
@@ -434,7 +434,7 @@ def get_fit_params(
                         ra=np.radians(data["ra"].values[0]),
                         dec=np.radians(data["dec"].values[0]),
                         jd=data["cjd"].values[0],
-                        model="SSHG1G2",
+                        model="SOCCA",
                         p0=p0,
                         terminator=terminator,
                     )
@@ -489,7 +489,7 @@ def get_model_points(data, params):
             np.radians(params["delta0"]),
         ]
 
-        model_points = func_hg1g2_with_spin(
+        model_points = func_shg1g2(
             [
                 np.radians(data["Phase"].values[0][filter_mask]),
                 np.radians(data["ra"].values[0][filter_mask]),

asteroid_spinprops/ssolib/periodest.py

@@ -6,6 +6,8 @@ from scipy.signal import find_peaks
 import nifty_ls  # noqa: F401
 from scipy.stats import f as ftest
 
+import logging
+
 
 def alias_func(x, i, j, p_feat):
     """
@@ -187,13 +189,17 @@ def get_multiterm_period_estimate(
                 nterms_base=k,
                 nterms_band=1,
             )
-            frequency, power = model.autopower(
-                method="fast",
-                sb_method="fastnifty_chi2",
-                minimum_frequency=1 / period_range[1],
-                maximum_frequency=1 / period_range[0],
-                samples_per_peak=5,
-            )
+            try:
+                frequency, power = model.autopower(
+                    method="fast",
+                    sb_method="fastnifty_chi2",
+                    minimum_frequency=1 / period_range[1],
+                    maximum_frequency=1 / period_range[0],
+                    samples_per_peak=5,
+                )
+            except np.linalg.LinAlgError:
+                logging.warning("Singular matrix for k={}".format(k))
+                continue
 
             f_best = frequency[np.argmax(power)]
             y_model = model.model(
@@ -368,15 +374,17 @@ def perform_residual_resampling(resid_df, p_min, p_max, k=1):
         cond = np.abs(Pog - Pbs) / Pog < 1e-2
         Nbs = np.sum(np.ones(25)[cond])
     if k > 1:
-        Pog, _, _ = 24 / get_multiterm_period_estimate(
+        Ptmp, _, _, _, _ = get_multiterm_period_estimate(
             resid_df, p_min=p_min, p_max=p_max, k_free=False, k_val=k
         )
+        Pog = 24 / Ptmp
         Pbs = np.zeros(25)
         for n in range(25):
             BS_df = resid_df.sample(n=len(resid_df), replace=True)
-            Pbs[n], _, _ = 24 / get_multiterm_period_estimate(
+            Ptmp, _, _, _, _ = get_multiterm_period_estimate(
                 BS_df, p_min=p_min, p_max=p_max, k_free=False, k_val=k
             )
+            Pbs[n] = 24 / Ptmp
         cond = np.abs(Pog - Pbs) / Pog < 1e-2
         Nbs = np.sum(np.ones(25)[cond])
     return BS_df, Nbs

{asteroid_spinprops-1.3.0.dist-info → asteroid_spinprops-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asteroid_spinprops
-Version: 1.3.0
+Version: 1.3.2
 Summary: Collection of tools used for fitting sHG1G2 and SOCCA photometric models to sparse asteroid photometry
 License: MIT
 Author: Odysseas
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: astropy (>=6.0)
-Requires-Dist: fink-utils (>=0.47.0)
+Requires-Dist: fink-utils (>=0.48.0)
 Requires-Dist: nifty-ls (>=1.1.0)
 Requires-Dist: pandas (>=2.3)
 Requires-Dist: pyarrow (>=18.1)

{asteroid_spinprops-1.3.0.dist-info → asteroid_spinprops-1.3.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 asteroid_spinprops/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 asteroid_spinprops/ssolib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 asteroid_spinprops/ssolib/dataprep.py,sha256=7PfkVNpLjPERkhr8dZQfN8haFCFmoeXB3fWuTSBLVuc,7848
-asteroid_spinprops/ssolib/modelfit.py,sha256=u-qvKAmR-NLcJD7qQdeF3f0L2rg1-O0z0yXaVFRx5r0,22418
-asteroid_spinprops/ssolib/periodest.py,sha256=OaJcDNBPiNDsDlzTfHInHUFt-7xZS4QbwaCrxKcnl2A,13180
+asteroid_spinprops/ssolib/modelfit.py,sha256=0a1zv_ARCC428WnSKq0qJ6oLKqEZsFt1wiGetmP3jXg,22356
+asteroid_spinprops/ssolib/periodest.py,sha256=dAKytw-Oelb35ZjDXHuxGe5L5H8UPVCX42eU1I0jTIo,13434
 asteroid_spinprops/ssolib/ssptools.py,sha256=DlSgYtXenztRAtEV9d4itzp5OZMjkbXkW2yZ_Qumu4U,4490
 asteroid_spinprops/ssolib/utils.py,sha256=kbe69JxyCnbMebqkObuMS-0DFulnlgLNHxHNbP_U9J4,13334
-asteroid_spinprops-1.3.0.dist-info/METADATA,sha256=z8jhQrXtXaz_ruV46ho-odYTDnR-GgtdxmVGsm8ZjUY,6143
-asteroid_spinprops-1.3.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-asteroid_spinprops-1.3.0.dist-info/RECORD,,
+asteroid_spinprops-1.3.2.dist-info/METADATA,sha256=E9NJbpC-UayGMowZ1dV6-VM2exEGbJIQrouTjjm7pQs,6143
+asteroid_spinprops-1.3.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+asteroid_spinprops-1.3.2.dist-info/RECORD,,