asteroid_spinprops 1.3.6__py3-none-any.whl → 1.3.8__py3-none-any.whl

asteroid_spinprops/ssolib/modelfit.py

@@ -173,7 +173,7 @@ def get_fit_params(
                             etime = t2 - t1
                             SOCCA_opt["invtime"] = etime
                         return SOCCA_opt
-                except (IndexError, ValueError):
+                except Exception:
                     SOCCA_opt = {"Failed at bootsrap sampling": 1}
                     if time_me:
                         t2 = time.time()
@@ -188,9 +188,23 @@ def get_fit_params(
                 rms = []
                 model = []
 
-                period_scan = np.linspace(
-                    period_sy - 20 / (24 * 60 * 60), period_sy + 20 / (24 * 60 * 60), 20
-                )
+                # Add heliocentric distance mean
+                sma = data["Dhelio"].values[0].mean()  # in AU
+
+                W = utils.period_range(sma, period_sy * 24) / 24  # in days
+                N = utils.Nintervals(sma)
+
+                Pmin = period_sy - W
+                Pmax = period_sy + W
+
+                period_scan = np.linspace(Pmin, Pmax, N)
+
+                if not np.isclose(period_scan, period_sy).any():
+                    period_scan = np.sort(np.append(period_scan, period_sy))
+
+                # period_scan = np.linspace(
+                #     period_sy - 20 / (24 * 60 * 60), period_sy + 20 / (24 * 60 * 60), 20
+                # )
 
                 ra0, dec0 = shg1g2_params["alpha0"], shg1g2_params["delta0"]
 

asteroid_spinprops/ssolib/periodest.py

@@ -257,7 +257,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, power = model.autopower(
@@ -380,11 +380,15 @@ def perform_residual_resampling(resid_df, p_min, p_max, k=1):
         Pog = 24 / Ptmp
         Pbs = np.zeros(25)
         for n in range(25):
-            BS_df = resid_df.sample(n=len(resid_df), replace=True)
-            Ptmp, _, _, _, _ = get_multiterm_period_estimate(
-                BS_df, p_min=p_min, p_max=p_max, k_free=False, k_val=k
-            )
-            Pbs[n] = 24 / Ptmp
+            try:
+                BS_df = resid_df.sample(n=len(resid_df), replace=True)
+                Ptmp, _, _, _, _ = get_multiterm_period_estimate(
+                    BS_df, p_min=p_min, p_max=p_max, k_free=False, k_val=k
+                )
+                Pbs[n] = 24 / Ptmp
+            except Exception:
+                Ptmp = 2 * Pog
+                Pbs[n] = 24 / Ptmp
         cond = np.abs(Pog - Pbs) / Pog < 1e-2
         Nbs = np.sum(np.ones(25)[cond])
     return BS_df, Nbs

asteroid_spinprops/ssolib/utils.py

@@ -492,3 +492,40 @@ def trumpet(peak_diff_1, f_feat, f_obs):
         return -2 * f_feat
 
     return 0.0
+
+
+def Nintervals(a):
+    """
+    Estimate the number of sampling intervals for period estimation
+    as a function of semi major axis a.
+    Parameters
+    ----------
+    a : float
+        Semi major axis in AU.
+    Returns
+    -------
+    int
+        Estimated number of intervals.
+    """
+    Na = 71.073 * np.exp(-1.21 * a) + 2.528
+    return int(Na)
+
+
+def period_range(a, Psyn):
+    """
+    Compute the allowed period range around a reference synodic period.
+
+    Parameters
+    ----------
+    a : float
+        Semi major axis in AU.
+    Psyn : float
+        Reference synodic period in hours.
+    Returns
+    -------
+    float
+        Period range width in hours.
+    """
+    g = 1.69 * np.exp(-0.338 * a) - 5.069
+    W = 10 ** (2 * np.log10(Psyn) + g)
+    return W

{asteroid_spinprops-1.3.6.dist-info → asteroid_spinprops-1.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asteroid_spinprops
-Version: 1.3.6
+Version: 1.3.8
 Summary: Collection of tools used for fitting sHG1G2 and SOCCA photometric models to sparse asteroid photometry
 License: MIT
 Author: Odysseas
@@ -57,10 +57,11 @@ The package maps common input columns to Fink-style fields:
 | `ra`          | Right ascension (deg) | 
 | `dec`         | Declination (deg) |
 | `Phase`       | Solar phase angle (deg) | 
+| `Dhelio`      | Heliocentric distance (AU) |
 
-### Additional columns created during preprocessing
+### Additional columns to be created during preprocessing
 
-The preprocessing step also adds the following fields:
+The preprocessing step requires the following fields:
 
 - **`cmred` — Reduced magnitude**
 
@@ -70,11 +71,12 @@ The preprocessing step also adds the following fields:
 $$
 \mathrm{cmred} = \mathrm{cmagpsf} - 5\log_{10}\!\left(\frac{r\,\Delta}{\mathrm{AU}^2}\right)
 $$  
+
 where `Obj_Sun_LTC_km` = \(r\) and `Range_LTC_km` = \(\Delta\).
 
 - **`jd_ltc` — Light-time–corrected Julian Date**
 
-  First converts MJD → JD (`+ 2400000.5`), then applies the correction
+  First convert MJD → JD (`+ 2400000.5`), then apply the correction
 
   $$
   JD_\mathrm{ltc} = JD - \frac{\Delta}{c},
@@ -150,7 +152,8 @@ SOCCA_params = modelfit.get_fit_params(
         pole_blind=False,
         period_blind=True,
         period_in=None,
-        period_quality_flag=True
+        period_quality_flag=True,
+        terminator=True
     )
 
 
@@ -167,7 +170,7 @@ residuals_dataframe = modelfit.make_residuals_df(
 )
 
 # --- Estimate rotation period ---
-p_in, k_val, p_rms, signal_peak, window_peak = periodest.get_multiband_period_estimate(
+p_in, k_val, p_rms, signal_peak, window_peak = periodest.get_multiterm_period_estimate(
     residuals_dataframe,
     k_free=True,
 )
@@ -188,7 +191,8 @@ SOCCA_params = modelfit.get_fit_params(
     period_blind=False,
     pole_blind=False,
     period_in=p_in,
-    period_quality_flag=False
+    period_quality_flag=False,
+    terminator=True
 )
 ```
 

asteroid_spinprops-1.3.8.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=hXNm_enW1MJ5p3bSmyzAZsL3QuM1-Fh8gtOjGGMngiI,23244
+asteroid_spinprops/ssolib/periodest.py,sha256=iS--fVORQ5MzreN86cWu-b-WoWEg_5KetT1HS8jP-YE,13572
+asteroid_spinprops/ssolib/ssptools.py,sha256=DlSgYtXenztRAtEV9d4itzp5OZMjkbXkW2yZ_Qumu4U,4490
+asteroid_spinprops/ssolib/utils.py,sha256=G_vlSW9i_TDOU1-SP7crNPVWHN1ySRNjJYpgJvkVaYQ,14106
+asteroid_spinprops-1.3.8.dist-info/METADATA,sha256=YoLQ1OfwR9parQ8MWnxFoX2tsVRpOy2nW_D2CKQhBSA,6239
+asteroid_spinprops-1.3.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+asteroid_spinprops-1.3.8.dist-info/RECORD,,

asteroid_spinprops-1.3.6.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=NaGNChjeH6r2cpZOPB2ur3LQHDRPVLyok89gwx1ioOg,22745
-asteroid_spinprops/ssolib/periodest.py,sha256=dAKytw-Oelb35ZjDXHuxGe5L5H8UPVCX42eU1I0jTIo,13434
-asteroid_spinprops/ssolib/ssptools.py,sha256=DlSgYtXenztRAtEV9d4itzp5OZMjkbXkW2yZ_Qumu4U,4490
-asteroid_spinprops/ssolib/utils.py,sha256=kbe69JxyCnbMebqkObuMS-0DFulnlgLNHxHNbP_U9J4,13334
-asteroid_spinprops-1.3.6.dist-info/METADATA,sha256=ox6b-kZ6Vb48AX9h8OtDbbeArM9sBBFxZG7j8W2wXmM,6143
-asteroid_spinprops-1.3.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-asteroid_spinprops-1.3.6.dist-info/RECORD,,