asteroid_spinprops 1.2.5__py3-none-any.whl → 1.3.0__py3-none-any.whl

asteroid_spinprops/ssolib/modelfit.py

@@ -11,6 +11,7 @@ from fink_utils.sso.spins import (
 from asteroid_spinprops.ssolib.periodest import (
     get_multiterm_period_estimate,
 )
+import time
 
 
 def get_fit_params(
@@ -24,6 +25,7 @@ def get_fit_params(
     period_in=None,
     period_quality_flag=False,
     terminator=False,
+    time_me=True,
 ):
     """
     Fit a small solar system object's photometric data using SHG1G2 or SOCCA models.
@@ -52,7 +54,7 @@ def get_fit_params(
         If True, perform a small grid search over initial periods. Default True.
     pole_blind : bool, optional
         If True, perform a grid search over 12 initial poles all over a sphere. Default True.
-        If False, produce the sHG1G2 rms error landscape and initialize SOCCA poles on its local minima     
+        If False, produce the sHG1G2 rms error landscape and initialize SOCCA poles on its local minima
     p0 : list, optional
         Initial guess parameters for the fit. Required if `shg1g2_constrained=False`.
     alt_spin : bool, optional
@@ -63,6 +65,8 @@ def get_fit_params(
         Provide bootstrap score, alias/true (0/1) flags and period fit rms for the period estimates
     terminator : bool, optional
         If True, include self-shading in the fit. Default False.
+    time_me : bool, optional
+        If True, include timing (in seconds). Default True.
 
     Returns
     -------
@@ -86,7 +90,8 @@ def get_fit_params(
     ValueError
         If `flavor` is not 'SHG1G2' or 'SOCCA'.
     """
-
+    if time_me:
+        t1 = time.time()
     if flavor == "SHG1G2":
         if p0 is None:
             Afit = estimate_sso_params(
@@ -110,19 +115,24 @@ def get_fit_params(
                 model="SHG1G2",
                 p0=p0,
             )
-
+        if time_me:
+            t2 = time.time()
+            etime = t2 - t1
+            Afit["invtime"] = etime
         return Afit
     if flavor == "SOCCA":
         if shg1g2_constrained is True:
-            shg1g2_params = get_fit_params(
-                data=data, flavor="SHG1G2"
-            )
+            shg1g2_params = get_fit_params(data=data, flavor="SHG1G2")
             try:
                 residuals_dataframe = make_residuals_df(
                     data, model_parameters=shg1g2_params
                 )
             except Exception:
                 SOCCA_opt = {"Failed at period search preliminary steps": 1}
+                if time_me:
+                    t2 = time.time()
+                    etime = t2 - t1
+                    SOCCA_opt["invtime"] = etime
                 return SOCCA_opt
             if period_in is None:
                 # Period search boundaries (in days)
@@ -135,8 +145,11 @@ def get_fit_params(
                     )
                     if period_quality_flag:
                         _, Nbs = periodest.perform_residual_resampling(
-                            resid_df=residuals_dataframe, p_min=pmin, p_max=pmax, k=int(k_val)
-                            )
+                            resid_df=residuals_dataframe,
+                            p_min=pmin,
+                            p_max=pmax,
+                            k=int(k_val),
+                        )
                 except KeyError:
                     # If more than 10 terms are required switch to fast rotator:
                     pmin, pmax = 5e-3, 5e-2
@@ -148,13 +161,24 @@ def get_fit_params(
                         )
                         if period_quality_flag:
                             _, Nbs = periodest.perform_residual_resampling(
-                                resid_df=residuals_dataframe, p_min=pmin, p_max=pmax, k=int(k_val)
-                                )
+                                resid_df=residuals_dataframe,
+                                p_min=pmin,
+                                p_max=pmax,
+                                k=int(k_val),
+                            )
                     except Exception:
                         SOCCA_opt = {"Failed at period search after": 1}
+                        if time_me:
+                            t2 = time.time()
+                            etime = t2 - t1
+                            SOCCA_opt["invtime"] = etime
                         return SOCCA_opt
                 except IndexError:
                     SOCCA_opt = {"Failed at bootsrap sampling": 1}
+                    if time_me:
+                        t2 = time.time()
+                        etime = t2 - t1
+                        SOCCA_opt["invtime"] = etime
                     return SOCCA_opt
                 period_sy = p_in
             else:
@@ -182,23 +206,25 @@ def get_fit_params(
 
                     for i, ra0 in enumerate(rarange):
                         for j, dec0 in enumerate(decrange):
-
                             all_residuals = []
 
                             for ff in np.unique(data["cfid"].values[0]):
-                                cond_ff  = data["cfid"].values[0] == ff
+                                cond_ff = data["cfid"].values[0] == ff
 
-                                pha = [np.radians(data["Phase"].values[0][cond_ff]),
+                                pha = [
+                                    np.radians(data["Phase"].values[0][cond_ff]),
                                     np.radians(data["ra"].values[0][cond_ff]),
-                                    np.radians(data["dec"].values[0][cond_ff])]
+                                    np.radians(data["dec"].values[0][cond_ff]),
+                                ]
 
-                                H  = shg1g2_params[f"H_{ff}"]
+                                H = shg1g2_params[f"H_{ff}"]
                                 G1 = shg1g2_params[f"G1_{ff}"]
                                 G2 = shg1g2_params[f"G2_{ff}"]
-                                R  = shg1g2_params["R"]
+                                R = shg1g2_params["R"]
 
-                                C = func_hg1g2_with_spin(pha, H, G1, G2, R,
-                                                        np.radians(ra0), np.radians(dec0))
+                                C = func_hg1g2_with_spin(
+                                    pha, H, G1, G2, R, np.radians(ra0), np.radians(dec0)
+                                )
 
                                 Obs = data["cmred"].values[0][cond_ff]
 
@@ -207,37 +233,59 @@ def get_fit_params(
                             all_residuals = np.concatenate(all_residuals)
                             rms_landscape[j, i] = np.sqrt(np.mean(all_residuals**2))
 
-                    interp_vals = utils.gaussian_interpolate(rms_landscape, factor=4, sigma=1.0)
+                    interp_vals = utils.gaussian_interpolate(
+                        rms_landscape, factor=4, sigma=1.0
+                    )
                     ny, nx = interp_vals.shape
                     [rarange[0], rarange[-1], decrange[0], decrange[-1]]
-                    ra_vals  = np.linspace(rarange.min(),  rarange.max(),  nx)
+                    ra_vals = np.linspace(rarange.min(), rarange.max(), nx)
                     dec_vals = np.linspace(decrange.min(), decrange.max(), ny)
                     ys, xs = utils.detect_local_minima(interp_vals)
-                    ra_minima  = ra_vals[xs]
+                    ra_minima = ra_vals[xs]
                     dec_minima = dec_vals[ys]
 
                     ra_init = ra_minima
                     dec_init = dec_minima
 
                 H_key = next(
-                    (f"H_{i}" for i in range(1, 7) if f"H_{i}" in shg1g2_params),
+                    (
+                        f"H_{i}" for i in range(1, 7) if f"H_{i}" in shg1g2_params
+                    ),  # Harcoded number of filters? Grr...
                     None,
                 )
 
+                G1_key = next(
+                    (f"G1_{i}" for i in range(1, 7) if f"G1_{i}" in shg1g2_params),
+                    None,
+                )
+
+                G2_key = next(
+                    (f"G2_{i}" for i in range(1, 7) if f"G2_{i}" in shg1g2_params),
+                    None,
+                )
+                G1, G2 = shg1g2_params[G1_key], shg1g2_params[G2_key]
+
+                if not (1 - G1 - G2 > 0):
+                    G1, G2 = 0.15, 0.15
+
+                a_b, a_c = shg1g2_params["a_b"], shg1g2_params["a_c"]
+                if not (1 <= a_b <= 5 and 1 <= a_c <= 5):
+                    a_b = 1.05
+                    a_c = 1.5
+
                 for ra, dec in zip(ra_init, dec_init):
                     for period_sc in period_scan:
                         p_in = [
                             shg1g2_params[H_key],
-                            0.15,
-                            0.15,  # G1,2
+                            G1,
+                            G2,
                             np.radians(ra),
                             np.radians(dec),
                             period_sc,  # in days
-                            shg1g2_params["a_b"],
-                            shg1g2_params["a_c"],
+                            a_b,
+                            a_c,
                             0.1,
                         ]  # phi 0
-
                         SOCCA = get_fit_params(
                             data,
                             "SOCCA",
@@ -257,22 +305,28 @@ def get_fit_params(
                         try:
                             DeltaF1 = signal_peaks[1] - signal_peaks[2]
                             f_obs = 2 / period_sy
-                            y_trumpet = utils.trumpet(
-                                DeltaF1, 1, f_obs
-                            )
+                            y_trumpet = utils.trumpet(DeltaF1, 1, f_obs)
                             alias_flag = (DeltaF1 - y_trumpet) * 100
                             if alias_flag < 1:
-                                SOCCA_opt["Period_class"] = 1 # True
+                                SOCCA_opt["Period_class"] = 1  # True
                             else:
-                                SOCCA_opt["Period_class"] = 0 # Alias
+                                SOCCA_opt["Period_class"] = 0  # Alias
                             SOCCA_opt["Nbs"] = Nbs
                         except Exception:
-                            SOCCA_opt["Period_class"] = -1 # Classification error
+                            SOCCA_opt["Period_class"] = -1  # Classification error
                     if period_in is None:
                         SOCCA_opt["prms"] = p_rms
                         SOCCA_opt["k_terms"] = k_val
                 except Exception:
+                    if time_me:
+                        t2 = time.time()
+                        etime = t2 - t1
+                        SOCCA_opt["invtime"] = etime
                     SOCCA_opt = {"Failed at SOCCA inversion": 1}
+                if time_me:
+                    t2 = time.time()
+                    etime = t2 - t1
+                    SOCCA_opt["invtime"] = etime
                 return SOCCA_opt
             else:
                 period_si_t, alt_period_si_t, _ = utils.estimate_sidereal_period(
@@ -320,6 +374,12 @@ def get_fit_params(
                     None,
                 )
 
+                a_b, a_c = shg1g2_params["a_b"], shg1g2_params["a_c"]
+
+                if not (1 <= a_b <= 5 and 1 <= a_c <= 5):
+                    a_b = 1.05
+                    a_c = 1.5
+
                 p0 = [
                     H,
                     G1,
@@ -327,8 +387,8 @@ def get_fit_params(
                     ra0,
                     de0,
                     period,
-                    shg1g2_params["a_b"],
-                    shg1g2_params["a_c"],
+                    a_b,
+                    a_c,
                     0.1,
                 ]
 

asteroid_spinprops/ssolib/periodest.py

@@ -220,7 +220,7 @@ def get_multiterm_period_estimate(
         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**2/rss_next**2) - 1) * ((N - dof_next) / (dof_next - dof))
+            F = ((rss**2 / rss_next**2) - 1) * ((N - dof_next) / (dof_next - dof))
 
             # Here crit = Fstat value for which model_2 (more complex) is in fact better than model_1 (less complex)
             crit = ftest.ppf(
@@ -240,16 +240,9 @@ def get_multiterm_period_estimate(
         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.values[0]  # Simplest model
-        k_val = model_comparison[model_comparison.k == model_comparison.k.min()].k.values[
-            0
-        ]  # Simplest model
-        p_rms = model_comparison[model_comparison.k == model_comparison.k.min()].rms.values[
-            0
-        ]  # Simplest model
-
+        f_chosen = model_comparison.loc[model_comparison.k.idxmin()]["f_best"]
+        k_val = model_comparison.loc[model_comparison.k.idxmin()]["k"]
+        p_rms = model_comparison.loc[model_comparison.k.idxmin()]["rms"]
     if not k_free:
         model = LombScargleMultiband(
             residuals_dataframe["jd"].values,
@@ -282,7 +275,7 @@ def get_multiterm_period_estimate(
         residuals_dataframe["sigma"].values,
         normalization="standard",
         fit_mean=True,
-        nterms_base=k_val,
+        nterms_base=int(k_val),
         nterms_band=1,
     )
     frequency_final, power_final = model_final.autopower(
@@ -323,7 +316,7 @@ def get_multiterm_period_estimate(
     signal_peaks = frequency_final[pindex[hindex]]
     window_peaks = frequencyW[pindexW[hindexW]]
 
-    return period_in, k_val, p_rms, signal_peaks, window_peaks
+    return period_in, int(k_val), p_rms, signal_peaks, window_peaks
 
 
 def perform_residual_resampling(resid_df, p_min, p_max, k=1):

asteroid_spinprops/ssolib/utils.py

@@ -419,6 +419,7 @@ def generate_initial_points(ra, dec, dec_shift=45):
                 dec_list.append(shifted_dec)
     return ra_list, dec_list
 
+
 def gaussian_interpolate(data, factor=4, sigma=1.0):
     """
     Reproduce matplotlib's `interpolation="gaussian"` effect.
@@ -429,12 +430,13 @@ def gaussian_interpolate(data, factor=4, sigma=1.0):
 
     # Step 1: upsample (mimics interpolation grid)
     up = zoom(data, factor, order=1)  # bilinear before smoothing
-    
+
     # Step 2: apply gaussian smoothing
     smoothed = gaussian_filter(up, sigma=sigma)
-    
+
     return smoothed
 
+
 def detect_local_minima(arr):
     import scipy.ndimage.filters as filters
     import scipy.ndimage.morphology as morphology
@@ -446,17 +448,19 @@ def detect_local_minima(arr):
     Returns a boolean mask of the troughs (i.e. 1 when
     the pixel's value is the neighborhood maximum, 0 otherwise)
     """
-    neighborhood = morphology.generate_binary_structure(len(arr.shape),2)
-    
+    neighborhood = morphology.generate_binary_structure(len(arr.shape), 2)
+
     footprint = np.ones((15, 15))
     local_min = filters.minimum_filter(arr, footprint=footprint) == arr
 
-    background = (arr==0)
+    background = arr == 0
     eroded_background = morphology.binary_erosion(
-        background, structure=neighborhood, border_value=1)
+        background, structure=neighborhood, border_value=1
+    )
 
     detected_minima = local_min ^ eroded_background
-    return np.where(detected_minima)       
+    return np.where(detected_minima)
+
 
 def trumpet(peak_diff_1, f_feat, f_obs):
     """

{asteroid_spinprops-1.2.5.dist-info → asteroid_spinprops-1.3.0.dist-info}/METADATA

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

asteroid_spinprops-1.3.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+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=7PfkVNpLjPERkhr8dZQfN8haFCFmoeXB3fWuTSBLVuc,7848
+asteroid_spinprops/ssolib/modelfit.py,sha256=u-qvKAmR-NLcJD7qQdeF3f0L2rg1-O0z0yXaVFRx5r0,22418
+asteroid_spinprops/ssolib/periodest.py,sha256=OaJcDNBPiNDsDlzTfHInHUFt-7xZS4QbwaCrxKcnl2A,13180
+asteroid_spinprops/ssolib/ssptools.py,sha256=DlSgYtXenztRAtEV9d4itzp5OZMjkbXkW2yZ_Qumu4U,4490
+asteroid_spinprops/ssolib/utils.py,sha256=kbe69JxyCnbMebqkObuMS-0DFulnlgLNHxHNbP_U9J4,13334
+asteroid_spinprops-1.3.0.dist-info/METADATA,sha256=z8jhQrXtXaz_ruV46ho-odYTDnR-GgtdxmVGsm8ZjUY,6143
+asteroid_spinprops-1.3.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+asteroid_spinprops-1.3.0.dist-info/RECORD,,

asteroid_spinprops-1.2.5.dist-info/RECORD

@@ -1,10 +0,0 @@
-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=7PfkVNpLjPERkhr8dZQfN8haFCFmoeXB3fWuTSBLVuc,7848
-asteroid_spinprops/ssolib/modelfit.py,sha256=6BdkTsehPO-wOV8cbk61Rm4woMydUirtIQjYnj_ZfPU,20273
-asteroid_spinprops/ssolib/periodest.py,sha256=_uPfLKA5epPl0Cb3neAROAKZi2Pos93WT3C5e_GTKOA,13355
-asteroid_spinprops/ssolib/ssptools.py,sha256=DlSgYtXenztRAtEV9d4itzp5OZMjkbXkW2yZ_Qumu4U,4490
-asteroid_spinprops/ssolib/utils.py,sha256=Na0EAgCCeBrvY3-KwfU7PuaoDGLjw5jGP9oi19lY490,13344
-asteroid_spinprops-1.2.5.dist-info/METADATA,sha256=XjsSNdyXb_ze2JVj6zpUJh2voCj0zcQJe-KbBwe71L8,6143
-asteroid_spinprops-1.2.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-asteroid_spinprops-1.2.5.dist-info/RECORD,,