Fix filename export

OceanStreamIO · Nov 8, 2023 · 7ea5812 · 7ea5812
1 parent 6e6b869
commit 7ea5812
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/oceanstream/L3_regridded_data/csv_export_nasc.py b/oceanstream/L3_regridded_data/csv_export_nasc.py
@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import xarray as xr
 from echopype.mask.api import apply_mask
 from pandas import DataFrame
@@ -33,7 +35,7 @@ def base_nasc_data(Sv: xr.Dataset, abbreviated: bool = False, root_name: str = N
 
     metadata = {}
     if abbreviated is False:
-        metadata["filename"] = Sv.source_filenames.values.item()
+        metadata["filename"] = Path(Sv.source_filenames.values.item()).stem
         metadata["start_lat"] = nasc.attrs["geospatial_lat_min"]
         metadata["end_lat"] = nasc.attrs["geospatial_lat_max"]
         metadata["start_lon"] = nasc.attrs["geospatial_lon_min"]

diff --git a/oceanstream/L3_regridded_data/shoal_process.py b/oceanstream/L3_regridded_data/shoal_process.py
@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import scipy.ndimage as nd_img
 import xarray as xr
 from echopype.mask.api import apply_mask
@@ -90,7 +92,7 @@ def process_single_shoal_channel(Sv: xr.Dataset, mask: xr.DataArray, channel: st
     area = mc.sum().values.item()
     if area == 0:
         return None
-    filename = md.source_filenames.values.item()
+    filename = Path(md.source_filenames.values.item()).stem
     label = mc.attrs["label"]
 
     ping_true = md["Sv"].any(dim="range_sample")
@@ -172,7 +174,7 @@ def process_shoals(Sv: xr.Dataset):
         return_dict = {
             "label": None,
             "frequency": None,
-            "filename": Sv.source_filenames.values.item(),
+            "filename": Path(Sv.source_filenames.values.item()).stem,
             "area": None,
             "bbox.0": None,
             "bbox.1": None,