Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
// Fails with ValueError: different number of dimensions on data and dims: 2 vs 1 for wetlabsubat_digitized_raw_ad_counts variable
//"args": ["-v", "1", "--log_file", "pontus/missionlogs/2025/20250604_20250616/20250608T020852/202506080209_202506081934.nc4", "--no_cleanup", "--clobber"]
// ValueError: Dimension mismatch: wetlabsubat_digitized_raw_ad_counts_time has 33154 elements but wetlabsubat_hv_step_calibration_coefficient_time has 33155 elements
//"args": ["-v", "1", "--log_file", "pontus/missionlogs/2025/20250623_20250707/20250626T041517/202506260415_202506261400.nc4", "--no_cleanup"]
"args": ["-v", "1", "--log_file", "pontus/missionlogs/2025/20250623_20250707/20250626T041517/202506260415_202506261400.nc4", "--no_cleanup"]
// ValueError: coords is not dict-like, but it has 1 items, which does not match the 2 dimensions of the data
//"args": ["-v", "1", "--log_file", "pontus/missionlogs/2025/20250623_20250707/20250626T140000/202506261400_202506262031.nc4", "--no_cleanup"]
// Full month of June 2025 for Pontus with WetLabsUBAT Group data
Expand All @@ -392,7 +392,7 @@
// For loading stoqs_lrauv_sep2025 - which has really bad nav in _2S_scieng.nc files
//"args": ["-v", "1", "--auv_name", "brizo", "--start", "20250901T000000", "--end", "20251001T000000", "--no_cleanup"]
// No GPS data for a log_file that has an ESP Sample
"args": ["-v", "1", "--log_file", "brizo/missionlogs/2025/20250916_20250922/20250920T070029/202509200700_202509201900.nc4", "--no_cleanup"]
//"args": ["-v", "1", "--log_file", "brizo/missionlogs/2025/20250916_20250922/20250920T070029/202509200700_202509201900.nc4", "--no_cleanup"]
},

]
Expand Down
16 changes: 12 additions & 4 deletions src/data/resample.py
Original file line number Diff line number Diff line change
Expand Up @@ -1611,10 +1611,18 @@ def resample_variable( # noqa: PLR0913
proxy_cal_factor, proxy_ratio_adinos = self.set_proxy_parameters(
mission_start, self.auv_name
)
self.add_wetlabsubat_proxies(
freq=freq,
proxy_cal_factor=proxy_cal_factor,
proxy_ratio_adinos=proxy_ratio_adinos,
wetlabsubat_fluo, wetlabsubat_sunsets, wetlabsubat_sunrises = (
self.add_wetlabsubat_proxies(
freq=freq,
proxy_cal_factor=proxy_cal_factor,
proxy_ratio_adinos=proxy_ratio_adinos,
)
)
self.correct_biolume_proxies(
wetlabsubat_fluo,
wetlabsubat_sunsets,
wetlabsubat_sunrises,
depth_threshold,
)
else:
self.df_o[variable] = self.ds[variable].to_pandas()
Expand Down