From 3662cae183d5308a8358ef16b1f39410898f7bab Mon Sep 17 00:00:00 2001 From: Rebecca Thomas Date: Thu, 21 May 2026 15:29:42 -0700 Subject: [PATCH 1/2] minor fix to allow either INPFC or ks statification --- echopop/inversion/inversion_length_TS.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echopop/inversion/inversion_length_TS.py b/echopop/inversion/inversion_length_TS.py index f45ab9dc..1f5b176c 100644 --- a/echopop/inversion/inversion_length_TS.py +++ b/echopop/inversion/inversion_length_TS.py @@ -315,7 +315,7 @@ def get_stratified_sigma_bs( df_length_counts["sigma_bs"] = 10.0 ** (df_length_counts["TS"] / 10.0) # Aggregate by stratum - self.sigma_bs_strata = df_length_counts.groupby(["stratum_ks"])[ + self.sigma_bs_strata = df_length_counts.groupby(self.model_params["stratify_by"])[ ["length_count", "sigma_bs"] ].apply(lambda x: np.average(x.sigma_bs, weights=x.length_count)) From be03c4b1bf41e59420e155edae0ba94e42dea0db Mon Sep 17 00:00:00 2001 From: Rebecca Thomas Date: Wed, 1 Jul 2026 09:25:48 -0700 Subject: [PATCH 2/2] Fix in read_echoview_export in nasc.py to use lat_s instead of lat_m when multiple lat columns (and same for longitude). --- echopop/ingest/nasc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/echopop/ingest/nasc.py b/echopop/ingest/nasc.py index 93f8ad2e..ccfe3ed3 100644 --- a/echopop/ingest/nasc.py +++ b/echopop/ingest/nasc.py @@ -374,8 +374,8 @@ def read_echoview_export(filename: Path, validator: Any | None = None) -> pd.Dat col = next(iter(lon_columns)) df.rename(columns={col: "longitude"}, inplace=True) # ---- If > 1 is present and includes 'lon_m' - elif len(lon_columns) > 1 and "lon_m" in lon_columns: - df.rename(columns={"lon_m": "longitude"}, inplace=True) + elif len(lon_columns) > 1 and "lon_s" in lon_columns: + df.rename(columns={"lon_s": "longitude"}, inplace=True) # Disambiguate possible overlapping longitude column names # ---- Intersecting names @@ -385,8 +385,8 @@ def read_echoview_export(filename: Path, validator: Any | None = None) -> pd.Dat col = next(iter(lat_columns)) df.rename(columns={col: "latitude"}, inplace=True) # ---- If > 1 is present and includes 'lon_m' - elif len(lat_columns) > 1 and "lat_m" in lat_columns: - df.rename(columns={"lat_m": "latitude"}, inplace=True) + elif len(lat_columns) > 1 and "lat_s" in lat_columns: + df.rename(columns={"lat_s": "latitude"}, inplace=True) # Rename columns used by Echopop df.rename(columns=ECHOVIEW_TO_ECHOPOP, inplace=True)