From da95af1971b8ea0069b12182f026a51e92d87be9 Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Tue, 19 Sep 2023 20:40:36 +0000 Subject: [PATCH 1/5] 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/5] 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 446fc198fb7998bf32fa45b65bf35c6ec33b89a7 Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Wed, 17 Jun 2026 22:09:20 +0000 Subject: [PATCH 3/5] fix the zero stats --- python/packages/nisar/workflows/unwrap.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/python/packages/nisar/workflows/unwrap.py b/python/packages/nisar/workflows/unwrap.py index 2efc6ec66..b034259d0 100644 --- a/python/packages/nisar/workflows/unwrap.py +++ b/python/packages/nisar/workflows/unwrap.py @@ -354,16 +354,17 @@ def run(cfg: dict, input_hdf5: str, output_hdf5: str): corr_path = \ str(f'{crossmul_scratch}/coherence_rg{unwrap_rg_looks}_az{unwrap_az_looks}') corr = open_raster(corr_path) + corr_raster = isce3.io.Raster(corr_path) dst_h5[dst_path][:, :] = corr + compute_stats_real_data(corr_raster, dst_dataset) else: dst_h5[dst_path][:, :] = src_h5[src_path][()] + dst_dataset = dst_h5[dst_path] - dst_dataset = dst_h5[dst_path] - dst_raster = isce3.io.Raster( - f"IH5:::ID={dst_dataset.id.id}".encode("utf-8"), - update=True) - compute_stats_real_data(dst_raster, dst_dataset) - + src_dataset = src_h5[src_path] + src_raster = isce3.io.Raster( + f"IH5:::ID={src_dataset.id.id}".encode("utf-8")) + compute_stats_real_data(src_raster, dst_dataset) t_all_elapsed = time.time() - t_all info_channel.log( From 22e2db4f2786ddc783c0ae986e1764278b6b5fad Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Wed, 17 Jun 2026 22:16:58 +0000 Subject: [PATCH 4/5] add the dataset --- python/packages/nisar/workflows/unwrap.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/packages/nisar/workflows/unwrap.py b/python/packages/nisar/workflows/unwrap.py index b034259d0..f10d5afe8 100644 --- a/python/packages/nisar/workflows/unwrap.py +++ b/python/packages/nisar/workflows/unwrap.py @@ -356,6 +356,7 @@ def run(cfg: dict, input_hdf5: str, output_hdf5: str): corr = open_raster(corr_path) corr_raster = isce3.io.Raster(corr_path) dst_h5[dst_path][:, :] = corr + dst_dataset = dst_h5[dst_path] compute_stats_real_data(corr_raster, dst_dataset) else: dst_h5[dst_path][:, :] = src_h5[src_path][()] From 76b25027cbb995fb35baa7495331053443687335 Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Wed, 1 Jul 2026 19:15:30 +0000 Subject: [PATCH 5/5] fix the iono stats --- python/packages/nisar/workflows/ionosphere.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python/packages/nisar/workflows/ionosphere.py b/python/packages/nisar/workflows/ionosphere.py index 5716c049f..0a8b3b630 100644 --- a/python/packages/nisar/workflows/ionosphere.py +++ b/python/packages/nisar/workflows/ionosphere.py @@ -38,7 +38,6 @@ from nisar.workflows.yaml_argparse import YamlArgparse from osgeo import gdal - def write_disp_block_hdf5( hdf5_path, path, @@ -337,6 +336,7 @@ def copy_iono_datasets(iono_insar_cfg, else: freq = 'B' + iono_layers_for_stats = [] with HDF5OptimizedReader(name=input_runw, mode='a', libver='latest', swmr=True) as src_h5, \ HDF5OptimizedReader(name=output_runw, mode='a', @@ -398,6 +398,7 @@ def copy_iono_datasets(iono_insar_cfg, src_iono_paths = [src_iono_path, src_iono_unct_path] dst_iono_paths = [iono_path, iono_unct_path] + iono_layers_for_stats += dst_iono_paths for block in range(0, nblocks): row_start = block * blocksize if (row_start + blocksize > rows_main): @@ -422,9 +423,11 @@ def copy_iono_datasets(iono_insar_cfg, dest_sel=np.s_[ row_start:row_start+block_rows_data, :]) - # Add statistics to ionosphere datasets in RUNW - for dst_iono_path in dst_iono_paths: - compute_stats_real_hdf5_dataset(dst_h5[dst_iono_path]) + # Add statistics to ionosphere datasets in RUNW + with HDF5OptimizedReader(name=output_runw, mode='a', + libver='latest', swmr=True) as dst_h5: + for dst_iono_path in iono_layers_for_stats: + compute_stats_real_hdf5_dataset(dst_h5[dst_iono_path]) def compute_differential_phase( @@ -1143,7 +1146,7 @@ def run(cfg: dict, runw_hdf5: str): filling_guide_median_size = filter_cfg['filling_guide_median_size'] filling_outlier_threshold = filter_cfg['filling_outlier_threshold'] filling_outlier_min_scale = filter_cfg['filling_outlier_min_scale'] - filling_outlier_mad_scale_factor = filter_cfg['filling_outlier_mad_scale_factor'] + filling_outlier_mad_scale_factor = filter_cfg['filling_outlier_mad_scale_factor'] filter_iterations = filter_cfg['filter_iterations'] median_filter_size = filter_cfg['median_filter_size']