asteroid_spinprops 0.2.21__py3-none-any.whl → 0.2.23__py3-none-any.whl

asteroid_spinprops/ssolib/periodest.py

@@ -7,6 +7,7 @@ import matplotlib.pyplot as plt
 from astropy.timeseries import LombScargleMultiband, LombScargle
 from scipy.signal import find_peaks
 import nifty_ls  # noqa: F401
+from scipy.stats import f as ftest
 
 
 def alias_func(x, i, j, p_feat):
@@ -121,8 +122,8 @@ def get_multiband_period_estimate(
 
             # y_model.shape is (n_bands, len(time))
 
-            for n, f in enumerate(bands):
-                bindex = np.where(residuals_dataframe["filters"].values == f)
+            for n, ff in enumerate(bands):
+                bindex = np.where(residuals_dataframe["filters"].values == ff)
                 residuals[bindex] = (
                     residuals_dataframe["residuals"].values[bindex] - y_model[n][bindex]
                 )
@@ -141,7 +142,7 @@ def get_multiband_period_estimate(
             F = ((rss - rss_next) / (dof - dof_next)) / (rss_next / dof_next)
 
             # Here crit = Fstat value for which model_2 (more complex) is in fact better than model_1 (less complex)
-            crit = f.ppf(
+            crit = ftest.ppf(
                 q=0.99,
                 dfn=n_params_next - n_params,
                 dfd=len(residuals) - n_params_next,
@@ -160,6 +161,9 @@ def get_multiband_period_estimate(
         f_chosen = model_comparison[
             model_comparison.k == model_comparison.k.min()
         ].f_best[0]  # Simplest model
+        k_val = model_comparison[model_comparison.k == model_comparison.k.min()].k[
+            0
+        ]  # Simplest model
     if not k_free:
         model = LombScargleMultiband(
             residuals_dataframe["jd"].values,
@@ -183,7 +187,7 @@ def get_multiband_period_estimate(
         f_chosen = f_best
     period_in = 2 * (1 / f_chosen)
 
-    return period_in
+    return period_in, k_val
 
 
 def plot_periodograms(signal, window, name=None, axis="frequency"):

{asteroid_spinprops-0.2.21.dist-info → asteroid_spinprops-0.2.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asteroid_spinprops
-Version: 0.2.21
+Version: 0.2.23
 Summary: Collection of tools used for fitting sHG1G2 and ssHG1G2 photometric models to sparse asteroid photometry
 License: MIT
 Author: Odysseas

{asteroid_spinprops-0.2.21.dist-info → asteroid_spinprops-0.2.23.dist-info}/RECORD

@@ -2,7 +2,7 @@ asteroid_spinprops/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 asteroid_spinprops/ssolib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 asteroid_spinprops/ssolib/dataprep.py,sha256=s4bXDCU15IsdIg9uLwFuO2VEGCxewrXkFIQolG8mKao,18716
 asteroid_spinprops/ssolib/modelfit.py,sha256=uPtWthzuiYVbabxIy_osQkKZQ6v6G8KYhY0nrMpJpy8,18826
-asteroid_spinprops/ssolib/periodest.py,sha256=na9xQzGrfXI2xZcj5x_3HZ75RcO5CfdDFIceOAkc4k4,10893
+asteroid_spinprops/ssolib/periodest.py,sha256=EPJSS7cEQRktt9rS0T6pe8QgHwCese7iSSFt67-JNy0,11067
 asteroid_spinprops/ssolib/pipetools.py,sha256=DNu4mg8M69c2SHc2KHR5lsshNdsskeB7vNsZad_H0mo,5338
 asteroid_spinprops/ssolib/ssptools.py,sha256=DlSgYtXenztRAtEV9d4itzp5OZMjkbXkW2yZ_Qumu4U,4490
 asteroid_spinprops/ssolib/testing/atlas_x_ztf_testing/test_pqfile_1.parquet,sha256=qVTCAlpBZLNxCwuKAMwKdjh9yeHFvfrQcr-ebFMQOVI,56455
@@ -23,6 +23,6 @@ asteroid_spinprops/ssolib/testing/ephemeris_testing/Poullain,sha256=_KgyYqgy01zK
 asteroid_spinprops/ssolib/testing/ephemeris_testing/Sonneberga,sha256=ER9ysLNa0kpGP78jM4SpHLLIbHpiDlIAXJ88eqw3gRU,700347
 asteroid_spinprops/ssolib/testing/testing_ssoname_keys.pkl,sha256=-gnpow_I4uTpPXlF9sLcVJ2YixWp5YXJHkVHIMjtOzo,241
 asteroid_spinprops/ssolib/utils.py,sha256=Re8VQMikHFxGX9PPnIGTPBuwJvuX6pMyujaNnfSCwVE,12390
-asteroid_spinprops-0.2.21.dist-info/METADATA,sha256=f6HYKQ4MPdwt7K62FRRjll-29g9Jm_2vSQZx1-qvZqA,2831
-asteroid_spinprops-0.2.21.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-asteroid_spinprops-0.2.21.dist-info/RECORD,,
+asteroid_spinprops-0.2.23.dist-info/METADATA,sha256=kjbxR4WmZvtjjO7lzlckLgr-aIhyho69DHdf2ghjDe0,2831
+asteroid_spinprops-0.2.23.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+asteroid_spinprops-0.2.23.dist-info/RECORD,,