diff --git a/CHANGELOG.md b/CHANGELOG.md index b55f52e5..3e82e80e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Unreleased +**Changed** + +- Moved all `OPERA_` variables to a new module `dolphin.opera_utils`. + - Other OPERA-specific quirks have been moved to the seperate `disp-s1` repo, + but the functions remaining are the ones that seem most broadly useful to `sweets` + and other users working with burst SLCs. # [0.4.1](https://github.com/isce-framework/dolphin/compare/v0.4.0...v0.4.1) - 2023-09-08 diff --git a/src/dolphin/opera_utils.py b/src/dolphin/opera_utils.py index a86a2999..f8f1876d 100644 --- a/src/dolphin/opera_utils.py +++ b/src/dolphin/opera_utils.py @@ -47,7 +47,7 @@ def group_by_burst( list of paths of CSLC files burst_id_fmt: str format of the burst id in the filename. - Default is [`OPERA_BURST_RE`][dolphin.workflows.config.OPERA_BURST_RE] + Default is [`OPERA_BURST_RE`][dolphin.opera_utils.OPERA_BURST_RE] minimum_images: int Minimum number of SLCs needed to run the workflow for each burst. If there are fewer SLCs in a burst, it will be skipped and diff --git a/tests/test_workflows_s1_disp.py b/tests/test_workflows_s1_disp.py index bf6f0b1e..5accd07e 100644 --- a/tests/test_workflows_s1_disp.py +++ b/tests/test_workflows_s1_disp.py @@ -7,6 +7,7 @@ import pytest from make_netcdf import create_test_nc +from dolphin.opera_utils import OPERA_DATASET_NAME from dolphin.workflows import config, s1_disp # 'Grid size 49 will likely result in GPU under-utilization due to low occupancy.' @@ -28,7 +29,7 @@ def opera_slc_files(tmp_path, slc_stack) -> list[Path]: d.mkdir() file_list = [] - *group_parts, ds_name = config.OPERA_DATASET_NAME.split("/") + *group_parts, ds_name = OPERA_DATASET_NAME.split("/") group = "/".join(group_parts) for burst_id in ["t087_185683_iw2", "t087_185684_iw2"]: for i in range(len(slc_stack)): @@ -54,6 +55,7 @@ def test_s1_disp_run_single(opera_slc_files: list[Path], tmpdir): cfg = config.Workflow( workflow_name=config.WorkflowName.SINGLE, cslc_file_list=opera_slc_files, + input_options=dict(subdataset="/data/VV"), interferogram_network=dict( network_type=config.InterferogramNetworkType.MANUAL_INDEX, indexes=[(0, -1)], @@ -73,6 +75,7 @@ def test_s1_disp_run_stack(opera_slc_files: list[Path], tmpdir): cfg = config.Workflow( workflow_name=config.WorkflowName.STACK, cslc_file_list=opera_slc_files, + input_options=dict(subdataset="/data/VV"), phase_linking=dict( ministack_size=500, ),