asteroid_spinprops 1.3.5__tar.gz → 1.3.7__tar.gz

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

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

{asteroid_spinprops-1.3.5 → asteroid_spinprops-1.3.7}/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()
@@ -245,7 +245,7 @@ def get_fit_params(
 
                     ra_init = ra_minima
                     dec_init = dec_minima
-                    
+
                     # Add near-pole initialization points
                     ra_init = np.append(ra_init, 220)
                     ra_init = np.append(ra_init, 140)
@@ -264,7 +264,7 @@ def get_fit_params(
                 H_key = next(
                     (
                         f"H_{i}" for i in range(1, 7) if f"H_{i}" in shg1g2_params
-                    ),  # Harcoded number of filters? Grr...
+                    ),  # FIXME: Harcoded N of bands, won't throw error if N>6, but to be recosnidered
                     None,
                 )
 
@@ -332,10 +332,6 @@ def get_fit_params(
                         SOCCA_opt["prms"] = p_rms
                         SOCCA_opt["k_terms"] = k_val
                 except Exception:
-                    if time_me:
-                        t2 = time.time()
-                        etime = t2 - t1
-                        SOCCA_opt["invtime"] = etime
                     SOCCA_opt = {"Failed at SOCCA inversion": 1}
                 if time_me:
                     t2 = time.time()

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

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