Skip to content

Commit 75bd0fc

Browse files
yzheng6vbrancat
authored and
GitHub Enterprise
committed
Update InSAR workflow test runconfigs to work with latest code (#818)
Update InSAR workflow test runconfig parameters to be able to run successfully with latest ISCE3 software. Also updated workflow QA execution code to use the more appropriate InSAR product names in the updated runconfigs. A different PR will be considered to remove default fields from the runconfigs to avoid similar problems in the future. Co-authored-by: vbrancat <[email protected]>
1 parent 758a1a9 commit 75bd0fc

File tree

4 files changed

+47
-37
lines changed

4 files changed

+47
-37
lines changed

‎tools/imagesets/imgset.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,11 @@ def insarqa(self, tests=None):
496496
qadir = pjoin(testdir, f"qa_{product}")
497497
os.makedirs(qadir, exist_ok=True)
498498
log = pjoin(qadir,f"stdouterr.log")
499-
cmd = [f"time cfchecks.py output_{wfname}/{product.upper()}_gunw.h5"]
499+
cmd = [f"time cfchecks.py output_{wfname}/{product.upper()}_product.h5"]
500500
if product == 'gunw':
501501
cmd.append(f"""time verify_gunw.py --fpdf qa_{product}/graphs.pdf \
502502
--fhdf qa_{product}/stats.h5 --flog qa_{product}/qa.log --validate \
503-
output_{wfname}/{product.upper()}_gunw.h5""")
503+
output_{wfname}/{product.upper()}_product.h5""")
504504
try:
505505
self.distribrun(testdir, cmd, logfile=log, nisarimg=True,
506506
loghdlrname=f'wfqa.{os.path.basename(testdir)}.{product}')

‎tools/imagesets/runconfigs/insar_UAVSAR_NISARP_32039_19049-005_19052-004_129.yaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runconfig:
2424

2525
# REQUIRED - SAS writes output product to the following file. PGE may rename.
2626
# NOTE: For R2 will need to handle mixed-mode case with multiple outputs of RSLC workflow.
27-
SASOutputFile: output_insar/gunw.h5
27+
SASOutputFile: output_insar/product.h5
2828

2929
PrimaryExecutable:
3030
ProductType: RIFG_RUNW_GUNW
@@ -44,8 +44,6 @@ runconfig:
4444
# [polarizations] for list of specific frequency(s) e.g. [HH, HV] or [HH]
4545
A: [HH, VV]
4646

47-
48-
4947
# TODO OPTIONAL - Only checked when internet access is available
5048
dem_download:
5149
# OPTIONAL - s3 bucket / curl URL / local file
@@ -89,41 +87,45 @@ runconfig:
8987
y_abs:
9088
x_abs:
9189

92-
geo2rdr:
90+
geo2rdr:
9391
threshold: 1e-8
9492
maxiter: 25
95-
93+
9694
blocksize:
9795
y: 1000
9896

9997
dem_margin: 0.1
10098

101-
resample:
99+
coarse_resample:
102100
lines_per_tile: 100
103101

104102
dense_offsets:
105-
# OPTIONAL - Flag to enable/disable dense offsets estimation. Default True
106-
enabled: False
103+
enabled: True
104+
105+
rubbersheet:
106+
enabled: True
107+
108+
fine_resample:
109+
enabled: True
107110

108111
crossmul:
109112
flatten: True
110113
range_looks: 11
111114
azimuth_looks: 11
112115

113116
phase_unwrap:
114-
crossmul_path:
115-
buffer_lines: 1000
117+
crossmul_path:
118+
algorithm: icu
116119

117120
# TODO OPTIONAL - To setup type of worker
118121
worker:
119122
# OPTIONAL - To prevent downloading DEM / other data automatically. Default True
120123
internet_access: False
121124

122125
# OPTIONAL - To explicitly use GPU capability if available. Default False
123-
gpu_enabled: False
126+
gpu_enabled: True
124127

125128
# OPTIONAL - Location to save logs, use runconfig*_yaml.log if not specified
126-
logging:
129+
logging:
127130
path: output_insar/insar.log
128131
write_mode: 'w'
129-

‎tools/imagesets/runconfigs/insar_UAVSAR_SanAnd_05518_12018-000_12128-008_143.yaml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runconfig:
2424

2525
# REQUIRED - SAS writes output product to the following file. PGE may rename.
2626
# NOTE: For R2 will need to handle mixed-mode case with multiple outputs of RSLC workflow.
27-
SASOutputFile: output_insar/gunw.h5
27+
SASOutputFile: output_insar/product.h5
2828

2929
PrimaryExecutable:
3030
ProductType: RIFG_RUNW_GUNW
@@ -80,7 +80,7 @@ runconfig:
8080
# OPTIONAL - Can control with absolute values or with snap values
8181
top_left:
8282
# OPTIONAL - Set top-left y in same units as output EPSG
83-
y_abs:
83+
y_abs:
8484
# OPTIONAL - Set top-left x in same units as output EPSG
8585
x_abs:
8686

@@ -89,30 +89,36 @@ runconfig:
8989
y_abs:
9090
x_abs:
9191

92-
geo2rdr:
92+
geo2rdr:
9393
threshold: 1e-8
9494
maxiter: 25
95-
95+
9696
blocksize:
9797
y: 1000
9898

9999
dem_margin: 0.1
100100

101-
resample:
101+
coarse_resample:
102102
lines_per_tile: 100
103103

104104
dense_offsets:
105105
# OPTIONAL - Flag to enable/disable dense offsets estimation. Default True
106-
enabled: False
106+
enabled: True
107+
108+
rubbersheet:
109+
enabled: True
110+
111+
fine_resample:
112+
enabled: True
107113

108114
crossmul:
109115
flatten: True
110116
range_looks: 11
111117
azimuth_looks: 11
112118

113119
phase_unwrap:
114-
crossmul_path:
115-
buffer_lines: 1000
120+
crossmul_path:
121+
algorithm: icu
116122

117123
# TODO OPTIONAL - To setup type of worker
118124
worker:
@@ -123,7 +129,6 @@ runconfig:
123129
gpu_enabled: True
124130

125131
# OPTIONAL - Location to save logs, use runconfig*_yaml.log if not specified
126-
logging:
132+
logging:
127133
path: output_insar/insar.log
128134
write_mode: 'w'
129-

‎tools/imagesets/runconfigs/insar_UAVSAR_Snjoaq_14511_18034-014_18044-015_143.yaml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runconfig:
2424

2525
# REQUIRED - SAS writes output product to the following file. PGE may rename.
2626
# NOTE: For R2 will need to handle mixed-mode case with multiple outputs of RSLC workflow.
27-
SASOutputFile: output_insar/gunw.h5
27+
SASOutputFile: output_insar/product.h5
2828

2929
PrimaryExecutable:
3030
ProductType: RIFG_RUNW_GUNW
@@ -44,8 +44,6 @@ runconfig:
4444
# [polarizations] for list of specific frequency(s) e.g. [HH, HV] or [HH]
4545
A: [HH, VV]
4646

47-
48-
4947
# TODO OPTIONAL - Only checked when internet access is available
5048
dem_download:
5149
# OPTIONAL - s3 bucket / curl URL / local file
@@ -80,7 +78,7 @@ runconfig:
8078
# OPTIONAL - Can control with absolute values or with snap values
8179
top_left:
8280
# OPTIONAL - Set top-left y in same units as output EPSG
83-
y_abs:
81+
y_abs:
8482
# OPTIONAL - Set top-left x in same units as output EPSG
8583
x_abs:
8684

@@ -89,30 +87,36 @@ runconfig:
8987
y_abs:
9088
x_abs:
9189

92-
geo2rdr:
90+
geo2rdr:
9391
threshold: 1e-8
9492
maxiter: 25
95-
93+
9694
blocksize:
9795
y: 1000
9896

9997
dem_margin: 0.1
10098

101-
resample:
99+
coarse_resample:
102100
lines_per_tile: 100
103101

104102
dense_offsets:
105103
# OPTIONAL - Flag to enable/disable dense offsets estimation. Default True
106-
enabled: False
104+
enabled: True
105+
106+
rubbersheet:
107+
enabled: True
108+
109+
fine_resample:
110+
enabled: True
107111

108112
crossmul:
109113
flatten: True
110114
range_looks: 11
111115
azimuth_looks: 11
112116

113117
phase_unwrap:
114-
crossmul_path:
115-
buffer_lines: 1000
118+
crossmul_path:
119+
algorithm: icu
116120

117121
# TODO OPTIONAL - To setup type of worker
118122
worker:
@@ -123,7 +127,6 @@ runconfig:
123127
gpu_enabled: True
124128

125129
# OPTIONAL - Location to save logs, use runconfig*_yaml.log if not specified
126-
logging:
130+
logging:
127131
path: output_insar/insar.log
128132
write_mode: 'w'
129-

0 commit comments

Comments
 (0)