asteroid_spinprops 1.1.1__tar.gz → 1.1.2__tar.gz

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

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

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

@@ -7,16 +7,18 @@ from fink_utils.sso.spins import (
     estimate_sso_params,
     func_hg1g2_with_spin,
 )
-from asteroid_spinprops.ssolib.periodest import get_period_estimate, get_multiterm_period_estimate, perform_residual_resampling
+from asteroid_spinprops.ssolib.periodest import (
+    get_multiterm_period_estimate,
+)
 
 
 def get_fit_params(
     data,
     flavor,
     shg1g2_constrained=True,
-    blind_scan=True,
+    period_blind=True,
+    pole_blind=True,
     p0=None,
-    survey_filter=None,
     alt_spin=False,
     period_in=None,
     terminator=False,
@@ -44,12 +46,12 @@ def get_fit_params(
         Model type to fit. Must be 'SHG1G2' or 'SOCCA'.
     shg1g2_constrained : bool, optional
         Whether to constrain the SOCCA fit using a prior SHG1G2 solution. Default True.
-    blind_scan : bool, optional
-        If True, perform a small grid search over initial pole positions and periods. Default True.
+    period_blind : bool, optional
+        If True, perform a small grid search over initial periods. Default True.
+    pole_blind : bool, optional
+        If True, perform a grid search over initial poles. Default True.
     p0 : list, optional
         Initial guess parameters for the fit. Required if `shg1g2_constrained=False`.
-    survey_filter : str or None, optional
-        If 'ZTF' or 'ATLAS', only data from that survey are used. Default None uses all data.
     alt_spin : bool, optional
         For SOCCA constrained fits, use the antipodal spin solution. Default False.
     period_in : float, optional
@@ -80,36 +82,26 @@ def get_fit_params(
         If `flavor` is not 'SHG1G2' or 'SOCCA'.
     """
 
-    if survey_filter is None:
-        filter_mask = np.array(data["cfid"].values[0]) >= 0
-    if survey_filter == "ZTF":
-        filter_mask = (np.array(data["cfid"].values[0]) == 1) | (
-            np.array(data["cfid"].values[0]) == 2
-        )
-    if survey_filter == "ATLAS":
-        filter_mask = (np.array(data["cfid"].values[0]) == 3) | (
-            np.array(data["cfid"].values[0]) == 4
-        )
     if flavor == "SHG1G2":
         if p0 is None:
             Afit = estimate_sso_params(
-                magpsf_red=data["cmred"].values[0][filter_mask],
-                sigmapsf=data["csigmapsf"].values[0][filter_mask],
-                phase=np.radians(data["Phase"].values[0][filter_mask]),
-                filters=data["cfid"].values[0][filter_mask],
-                ra=np.radians(data["ra"].values[0][filter_mask]),
-                dec=np.radians(data["dec"].values[0][filter_mask]),
+                magpsf_red=data["cmred"].values[0],
+                sigmapsf=data["csigmapsf"].values[0],
+                phase=np.radians(data["Phase"].values[0]),
+                filters=data["cfid"].values[0],
+                ra=np.radians(data["ra"].values[0]),
+                dec=np.radians(data["dec"].values[0]),
                 model="SHG1G2",
             )
 
         if p0 is not None:
             Afit = estimate_sso_params(
-                magpsf_red=data["cmred"].values[0][filter_mask],
-                sigmapsf=data["csigmapsf"].values[0][filter_mask],
-                phase=np.radians(data["Phase"].values[0][filter_mask]),
-                filters=data["cfid"].values[0][filter_mask],
-                ra=np.radians(data["ra"].values[0][filter_mask]),
-                dec=np.radians(data["dec"].values[0][filter_mask]),
+                magpsf_red=data["cmred"].values[0],
+                sigmapsf=data["csigmapsf"].values[0],
+                phase=np.radians(data["Phase"].values[0]),
+                filters=data["cfid"].values[0],
+                ra=np.radians(data["ra"].values[0]),
+                dec=np.radians(data["dec"].values[0]),
                 model="SHG1G2",
                 p0=p0,
             )
@@ -118,11 +110,15 @@ def get_fit_params(
     if flavor == "SOCCA":
         if shg1g2_constrained is True:
             shg1g2_params = get_fit_params(
-                data=data, flavor="SHG1G2", survey_filter=survey_filter
-            )
-            residuals_dataframe = make_residuals_df(
-                data, model_parameters=shg1g2_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": 3}
+                return SOCCA_opt
             if period_in is None:
                 # Period search boundaries (in days)
                 pmin, pmax = 5e-2, 1e4
@@ -135,17 +131,20 @@ def get_fit_params(
                 except KeyError:
                     # If more than 10 terms are required switch to fast rotator:
                     pmin, pmax = 5e-3, 5e-2
-
-                    p_in, k_val, p_rms, signal_peaks, window_peaks = (
-                        get_multiterm_period_estimate(
-                            residuals_dataframe, p_min=pmin, p_max=pmax, k_free=True
+                    try:
+                        p_in, k_val, p_rms, signal_peaks, window_peaks = (
+                            get_multiterm_period_estimate(
+                                residuals_dataframe, p_min=pmin, p_max=pmax, k_free=True
+                            )
                         )
-                    )
+                    except Exception:
+                        SOCCA_opt = {"Failed at period search after": 4}
+                        return SOCCA_opt
                 period_sy = p_in
             else:
                 period_sy = period_in
 
-            if blind_scan is True:
+            if period_blind is True:
                 rms = []
                 model = []
 
@@ -154,10 +153,16 @@ 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
+                    )
 
-                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]
 
                 H_key = next(
                     (f"H_{i}" for i in range(1, 7) if f"H_{i}" in shg1g2_params),
@@ -190,9 +195,11 @@ def get_fit_params(
                             model.append(SOCCA)
                         except Exception:
                             continue
-                rms = np.array(rms)
-                SOCCA_opt = model[rms.argmin()]
-
+                try:
+                    rms = np.array(rms)
+                    SOCCA_opt = model[rms.argmin()]
+                except Exception:
+                    SOCCA_opt = {"Failed at SOCCA inversion": 5}
                 return SOCCA_opt
             else:
                 period_si_t, alt_period_si_t, _ = utils.estimate_sidereal_period(
@@ -254,14 +261,14 @@ def get_fit_params(
 
                 # Constrained Fit
                 Afit = estimate_sso_params(
-                    data["cmred"].values[0][filter_mask],
-                    data["csigmapsf"].values[0][filter_mask],
-                    np.radians(data["Phase"].values[0][filter_mask]),
-                    data["cfid"].values[0][filter_mask],
-                    ra=np.radians(data["ra"].values[0][filter_mask]),
-                    dec=np.radians(data["dec"].values[0][filter_mask]),
-                    jd=data["cjd"].values[0][filter_mask],
-                    model="SSHG1G2", # We should call this SOCCA
+                    data["cmred"].values[0],
+                    data["csigmapsf"].values[0],
+                    np.radians(data["Phase"].values[0]),
+                    data["cfid"].values[0],
+                    ra=np.radians(data["ra"].values[0]),
+                    dec=np.radians(data["dec"].values[0]),
+                    jd=data["cjd"].values[0],
+                    model="SSHG1G2",  # We should call this SOCCA
                     p0=p0,
                 )
                 return Afit
@@ -272,28 +279,28 @@ def get_fit_params(
             if p0 is not None:
                 if terminator:
                     Afit = estimate_sso_params(
-                        data["cmred"].values[0][filter_mask],
-                        data["csigmapsf"].values[0][filter_mask],
-                        np.radians(data["Phase"].values[0][filter_mask]),
-                        data["cfid"].values[0][filter_mask],
-                        ra=np.radians(data["ra"].values[0][filter_mask]),
-                        dec=np.radians(data["dec"].values[0][filter_mask]),
-                        jd=data["cjd"].values[0][filter_mask],
+                        data["cmred"].values[0],
+                        data["csigmapsf"].values[0],
+                        np.radians(data["Phase"].values[0]),
+                        data["cfid"].values[0],
+                        ra=np.radians(data["ra"].values[0]),
+                        dec=np.radians(data["dec"].values[0]),
+                        jd=data["cjd"].values[0],
                         model="SSHG1G2",
                         p0=p0,
                         terminator=terminator,
-                        ra_s=np.radians(data["ra_s"].values[0][filter_mask]),
-                        dec_s=np.radians(data["dec_s"].values[0][filter_mask]),
+                        ra_s=np.radians(data["ra_s"].values[0]),
+                        dec_s=np.radians(data["dec_s"].values[0]),
                     )
                 else:
                     Afit = estimate_sso_params(
-                        data["cmred"].values[0][filter_mask],
-                        data["csigmapsf"].values[0][filter_mask],
-                        np.radians(data["Phase"].values[0][filter_mask]),
-                        data["cfid"].values[0][filter_mask],
-                        ra=np.radians(data["ra"].values[0][filter_mask]),
-                        dec=np.radians(data["dec"].values[0][filter_mask]),
-                        jd=data["cjd"].values[0][filter_mask],
+                        data["cmred"].values[0],
+                        data["csigmapsf"].values[0],
+                        np.radians(data["Phase"].values[0]),
+                        data["cfid"].values[0],
+                        ra=np.radians(data["ra"].values[0]),
+                        dec=np.radians(data["dec"].values[0]),
+                        jd=data["cjd"].values[0],
                         model="SSHG1G2",
                         p0=p0,
                         terminator=terminator,

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

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