asteroid_spinprops 1.1.2__tar.gz → 1.2.0__tar.gz

{asteroid_spinprops-1.1.2 → asteroid_spinprops-1.2.0}/PKG-INFO

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

{asteroid_spinprops-1.1.2 → asteroid_spinprops-1.2.0}/asteroid_spinprops/ssolib/modelfit.py

@@ -2,6 +2,7 @@ import numpy as np
 import pandas as pd
 
 import asteroid_spinprops.ssolib.utils as utils
+import asteroid_spinprops.ssolib.periodest as periodest
 
 from fink_utils.sso.spins import (
     estimate_sso_params,
@@ -21,6 +22,7 @@ def get_fit_params(
     p0=None,
     alt_spin=False,
     period_in=None,
+    period_quality_flag=False,
     terminator=False,
 ):
     """
@@ -128,6 +130,10 @@ def get_fit_params(
                             residuals_dataframe, p_min=pmin, p_max=pmax, k_free=True
                         )
                     )
+                    if period_quality_flag:
+                        _, Nbs = periodest.perform_residual_resampling(
+                            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
@@ -137,6 +143,10 @@ def get_fit_params(
                                 residuals_dataframe, p_min=pmin, p_max=pmax, k_free=True
                             )
                         )
+                        if period_quality_flag:
+                            _, Nbs = periodest.perform_residual_resampling(
+                                resid_df=residuals_dataframe, p_min=pmin, p_max=pmax, k=int(k_val)
+                                )
                     except Exception:
                         SOCCA_opt = {"Failed at period search after": 4}
                         return SOCCA_opt
@@ -153,16 +163,55 @@ def get_fit_params(
                 )
 
                 ra0, dec0 = shg1g2_params["alpha0"], shg1g2_params["delta0"]
-                
+
                 if pole_blind is True:
                     ra_init, dec_init = utils.generate_initial_points(
                         ra0, dec0, dec_shift=45
                     )
 
                 else:
-                    ra0_antipodal, dec0_antipodal = utils.flip_spin(ra0, dec0)
-                    ra_init = [ra0, ra0_antipodal]
-                    dec_init = [dec0, dec0_antipodal]
+                    rarange = np.arange(0, 360, 10)
+                    decrange = np.arange(-90, 90, 5)
+                    rms_landscape = np.ones(shape=(len(rarange), len(decrange)))
+
+                    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
+
+                                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])]
+
+                                H  = shg1g2_params[f"H_{ff}"]
+                                G1 = shg1g2_params[f"G1_{ff}"]
+                                G2 = shg1g2_params[f"G2_{ff}"]
+                                R  = shg1g2_params["R"]
+
+                                C = func_hg1g2_with_spin(pha, H, G1, G2, R,
+                                                        np.radians(ra0), np.radians(dec0))
+
+                                O = data["cmred"].values[0][cond_ff]
+
+                                all_residuals.append(O - C)
+
+                            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)
+                    ny, nx = interp_vals.shape
+                    [rarange[0], rarange[-1], decrange[0], decrange[-1]]
+                    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]
+                    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),
@@ -198,6 +247,21 @@ def get_fit_params(
                 try:
                     rms = np.array(rms)
                     SOCCA_opt = model[rms.argmin()]
+                    if period_quality_flag:
+                        try:
+                            DeltaF1 = signal_peaks[1] - signal_peaks[2]
+                            f_obs = 2 / period_sy
+                            y_trumpet = utils.trumpet(
+                                DeltaF1, 1, f_obs
+                            )
+                            alias_flag = (DeltaF1 - y_trumpet) * 100
+                            if alias_flag < 1:
+                                SOCCA_opt["Period_class"] = "true"
+                            else:
+                                SOCCA_opt["Period_class"] = "alias"
+                            SOCCA_opt["Nbs"] = Nbs
+                        except Exception:
+                            SOCCA_opt["Period_class"] = "class_error"
                 except Exception:
                     SOCCA_opt = {"Failed at SOCCA inversion": 5}
                 return SOCCA_opt

{asteroid_spinprops-1.1.2 → asteroid_spinprops-1.2.0}/asteroid_spinprops/ssolib/utils.py

@@ -418,3 +418,57 @@ def generate_initial_points(ra, dec, dec_shift=45):
                 ra_list.append(wrap_longitude(temp_ra + offset))
                 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.
+    factor : upsampling factor
+    sigma  : Gaussian smoothing strength
+    """
+    from scipy.ndimage import zoom, gaussian_filter
+
+    # 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
+
+    # https://stackoverflow.com/questions/3684484/peak-detection-in-a-2d-array/3689710#3689710
+    # https://stackoverflow.com/questions/3986345/how-to-find-the-local-minima-of-a-smooth-multidimensional-array-in-numpy
+    """
+    Takes an array and detects the troughs using the local maximum filter.
+    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)
+    
+    footprint = np.ones((15, 15))
+    local_min = filters.minimum_filter(arr, footprint=footprint) == arr
+
+    background = (arr==0)
+    eroded_background = morphology.binary_erosion(
+        background, structure=neighborhood, border_value=1)
+
+    detected_minima = local_min ^ eroded_background
+    return np.where(detected_minima)       
+
+def trumpet(peak_diff_1, f_feat, f_obs):
+    if peak_diff_1 > 0 and f_obs > f_feat:
+        return 2 * f_feat
+
+    elif peak_diff_1 < 0 and f_obs < f_feat:
+        return -2 * f_obs
+
+    elif peak_diff_1 > 0 and f_obs < f_feat:
+        return 2 * f_obs
+
+    elif peak_diff_1 < 0 and f_obs > f_feat:
+        return -2 * f_feat
+
+    return 0.0

{asteroid_spinprops-1.1.2 → asteroid_spinprops-1.2.0}/pyproject.toml

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