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 2ac16f7592d63e8eadfcc7fdb4c11ca5d064dd3d Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Mon, 23 Mar 2026 16:58:22 +0000 Subject: [PATCH 3/5] fix the frequency bug --- .../packages/nisar/workflows/solid_earth_tides.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/python/packages/nisar/workflows/solid_earth_tides.py b/python/packages/nisar/workflows/solid_earth_tides.py index ada013e50..1c072726b 100644 --- a/python/packages/nisar/workflows/solid_earth_tides.py +++ b/python/packages/nisar/workflows/solid_earth_tides.py @@ -266,9 +266,17 @@ def _extract_ref_epoch(ds_name: str): projection_dataset = h5_obj[f'{rdr_grid_path}/projection'] epsg = projection_dataset.attrs['epsg_code'] - # Wavelength in meters - wavelength = isce3.core.speed_of_light / \ - h5_obj[f'{gunw_obj.GridsPath}/frequencyA/centerFrequency'][()] + # Wavelength in meters + for freq in ('A', 'B'): + if (key := f'{gunw_obj.GridsPath}/frequency{freq}/centerFrequency') in h5_obj: + wavelength = isce3.core.speed_of_light / h5_obj[key][()] + break + else: + err_msg = ( + f"Neither 'frequencyA' nor 'frequencyB' centerFrequency found " + f"in '{gunw_obj.GridsPath}' for the solid earth tides compuation") + err_channel.log(err_msg) + raise KeyError(err_msg) return (inc_angle_cube, los_unit_vector_x_cube, From a6dbedee969f4c89d23f109716d222029634b8cf Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Mon, 23 Mar 2026 17:08:16 +0000 Subject: [PATCH 4/5] fix typos --- python/packages/nisar/workflows/solid_earth_tides.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/packages/nisar/workflows/solid_earth_tides.py b/python/packages/nisar/workflows/solid_earth_tides.py index 1c072726b..094f8845b 100644 --- a/python/packages/nisar/workflows/solid_earth_tides.py +++ b/python/packages/nisar/workflows/solid_earth_tides.py @@ -274,7 +274,7 @@ def _extract_ref_epoch(ds_name: str): else: err_msg = ( f"Neither 'frequencyA' nor 'frequencyB' centerFrequency found " - f"in '{gunw_obj.GridsPath}' for the solid earth tides compuation") + f"in '{gunw_obj.GridsPath}' for solid earth tides computation") err_channel.log(err_msg) raise KeyError(err_msg) From 54dba04ed2adf4a292b939ea643ed0bfc88896db Mon Sep 17 00:00:00 2001 From: Xiaodong Huang Date: Mon, 23 Mar 2026 17:09:33 +0000 Subject: [PATCH 5/5] add the comments --- python/packages/nisar/workflows/solid_earth_tides.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/packages/nisar/workflows/solid_earth_tides.py b/python/packages/nisar/workflows/solid_earth_tides.py index 094f8845b..277e1bdf8 100644 --- a/python/packages/nisar/workflows/solid_earth_tides.py +++ b/python/packages/nisar/workflows/solid_earth_tides.py @@ -266,7 +266,7 @@ def _extract_ref_epoch(ds_name: str): projection_dataset = h5_obj[f'{rdr_grid_path}/projection'] epsg = projection_dataset.attrs['epsg_code'] - # Wavelength in meters + # Wavelength in meters; fall back to frequencyB if frequencyA is not found for freq in ('A', 'B'): if (key := f'{gunw_obj.GridsPath}/frequency{freq}/centerFrequency') in h5_obj: wavelength = isce3.core.speed_of_light / h5_obj[key][()]