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

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/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.dist-info → asteroid_spinprops-0.2.25.dist-info}/METADATA

@@ -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.dist-info → asteroid_spinprops-0.2.25.dist-info}/RECORD

@@ -1,8 +1,8 @@
 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=s4bXDCU15IsdIg9uLwFuO2VEGCxewrXkFIQolG8mKao,18716
-asteroid_spinprops/ssolib/modelfit.py,sha256=uPtWthzuiYVbabxIy_osQkKZQ6v6G8KYhY0nrMpJpy8,18826
-asteroid_spinprops/ssolib/periodest.py,sha256=EPJSS7cEQRktt9rS0T6pe8QgHwCese7iSSFt67-JNy0,11067
+asteroid_spinprops/ssolib/modelfit.py,sha256=MYmGcN6Ywp8mvMZ1wzuc1t4JEv97NUmBzmaii1MZeJg,19101
+asteroid_spinprops/ssolib/periodest.py,sha256=EyFNBMk3eO9fI3ItZOsyvpVhBStc5bM7qaE7zJCURp8,11287
 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.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,,
+asteroid_spinprops-0.2.25.dist-info/METADATA,sha256=GTqam6_8FMmrwKnYGh-sX3h0fZmhHTZn87IYgndgc4I,2831
+asteroid_spinprops-0.2.25.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+asteroid_spinprops-0.2.25.dist-info/RECORD,,