asteroid_spinprops 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

asteroid_spinprops/ssolib/.ruff_cache/.gitignore

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

asteroid_spinprops/ssolib/.ruff_cache/CACHEDIR.TAG

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

asteroid_spinprops/ssolib/periodest.py

@@ -86,6 +86,109 @@ def get_period_estimate(residuals_dataframe, p_min=0.03, p_max=2):
     )
 
 
+def get_multiband_period_estimate(
+    residuals_dataframe, p_min=0.03, p_max=2, k_free=True, k_val=None
+):
+    period_min, period_max = p_min, p_max
+    period_range = (period_min, period_max)
+    results = []
+    residuals = np.zeros(len(residuals_dataframe["filters"].values))
+    bands = np.unique(residuals_dataframe["filters"].values)
+    if k_free:
+        for k in range(1, 11):
+            model = LombScargleMultiband(
+                residuals_dataframe["jd"].values,
+                residuals_dataframe["residuals"].values,
+                residuals_dataframe["filters"].values,
+                residuals_dataframe["sigma"].values,
+                normalization="standard",
+                fit_mean=True,
+                nterms_base=k,
+                nterms_band=1,
+            )
+            frequency, power = model.autopower(
+                method="fast",
+                sb_method="fastnifty_chi2",
+                minimum_frequency=1 / period_range[1],
+                maximum_frequency=1 / period_range[0],
+                samples_per_peak=5,
+            )
+
+            f_best = frequency[np.argmax(power)]
+            y_model = model.model(
+                residuals_dataframe["jd"].values, f_best, bands_fit=bands
+            )
+
+            # y_model.shape is (n_bands, len(time))
+
+            for n, f in enumerate(bands):
+                bindex = np.where(residuals_dataframe["filters"].values == f)
+                residuals[bindex] = (
+                    residuals_dataframe["residuals"].values[bindex] - y_model[n][bindex]
+                )
+
+            rms = np.sqrt(np.mean(residuals**2))
+            n_params = 2 * k + 1 + 3 * len(bands)
+            dof = len(residuals) - n_params
+
+            results.append((k, f_best, rms, dof, n_params))
+
+        model_comparison = pd.DataFrame()
+
+        for i in range(len(results) - 1):
+            k, f_best, rss, dof, n_params = results[i]
+            k_next, f_best_next, rss_next, dof_next, n_params_next = results[i + 1]
+            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(
+                q=0.99,
+                dfn=n_params_next - n_params,
+                dfd=len(residuals) - n_params_next,
+            )
+
+            model_comparison.loc[i, "k"] = k
+            model_comparison.loc[i, "k_next"] = k_next
+            model_comparison.loc[i, "f_best"] = f_best
+            model_comparison.loc[i, "Fstat"] = F
+            model_comparison.loc[i, "alpha_crit"] = crit
+
+        cond = model_comparison["Fstat"] > model_comparison["alpha_crit"]
+        model_comparison = model_comparison[
+            ~cond
+        ]  # don't go for the more complex model
+        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,
+            residuals_dataframe["residuals"].values,
+            residuals_dataframe["filters"].values,
+            residuals_dataframe["sigma"].values,
+            normalization="standard",
+            fit_mean=True,
+            nterms_base=k_val,
+            nterms_band=1,
+        )
+        frequency, power = model.autopower(
+            method="fast",
+            sb_method="fastnifty_chi2",
+            minimum_frequency=1 / period_range[1],
+            maximum_frequency=1 / period_range[0],
+            samples_per_peak=5,
+        )
+
+        f_best = frequency[np.argmax(power)]
+        f_chosen = f_best
+    period_in = 2 * (1 / f_chosen)
+
+    return period_in, k_val
+
+
 def plot_periodograms(signal, window, name=None, axis="frequency"):
     if name is not None:
         r = rocks.Rock(name, datacloud="spins")
@@ -231,18 +334,30 @@ def plot_periodograms(signal, window, name=None, axis="frequency"):
         plt.tight_layout()
 
 
-def perform_residual_resampling(resid_df):
-    sg, w, _ = get_period_estimate(resid_df)
-    Pog = 48 / sg[2][0]  # in hours
+def perform_residual_resampling(resid_df, p_min, p_max, k=1):
+    if k == 1:
+        sg, w, _ = get_period_estimate(resid_df)
+        Pog = 48 / sg[2][0]  # in hours
 
-    # Bootstrap residuals:
-    Pbs = np.zeros(25)
-    for n in range(25):
-        BS_df = resid_df.sample(n=len(resid_df), replace=True)
-        sg, w, _ = get_period_estimate(BS_df)
-        Pbs[n] = 48 / sg[2][0]
-
-    cond = np.abs(Pog - Pbs) / Pog < 1e-2
-    Nbs = np.sum(np.ones(25)[cond])
+        # Bootstrap residuals:
+        Pbs = np.zeros(25)
+        for n in range(25):
+            BS_df = resid_df.sample(n=len(resid_df), replace=True)
+            sg, w, _ = get_period_estimate(BS_df)
+            Pbs[n] = 48 / sg[2][0]
 
+        cond = np.abs(Pog - Pbs) / Pog < 1e-2
+        Nbs = np.sum(np.ones(25)[cond])
+    if k > 1:
+        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(
+                BS_df, p_min=p_min, p_max=p_max, k_free=False, k_val=k
+            )
+        cond = np.abs(Pog - Pbs) / Pog < 1e-2
+        Nbs = np.sum(np.ones(25)[cond])
     return BS_df, Nbs

{asteroid_spinprops-0.2.20.dist-info → asteroid_spinprops-0.2.22.dist-info}/METADATA

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

{asteroid_spinprops-0.2.20.dist-info → asteroid_spinprops-0.2.22.dist-info}/RECORD

@@ -1,8 +1,11 @@
 asteroid_spinprops/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+asteroid_spinprops/ssolib/.ruff_cache/.gitignore,sha256=njpg8ebsSuYCFcEdVLFxOSdF7CXp3e1DPVvZITY68xY,35
+asteroid_spinprops/ssolib/.ruff_cache/0.13.2/1980339045096230685,sha256=sdFMPj-MpFBvqh6kNKbA3DLSABPaYn625V6O9z99A5U,99
+asteroid_spinprops/ssolib/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
 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=pdGmaQoQi6ihgmwkC5q-S5xyy5Wxa99ueUjDFsL7u-Q,6612
+asteroid_spinprops/ssolib/periodest.py,sha256=9OhjMwiawdjA_p3XaaTU9EFbWQvLtEv5v4cYjmWq6vk,11026
 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 +26,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.20.dist-info/METADATA,sha256=dSdyMHkMr7RQaJh6WMrLrBQlxm8cHeQLAAyxRZY_U9Y,2831
-asteroid_spinprops-0.2.20.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-asteroid_spinprops-0.2.20.dist-info/RECORD,,
+asteroid_spinprops-0.2.22.dist-info/METADATA,sha256=Z9SNXT7wrb9SqBs1G1iUpUXy4aldyVDSvkkotYXo1yE,2831
+asteroid_spinprops-0.2.22.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+asteroid_spinprops-0.2.22.dist-info/RECORD,,