asteroid_spinprops 0.2.23__tar.gz → 0.2.25__tar.gz

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

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

{asteroid_spinprops-0.2.23 → asteroid_spinprops-0.2.25}/asteroid_spinprops/ssolib/modelfit.py

@@ -100,10 +100,20 @@ def get_fit_params(
                     pole_md["dec_init"] = [dec_init]
 
                     ra_fin, dec_fin = [], []
+
+                H_value = next(
+                    (
+                        shg1g2_params.get(f"H_{i}")
+                        for i in range(1, 7)
+                        if f"H_{i}" in shg1g2_params
+                    ),
+                    None,
+                )
+
                 for ra, dec in zip(ra_init, dec_init):
                     for period_in in period_scan:
                         p_in = [
-                            shg1g2_params["H_1"],
+                            shg1g2_params[H_value],
                             0.15,
                             0.15,  # G1,2
                             np.radians(ra),

{asteroid_spinprops-0.2.23 → asteroid_spinprops-0.2.25}/asteroid_spinprops/ssolib/periodest.py

@@ -153,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[
@@ -164,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,
@@ -185,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"):
@@ -350,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.23 → asteroid_spinprops-0.2.25}/pyproject.toml

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