fixed uncertainty minimum to be cm; fixed subaqueous stats

SlideRuleEarth · Oct 16, 2024 · c981099 · c981099
1 parent 93c42a0
commit c981099
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/datasets/bathy/docker/oceaneyes/runner.py b/datasets/bathy/docker/oceaneyes/runner.py
@@ -280,7 +280,7 @@ def runClassifier(classifier, classifier_func, num_processes=6):
 # apply subaqueous corrections
 corrections_start_time = time.time()
 df.reset_index(drop=False, inplace=True)
-subaqueous_df = df[df["ortho_h"] < df["surface_h"]] # only photons below sea surface
+subaqueous_df = df[df["geoid_corr_h"] < df["surface_h"]] # only photons below sea surface
 subaqueous_df = subaqueous_df[subaqueous_df["ensemble"].isin([0, 40])] # exclude photons labeled as sea surface
 df.loc[subaqueous_df.index, 'ortho_h'] += df.loc[subaqueous_df.index, 'refracted_dZ']
 df.loc[subaqueous_df.index, 'ellipse_h'] += df.loc[subaqueous_df.index, 'refracted_dZ']
@@ -299,14 +299,18 @@ def runClassifier(classifier, classifier_func, num_processes=6):
 stats = {
     "total_photons": len(df),
     "sea_surface_photons": len(df[df.ensemble == 41]),
-    "subaqueous_photons": len(df[df.ortho_h < df.surface_h]),
+    "subaqueous_photons": len(subaqueous_df),
     "bathy_photons": len(bathy_df),
     "bathy_strong_photons": len(bathy_df[bathy_df.spot.isin([1,3,5])]),
     "bathy_linear_coverage":  bathy_df.index_seg.nunique() * 20.0, # number of unique segments with bathymetry X size of each segment in meters
-    "bathy_mean_depth": bathy_df.depth.mean(),
-    "bathy_min_depth": bathy_df.depth.min(),
-    "bathy_max_depth": bathy_df.depth.max(),
-    "bathy_std_depth": bathy_df.depth.std()
+    "bathy_mean_depth": bathy_df.depth.mean().item(),
+    "bathy_min_depth": bathy_df.depth.min().item(),
+    "bathy_max_depth": bathy_df.depth.max().item(),
+    "bathy_std_depth": bathy_df.depth.std().item(),
+    "subaqueous_mean_uncertainty": bathy_df.subaqueous_sigma_tvu.mean().item(),
+    "subaqueous_min_uncertainty": bathy_df.subaqueous_sigma_tvu.min().item(),
+    "subaqueous_max_uncertainty": bathy_df.subaqueous_sigma_tvu.max().item(),
+    "subaqueous_std_uncertainty": bathy_df.subaqueous_sigma_tvu.std().item()
 }
 
 # read versions

diff --git a/datasets/bathy/endpoints/atl24g.lua b/datasets/bathy/endpoints/atl24g.lua
@@ -19,7 +19,7 @@ local start_time    = time.gps() -- used for timeout handling
 -- function: cleanup
 -------------------------------------------------------
 local function cleanup(_crenv, _transaction_id)
---    runner.cleanup(_crenv) -- container runtime environment
+    runner.cleanup(_crenv) -- container runtime environment
     core.orchunlock({_transaction_id}) -- unlock transaction
 end
 

diff --git a/datasets/bathy/package/BathyFields.cpp b/datasets/bathy/package/BathyFields.cpp
@@ -42,8 +42,8 @@
  ******************************************************************************/
 
 const double BathyFields::NIGHT_SOLAR_ELEVATION_THRESHOLD = 5.0; // degrees
-const double BathyFields::MINIMUM_HORIZONTAL_SUBAQUEOUS_UNCERTAINTY = 0.0;
-const double BathyFields::MINIMUM_VERTICAL_SUBAQUEOUS_UNCERTAINTY = 10.0;
+const double BathyFields::MINIMUM_HORIZONTAL_SUBAQUEOUS_UNCERTAINTY = 0.0; // meters
+const double BathyFields::MINIMUM_VERTICAL_SUBAQUEOUS_UNCERTAINTY = 0.10; // meters
 
 /******************************************************************************
  * METHODS

diff --git a/docs/rtd/source/release_notes/release-v4-7-2.md b/docs/rtd/source/release_notes/release-v4-7-2.md
@@ -26,9 +26,11 @@ Bathy Version #5.
 
 * Classifiers updated: coastnet, qtrees, openoceanspp, ensemble
 
+* Statistics on Subaqueous photons no longer include photons labeled as sea surface
+
 ## Known Issues and Remaining Tasks
 
-* CMR queries of ATL09 stopped working
+* CMR queries of ATL09 stopped working - CMR updated their API and removed support for page numbers when scrolling
 
 ## General Changes