asteroid_spinprops 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

asteroid_spinprops/ssolib/modelfit.py

@@ -225,14 +225,14 @@ def get_fit_params(
                 )
 
                 for ra, dec in zip(ra_init, dec_init):
-                    for period_in in period_scan:
+                    for period_sc in period_scan:
                         p_in = [
                             shg1g2_params[H_key],
                             0.15,
                             0.15,  # G1,2
                             np.radians(ra),
                             np.radians(dec),
-                            period_in,  # in days
+                            period_sc,  # in days
                             shg1g2_params["a_b"],
                             shg1g2_params["a_c"],
                             0.1,
@@ -268,8 +268,9 @@ def get_fit_params(
                             SOCCA_opt["Nbs"] = Nbs
                         except Exception:
                             SOCCA_opt["Period_class"] = -1 # Classification error
-                    SOCCA_opt["prms"] = p_rms
-                    SOCCA_opt["k_terms"] = k_val
+                    if period_in is None:
+                        SOCCA_opt["prms"] = p_rms
+                        SOCCA_opt["k_terms"] = k_val
                 except Exception:
                     SOCCA_opt = {"Failed at SOCCA inversion": 1}
                 return SOCCA_opt

asteroid_spinprops/ssolib/periodest.py

@@ -210,7 +210,8 @@ def get_multiterm_period_estimate(
 
             rms = np.sqrt(np.mean(residuals**2))
             n_params = 2 * k + 1 + 3 * len(bands)
-            dof = len(residuals) - n_params
+            dof = n_params
+            N = len(residuals)
 
             results.append((k, f_best, rms, dof, n_params))
 
@@ -219,13 +220,13 @@ def get_multiterm_period_estimate(
         for i in range(len(results) - 1):
             k, f_best, rss, dof, n_params = results[i]
             k_next, f_best_next, rss_next, dof_next, n_params_next = results[i + 1]
-            F = ((rss - rss_next) / (dof - dof_next)) / (rss_next / dof_next)
+            F = ((rss**2/rss_next**2) - 1) * ((N - dof_next) / (dof_next - dof))
 
             # Here crit = Fstat value for which model_2 (more complex) is in fact better than model_1 (less complex)
             crit = ftest.ppf(
                 q=0.99,
                 dfn=n_params_next - n_params,
-                dfd=len(residuals) - n_params_next,
+                dfd=N - n_params_next,
             )
 
             model_comparison.loc[i, "k"] = k
@@ -233,7 +234,7 @@ def get_multiterm_period_estimate(
             model_comparison.loc[i, "f_best"] = f_best
             model_comparison.loc[i, "Fstat"] = F
             model_comparison.loc[i, "alpha_crit"] = crit
-            model_comparison.loc[i, "rms"] = rms
+            model_comparison.loc[i, "rms"] = rss
 
         cond = model_comparison["Fstat"] > model_comparison["alpha_crit"]
         model_comparison = model_comparison[

{asteroid_spinprops-1.2.2.dist-info → asteroid_spinprops-1.2.4.dist-info}/METADATA

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

{asteroid_spinprops-1.2.2.dist-info → asteroid_spinprops-1.2.4.dist-info}/RECORD

@@ -1,10 +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=mEuCiUKivGOpLUPxBuP1E4yaWXcZtsFKpgS6Frose2g,20223
-asteroid_spinprops/ssolib/periodest.py,sha256=iql2HhpxN6dFwRmNchomv2m4M_JPULNrHLz5fvc5zYY,13330
+asteroid_spinprops/ssolib/modelfit.py,sha256=6BdkTsehPO-wOV8cbk61Rm4woMydUirtIQjYnj_ZfPU,20273
+asteroid_spinprops/ssolib/periodest.py,sha256=TlH35fMNT5qRvdpJNI-9H4-Um5mqSju1hiEklDjk0hA,13334
 asteroid_spinprops/ssolib/ssptools.py,sha256=DlSgYtXenztRAtEV9d4itzp5OZMjkbXkW2yZ_Qumu4U,4490
 asteroid_spinprops/ssolib/utils.py,sha256=Na0EAgCCeBrvY3-KwfU7PuaoDGLjw5jGP9oi19lY490,13344
-asteroid_spinprops-1.2.2.dist-info/METADATA,sha256=5LhKQ7oWPxdDet1X5oBH--ijlMhcF7GQiP3NhHh3uCU,6143
-asteroid_spinprops-1.2.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-asteroid_spinprops-1.2.2.dist-info/RECORD,,
+asteroid_spinprops-1.2.4.dist-info/METADATA,sha256=prHe3ALQN80S1qnLNofhj3nKcnWSbUVhI9DkhHx_dZw,6143
+asteroid_spinprops-1.2.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+asteroid_spinprops-1.2.4.dist-info/RECORD,,