asteroid_spinprops 0.2.22__tar.gz → 0.2.24__tar.gz

{asteroid_spinprops-0.2.22 → asteroid_spinprops-0.2.24}/PKG-INFO

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

{asteroid_spinprops-0.2.22 → asteroid_spinprops-0.2.24}/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,
@@ -152,6 +153,7 @@ def get_multiband_period_estimate(
             model_comparison.loc[i, "f_best"] = f_best
             model_comparison.loc[i, "Fstat"] = F
             model_comparison.loc[i, "alpha_crit"] = crit
+            model_comparison.loc[i, "rms"] = rms
 
         cond = model_comparison["Fstat"] > model_comparison["alpha_crit"]
         model_comparison = model_comparison[
@@ -163,6 +165,10 @@ def get_multiband_period_estimate(
         k_val = model_comparison[model_comparison.k == model_comparison.k.min()].k[
             0
         ]  # Simplest model
+        p_rms = model_comparison[model_comparison.k == model_comparison.k.min()].rms[
+            0
+        ]  # Simplest model
+
     if not k_free:
         model = LombScargleMultiband(
             residuals_dataframe["jd"].values,
@@ -184,9 +190,10 @@ def get_multiband_period_estimate(
 
         f_best = frequency[np.argmax(power)]
         f_chosen = f_best
+        p_rms = np.nan
     period_in = 2 * (1 / f_chosen)
 
-    return period_in, k_val
+    return period_in, k_val, p_rms
 
 
 def plot_periodograms(signal, window, name=None, axis="frequency"):
@@ -349,13 +356,13 @@ 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_multiband_period_estimate(
+        Pog, _, _ = 24 / get_multiband_period_estimate(
             resid_df, p_min=p_min, p_max=p_max, k_free=False, k_val=k
         )
         Pbs = np.zeros(25)
         for n in range(25):
             BS_df = resid_df.sample(n=len(resid_df), replace=True)
-            Pbs[n] = 24 / get_multiband_period_estimate(
+            Pbs[n], _, _ = 24 / get_multiband_period_estimate(
                 BS_df, p_min=p_min, p_max=p_max, k_free=False, k_val=k
             )
         cond = np.abs(Pog - Pbs) / Pog < 1e-2

{asteroid_spinprops-0.2.22 → asteroid_spinprops-0.2.24}/pyproject.toml

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

asteroid_spinprops-0.2.22/asteroid_spinprops/ssolib/.ruff_cache/.gitignore

@@ -1,2 +0,0 @@
-# Automatically created by ruff.
-*

asteroid_spinprops-0.2.22/asteroid_spinprops/ssolib/.ruff_cache/CACHEDIR.TAG

@@ -1 +0,0 @@
-Signature: 8a477f597d28d172789f06886806bc55