removed OpenOceans++ parameters

SlideRuleEarth · Oct 17, 2024 · e363941 · e363941
1 parent 0465956
commit e363941
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 69 deletions.
diff --git a/datasets/bathy/package/BathyCoastnetClassifier.h b/datasets/bathy/package/BathyCoastnetClassifier.h
@@ -70,7 +70,7 @@ class BathyCoastnetClassifier: public GeoDataFrame::FrameRunner
          * Methods
          *--------------------------------------------------------------------*/
 
-        BathyCoastnetClassifier (lua_State* L, BathyFields* _fields);
+        BathyCoastnetClassifier (lua_State* L, BathyFields* _parms);
         ~BathyCoastnetClassifier (void) override;
 
         /*--------------------------------------------------------------------

diff --git a/datasets/bathy/package/BathyFields.h b/datasets/bathy/package/BathyFields.h
@@ -145,51 +145,12 @@ struct OpenOceansPPFields: public FieldDictionary
     FieldElement<bool>      setSurface              {false};
     FieldElement<bool>      usePredictions          {false};
     FieldElement<bool>      verbose                 {true};
-    FieldElement<double>    xResolution             {10.0};
-    FieldElement<double>    zResolution             {0.2};
-    FieldElement<double>    zMin                    {-50};
-    FieldElement<double>    zMax                    {30};
-    FieldElement<double>    surfaceZMin             {-20};
-    FieldElement<double>    surfaceZMax             {20};
-    FieldElement<double>    bathyMinDepth           {0.5};
-    FieldElement<double>    verticalSmoothingSigma  {0.5};
-    FieldElement<double>    surfaceSmoothingSigma   {200.0};
-    FieldElement<double>    bathySmoothingSigma     {100.0};
-    FieldElement<double>    minPeakProminence       {0.01};
-    FieldElement<size_t>    minPeakDistance         {2};
-
-    size_t                  minSurfacePhotonsPerWindow;
-    size_t                  minBathyPhotonsPerWindow;
-
-    void updatePhotonsPerWindow(void) {
-        minSurfacePhotonsPerWindow = 0.25 * (xResolution.value / 0.7);
-        minBathyPhotonsPerWindow = 0.25 * (xResolution.value / 0.7);
-    }
-
-    void fromLua (lua_State* L, int index) override {
-        FieldDictionary::fromLua(L, index);
-        updatePhotonsPerWindow();
-    }
 
     OpenOceansPPFields(void):
         FieldDictionary({ {"set_class",                 &setClass},
                           {"set_surface",               &setSurface},
                           {"use_predictions",           &usePredictions},
-                          {"verbose",                   &verbose},
-                          {"x_resolution",              &xResolution},
-                          {"z_resolution",              &zResolution},
-                          {"z_min",                     &zMin},
-                          {"z_max",                     &zMax},
-                          {"surface_z_min",             &surfaceZMin},
-                          {"surface_z_max",             &surfaceZMax},
-                          {"bathy_min_depth",           &bathyMinDepth},
-                          {"vertical_smoothing_sigma",  &verticalSmoothingSigma},
-                          {"surface_smoothing_sigma",   &surfaceSmoothingSigma},
-                          {"bathy_smoothing_sigma",     &bathySmoothingSigma},
-                          {"min_peak_prominence",       &minPeakProminence},
-                          {"min_peak_distance",         &minPeakDistance} }) {
-        updatePhotonsPerWindow();
-    };
+                          {"verbose",                   &verbose} }) {};
 
     virtual ~OpenOceansPPFields(void) override = default;
 };

diff --git a/datasets/bathy/package/BathyOpenOceansPPClassifier.cpp b/datasets/bathy/package/BathyOpenOceansPPClassifier.cpp
@@ -29,7 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// NOLINTBEGIN
 
 /******************************************************************************
  * INCLUDES
@@ -120,7 +119,7 @@ bool BathyOpenOceansPPClassifier::run (GeoDataFrame* dataframe)
         for(size_t i = 0; i < number_of_samples; i++)
         {
             // Populate photon
-            oopp::photon photon = {
+            const oopp::photon photon = {
                 .h5_index = 0,
                 .x = x_atc[i],
                 .z = geoid_corr_h[i],
@@ -138,27 +137,8 @@ bool BathyOpenOceansPPClassifier::run (GeoDataFrame* dataframe)
             }
         }
 
-        // Initialize Parameters
-        oopp::params params = {
-            .x_resolution = args.xResolution.value,
-            .z_resolution = args.zResolution.value,
-            .z_min = args.zMin.value,
-            .z_max = args.zMax.value,
-            .surface_z_min = args.surfaceZMin.value,
-            .surface_z_max = args.surfaceZMax.value,
-            .bathy_min_depth = args.bathyMinDepth.value,
-            .vertical_smoothing_sigma = args.verticalSmoothingSigma.value,
-            .surface_smoothing_sigma = args.surfaceSmoothingSigma.value,
-            .bathy_smoothing_sigma = args.bathySmoothingSigma.value,
-            .min_peak_prominence = args.minPeakProminence.value,
-            .min_peak_distance = args.minPeakDistance.value,
-            .min_surface_photons_per_window = args.minSurfacePhotonsPerWindow,
-            .min_bathy_photons_per_window = args.minBathyPhotonsPerWindow,
-            .surface_n_stddev = 3.0,
-            .bathy_n_stddev = 3.0
-        };
-
         // Run classification
+        const oopp::params params;
         samples = classify (samples, params, args.usePredictions);
 
         // Update extents
@@ -183,4 +163,3 @@ bool BathyOpenOceansPPClassifier::run (GeoDataFrame* dataframe)
     return true;
 }
 
-// NOLINTEND
diff --git a/datasets/bathy/package/BathyQtreesClassifier.cpp b/datasets/bathy/package/BathyQtreesClassifier.cpp
@@ -29,8 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// NOLINTBEGIN
-
 /******************************************************************************
  * INCLUDES
  ******************************************************************************/
@@ -124,7 +122,7 @@ bool BathyQtreesClassifier::run (GeoDataFrame* dataframe)
         for(size_t i = 0; i < number_of_samples; i++)
         {
             // Populate sample
-            utils::sample s = {
+            const utils::sample s = {
                 .dataset_id = 0,
                 .h5_index = 0,
                 .x = x_atc[i],
@@ -168,5 +166,3 @@ bool BathyQtreesClassifier::run (GeoDataFrame* dataframe)
     updateRunTime(TimeLib::latchtime() - start);
     return true;
 }
-
-// NOLINTEND