asteroid_spinprops 1.3.7__tar.gz → 1.3.8__tar.gz

{asteroid_spinprops-1.3.7 → asteroid_spinprops-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asteroid_spinprops
-Version: 1.3.7
+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.7 → asteroid_spinprops-1.3.8}/README.md

@@ -29,10 +29,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**
 
@@ -42,11 +43,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},
@@ -122,7 +124,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
     )
 
 
@@ -139,7 +142,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,
 )
@@ -160,7 +163,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.7 → asteroid_spinprops-1.3.8}/asteroid_spinprops/ssolib/modelfit.py

@@ -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-1.3.7 → asteroid_spinprops-1.3.8}/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.7 → asteroid_spinprops-1.3.8}/pyproject.toml

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