asteroid_spinprops 0.2.13__tar.gz → 0.2.15__tar.gz

{asteroid_spinprops-0.2.13 → asteroid_spinprops-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: asteroid_spinprops
-Version: 0.2.13
+Version: 0.2.15
 Summary: Collection of tools used for fitting sHG1G2 and ssHG1G2 photometric models to sparse asteroid photometry
 License: MIT
 Author: Odysseas

{asteroid_spinprops-0.2.13 → asteroid_spinprops-0.2.15}/asteroid_spinprops/ssolib/modelfit.py

@@ -25,6 +25,7 @@ def get_fit_params(
     survey_filter=None,
     alt_spin=False,
     period_in=None,
+    terminator=False,
 ):
     if survey_filter is None:
         filter_mask = np.array(data["cfid"].values[0]) >= 0
@@ -84,11 +85,13 @@ def get_fit_params(
                 )
 
                 ra0, dec0 = shg1g2_params["alpha0"], shg1g2_params["delta0"]
-                ra0alt, dec0alt = utils.flip_spin(
-                    shg1g2_params["alpha0"], shg1g2_params["delta0"]
+                # ra0alt, dec0alt = utils.flip_spin(
+                #     shg1g2_params["alpha0"], shg1g2_params["delta0"]
+                # )
+                ra_init, dec_init = utils.generate_initial_points(
+                    ra0, dec0, dec_shift=45
                 )
-
-                for ra, dec in zip([ra0, ra0alt], [dec0, dec0alt]):
+                for ra, dec in zip(ra_init, dec_init):
                     for period_in in period_scan:
                         p_in = [
                             shg1g2_params["H_1"],
@@ -103,7 +106,11 @@ def get_fit_params(
                         ]  # phi 0
 
                         sshg1g2 = get_fit_params(
-                            data, "SSHG1G2", shg1g2_constrained=False, p0=p_in
+                            data,
+                            "SSHG1G2",
+                            shg1g2_constrained=False,
+                            p0=p_in,
+                            terminator=terminator,
                         )
                         try:
                             rms.append(sshg1g2["rms"])
@@ -190,17 +197,34 @@ def get_fit_params(
             if p0 is None:
                 print("Initialize SSHG1G2 first!")
             if p0 is not None:
-                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",
-                    p0=p0,
-                )
+                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],
+                        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]),
+                    )
+                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],
+                        model="SSHG1G2",
+                        p0=p0,
+                        terminator=terminator,
+                    )
                 return Afit
     if flavor not in ["SHG1G2", "SSHG1G2"]:
         print("Model must either be SHG1G2 or SSHG1G2, not {}".format(flavor))
@@ -209,7 +233,7 @@ def get_fit_params(
 def plot_model(
     data, flavor, model_params, x_axis="Date", resolution=400, filterout=False
 ):
-    fink_colors = ["#15284F", "#F5622E", "#3C8DFF", "#D5D5D3"]
+    fink_colors = ["#15284F", "#F5622E", "#0E6B77", "#4A4A4A"]
 
     jd = np.linspace(
         np.min(data["cjd"].values[0]), np.max(data["cjd"].values[0]), resolution

{asteroid_spinprops-0.2.13 → asteroid_spinprops-0.2.15}/asteroid_spinprops/ssolib/utils.py

@@ -412,3 +412,56 @@ def read_clean_data(
 
 def oblateness(a_b, a_c):
     return 1 / 2 * a_b / a_c + 1 / 2 * 1 / a_b
+
+
+def wrap_longitude(long):
+    """Wrap RA to [0, 360)."""
+    return long % 360
+
+
+def wrap_latitude(lat):
+    """Wrap Dec to [-90, 90] by folding over the poles."""
+    m = (lat + 90) % 360  # shift so -90 maps to 0
+    if m > 180:
+        m = 360 - m
+    return m - 90
+
+
+def generate_initial_points(ra, dec, dec_shift=45):
+    """
+    Generate 18 initial (RA, Dec) points
+
+    Parameters:
+    ra (float): base RA in degrees
+    dec (float): base Dec in degrees
+    dec_shifts (tuple): the two Dec shifts (in degrees) to try in step 2
+    """
+    if np.abs(2 * dec - dec_shift) < 10:
+        dec_shift += 20
+
+    ra_list = []
+    dec_list = []
+
+    base_coords = [(ra, dec), flip_spin(ra, dec)]
+
+    ra_sweep = [0, 120, 240]
+
+    for base_ra, base_dec in base_coords:
+        for offset in ra_sweep:
+            ra_list.append(wrap_longitude(base_ra + offset))
+            dec_list.append(base_dec)
+
+    dec_sweep = [-dec_shift, dec_shift]
+    for shift in dec_sweep:
+        for base_ra, base_dec in base_coords:
+            if (base_dec + shift > 90) | (base_dec - shift < 90):
+                flag = 1
+            else:
+                flag = 0
+            shifted_dec = wrap_latitude(base_dec + shift)
+
+            for offset in ra_sweep:
+                temp_ra = base_ra + (180 if flag == 1 else 0)
+                ra_list.append(wrap_longitude(temp_ra + offset))
+                dec_list.append(shifted_dec)
+    return ra_list, dec_list

{asteroid_spinprops-0.2.13 → asteroid_spinprops-0.2.15}/pyproject.toml

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