From da95af1971b8ea0069b12182f026a51e92d87be9 Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Tue, 19 Sep 2023 20:40:36 +0000 Subject: [PATCH 1/3] sm r3.4 --- tools/imagesets/oracle8conda/distrib_nisar/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile b/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile index c34cb42af..45ecd19c0 100644 --- a/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile +++ b/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile @@ -12,7 +12,7 @@ RUN cd /opt \ && git clone https://$GIT_OAUTH_TOKEN@github-fn.jpl.nasa.gov/NISAR-ADT/SoilMoisture \ && git clone https://$GIT_OAUTH_TOKEN@github-fn.jpl.nasa.gov/NISAR-ADT/QualityAssurance \ && cd /opt/QualityAssurance && git checkout v4.0.0 && rm -rf .git \ - && cd /opt/SoilMoisture && git checkout f62fe7b47001aea2195f3c8e88d5f7d3a30e71a7 && rm -rf .git + && cd /opt/SoilMoisture && git checkout 93a364c05de2819fce0df704126320cfb5face68 && rm -rf .git FROM $distrib_img From b6cfbbb18c2c162e4f6c0e08996d3f9531d1295f Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Thu, 23 May 2024 21:23:36 +0000 Subject: [PATCH 2/3] change the SM commit id for R4.0.2 --- tools/imagesets/oracle8conda/distrib_nisar/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile b/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile index 27c27c5c2..d118c6252 100644 --- a/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile +++ b/tools/imagesets/oracle8conda/distrib_nisar/Dockerfile @@ -12,7 +12,7 @@ RUN cd /opt \ && git clone https://$GIT_OAUTH_TOKEN@github-fn.jpl.nasa.gov/NISAR-ADT/SoilMoisture \ && git clone https://$GIT_OAUTH_TOKEN@github-fn.jpl.nasa.gov/NISAR-ADT/QualityAssurance \ && cd /opt/QualityAssurance && git checkout v9.0.0 && rm -rf .git \ - && cd /opt/SoilMoisture && git checkout d4391e350dd8781a79b2f736ec84bc05967b38d9 && rm -rf .git + && cd /opt/SoilMoisture && git checkout 9b437761673d97004b46e22a74ee67cc1b26e280 && rm -rf .git FROM $distrib_img From 1abf758b980fa613729010bc3f8edcd047daf984 Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Wed, 19 Aug 2026 23:51:45 +0000 Subject: [PATCH 3/3] fix the prod spec 304 --- .../packages/nisar/products/insar/GOFF_writer.py | 4 ++-- .../packages/nisar/products/insar/GUNW_writer.py | 4 ++-- .../nisar/products/insar/InSAR_L1_writer.py | 4 ++-- python/packages/nisar/workflows/compute_stats.py | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/python/packages/nisar/products/insar/GOFF_writer.py b/python/packages/nisar/products/insar/GOFF_writer.py index 9c6b033a1..029bbbd8a 100644 --- a/python/packages/nisar/products/insar/GOFF_writer.py +++ b/python/packages/nisar/products/insar/GOFF_writer.py @@ -138,8 +138,8 @@ def add_grids_to_hdf5(self): yds=yds, fill_value=255, ) - offset_group['mask'].attrs['valid_min'] = 0 - offset_group['mask'].attrs['percentage_water'] = 0.0 + offset_group['mask'].attrs['valid_min'] = np.uint32(0) + offset_group['mask'].attrs['percentage_water'] = np.float32(0.0) offset_group['mask'].attrs['disclaimer'] = to_bytes(self.water_mask_source) pixeloffsets_group_name = \ diff --git a/python/packages/nisar/products/insar/GUNW_writer.py b/python/packages/nisar/products/insar/GUNW_writer.py index cbe3c837b..ff55bf9d0 100644 --- a/python/packages/nisar/products/insar/GUNW_writer.py +++ b/python/packages/nisar/products/insar/GUNW_writer.py @@ -330,8 +330,8 @@ def add_grids_to_hdf5(self): yds=yds, fill_value=255, ) - ds_group['mask'].attrs['valid_min'] = 0 - ds_group['mask'].attrs['percentage_water'] = 0.0 + ds_group['mask'].attrs['valid_min'] = np.uint32(0) + ds_group['mask'].attrs['percentage_water'] = np.float32(0.0) ds_group['mask'].attrs['disclaimer'] = to_bytes(self.water_mask_source) for pol in pol_list: diff --git a/python/packages/nisar/products/insar/InSAR_L1_writer.py b/python/packages/nisar/products/insar/InSAR_L1_writer.py index 1d122aae2..a12fa0190 100644 --- a/python/packages/nisar/products/insar/InSAR_L1_writer.py +++ b/python/packages/nisar/products/insar/InSAR_L1_writer.py @@ -508,7 +508,7 @@ def add_pixel_offsets_to_swaths_group(self): " Bits 24-31 are reserved for future use"), fill_value=255) offset_group['mask'].attrs['long_name'] = to_bytes("Valid samples subswath and data anomaly mask") - offset_group['mask'].attrs['valid_min'] = 0 + offset_group['mask'].attrs['valid_min'] = np.uint32(0) range_offset_path = \ os.path.join( self.topo_path, @@ -738,7 +738,7 @@ def add_interferogram_to_swaths_group(self, is_unwrapped=False): dtype=np.uint32, description=mask_description, fill_value=255) - igram_group['mask'].attrs['valid_min'] = 0 + igram_group['mask'].attrs['valid_min'] = np.uint32(0) igram_group['mask'].attrs['long_name'] = to_bytes("Valid samples subswath and data anomaly mask") range_offset_path = \ diff --git a/python/packages/nisar/workflows/compute_stats.py b/python/packages/nisar/workflows/compute_stats.py index dfdfa0895..ee8afddf7 100644 --- a/python/packages/nisar/workflows/compute_stats.py +++ b/python/packages/nisar/workflows/compute_stats.py @@ -35,10 +35,10 @@ def compute_stats_real_hdf5_dataset(h5_ds): h5_ds: h5py.Dataset hdf5 dataset object """ - h5_ds.attrs.create('min_value', data=np.nanmin(h5_ds)) - h5_ds.attrs.create('mean_value', data=np.nanmean(h5_ds)) - h5_ds.attrs.create('max_value', data=np.nanmax(h5_ds)) - h5_ds.attrs.create('sample_stddev', data=np.nanstd(h5_ds)) + h5_ds.attrs.create('min_value', data=h5_ds.dtype.type(np.nanmin(h5_ds))) + h5_ds.attrs.create('mean_value', data=h5_ds.dtype.type(np.nanmean(h5_ds))) + h5_ds.attrs.create('max_value', data=h5_ds.dtype.type(np.nanmax(h5_ds))) + h5_ds.attrs.create('sample_stddev', data=h5_ds.dtype.type(np.nanstd(h5_ds))) def compute_stats_real_data(raster, h5_ds): """ @@ -53,11 +53,11 @@ def compute_stats_real_data(raster, h5_ds): stats_obj = isce3.math.compute_raster_stats_float64(raster)[0] else: stats_obj = isce3.math.compute_raster_stats_float32(raster)[0] - h5_ds.attrs.create('min_value', data=stats_obj.min) - h5_ds.attrs.create('mean_value', data=stats_obj.mean) - h5_ds.attrs.create('max_value', data=stats_obj.max) + h5_ds.attrs.create('min_value', data=h5_ds.dtype.type(stats_obj.min)) + h5_ds.attrs.create('mean_value', data=h5_ds.dtype.type(stats_obj.mean)) + h5_ds.attrs.create('max_value', data=h5_ds.dtype.type(stats_obj.max)) h5_ds.attrs.create('sample_stddev', - data=stats_obj.sample_stddev) + data=h5_ds.dtype.type(stats_obj.sample_stddev)) def compute_layover_shadow_water_stats(h5_ds, lines_per_block=1000): '''