geolocation and geocorrection ancillary data is being produced

SlideRuleEarth · Nov 10, 2022 · 2a11c65 · 2a11c65
1 parent 28e7139
commit 2a11c65
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/packages/h5/H5DArray.cpp b/packages/h5/H5DArray.cpp
@@ -40,6 +40,13 @@
  * H5 DYNAMIC ARRAY CLASS
  ******************************************************************************/
 
+/*----------------------------------------------------------------------------
+ * init
+ *----------------------------------------------------------------------------*/
+void H5DArray::init(void)
+{
+}
+
 /*----------------------------------------------------------------------------
  * Constructor
  *----------------------------------------------------------------------------*/

diff --git a/packages/h5/H5DArray.h b/packages/h5/H5DArray.h
@@ -58,6 +58,8 @@ class H5DArray
          * Methods
          *--------------------------------------------------------------------*/
 
+        static void init            (void);
+
                     H5DArray        (const Asset* asset, const char* resource, const char* dataset, H5Coro::context_t* context=NULL, long col=0, long startrow=0, long numrows=H5Coro::ALL_ROWS);
         virtual     ~H5DArray       (void);
 

diff --git a/packages/h5/h5.cpp b/packages/h5/h5.cpp
@@ -79,6 +79,7 @@ void inith5 (void)
 {
     /* Initialize Modules */
     H5Coro::init(H5CORO_THREAD_POOL_SIZE);
+    H5DArray::init();
     H5DatasetDevice::init();
     H5File::init();
 

diff --git a/plugins/icesat2/endpoints/atl06.lua b/plugins/icesat2/endpoints/atl06.lua
@@ -55,7 +55,8 @@ local atl06_algo = icesat2.atl06(rspq, parms)
 -- ATL06 Dispatcher --
 local atl06_disp = core.dispatcher(recq)
 atl06_disp:attach(atl06_algo, "atl03rec")
-atl06_disp:attach(except_pub, "exceptrec")
+atl06_disp:attach(except_pub, "exceptrec") -- exception records
+atl06_disp:attach(except_pub, "atlxxrec") -- ancillary records
 atl06_disp:run()
 
 -- Post Initial Status Progress --

diff --git a/plugins/icesat2/plugin/Atl03Reader.cpp b/plugins/icesat2/plugin/Atl03Reader.cpp
@@ -560,9 +560,10 @@ Atl03Reader::Atl03Data::Atl03Data (info_t* info, Region* region):
     {
         for(int i = 0; i < geolocation_fields->length(); i++)
         {
-            SafeString dataset_name("geolocation/%s", (*geolocation_fields)[i].getString());
+            const char* field_name = (*geolocation_fields)[i].getString();
+            SafeString dataset_name("geolocation/%s", field_name);
             GTDArray* array = new GTDArray(info->reader->asset, info->reader->resource, info->track, dataset_name.getString(), &info->reader->context, 0, region->first_segment, region->num_segments);
-            anc_geolocation.add(dataset_name.getString(), array);
+            anc_geolocation.add(field_name, array);
         }
     }
 
@@ -571,9 +572,10 @@ Atl03Reader::Atl03Data::Atl03Data (info_t* info, Region* region):
     {
         for(int i = 0; i < geocorrection_fields->length(); i++)
         {
-            SafeString dataset_name("geophys_corr/%s", (*geocorrection_fields)[i].getString());
+            const char* field_name = (*geocorrection_fields)[i].getString();
+            SafeString dataset_name("geophys_corr/%s", field_name);
             GTDArray* array = new GTDArray(info->reader->asset, info->reader->resource, info->track, dataset_name.getString(), &info->reader->context, 0, region->first_segment, region->num_segments);
-            anc_geocorrection.add(dataset_name.getString(), array);
+            anc_geocorrection.add(field_name, array);
         }
     }
 
@@ -582,9 +584,10 @@ Atl03Reader::Atl03Data::Atl03Data (info_t* info, Region* region):
     {
         for(int i = 0; i < height_fields->length(); i++)
         {
-            SafeString dataset_name("heights/%s", (*height_fields)[i].getString());
+            const char* field_name = (*height_fields)[i].getString();
+            SafeString dataset_name("heights/%s", field_name);
             GTDArray* array = new GTDArray(info->reader->asset, info->reader->resource, info->track, dataset_name.getString(), &info->reader->context, 0, region->first_photon,  region->num_photons);
-            anc_height.add(dataset_name.getString(), array);
+            anc_height.add(field_name, array);
         }
     }
 
@@ -665,9 +668,10 @@ Atl03Reader::Atl08Class::Atl08Class (info_t* info):
     {
         for(int i = 0; i < signal_photon_fields->length(); i++)
         {
-            SafeString dataset_name("signal_photons/%s", (*signal_photon_fields)[i].getString());
+            const char* field_name = (*signal_photon_fields)[i].getString();
+            SafeString dataset_name("signal_photons/%s", field_name);
             GTDArray* array = new GTDArray(info->reader->asset, info->reader->resource08, info->track, dataset_name.getString(), &info->reader->context08);
-            anc_signal_photons.add(dataset_name.getString(), array);
+            anc_signal_photons.add(field_name, array);
         }
     }
 
@@ -1471,7 +1475,7 @@ void* Atl03Reader::subsettingThread (void* parm)
 
                 /* Send Ancillary Records */
                 reader->sendAncillaryGeoRecords(extent->extent_id, info->reader->parms->atl03_geolocation_fields, ANC_GEOLOCATION, &atl03.anc_geolocation, extent_segment, &local_stats);
-                reader->sendAncillaryGeoRecords(extent->extent_id, info->reader->parms->atl03_geolocation_fields, ANC_GEOCORRECTION, &atl03.anc_geocorrection, extent_segment, &local_stats);
+                reader->sendAncillaryGeoRecords(extent->extent_id, info->reader->parms->atl03_geocorrection_fields, ANC_GEOCORRECTION, &atl03.anc_geocorrection, extent_segment, &local_stats);
             }
             else // neither pair in extent valid
             {