asteroid_spinprops 0.2.21__tar.gz → 0.2.23__tar.gz

{asteroid_spinprops-0.2.21 → asteroid_spinprops-0.2.23}/PKG-INFO

@@ -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 → asteroid_spinprops-0.2.23}/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 → asteroid_spinprops-0.2.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "asteroid_spinprops"
-version = "0.2.21"
+version = "0.2.23"
 description = "Collection of tools used for fitting sHG1G2 and ssHG1G2 photometric models to sparse asteroid photometry"
 authors = [
     {name = "Odysseas",email = "odysseas.xenos@proton.me"}