Skip to content

Commit 1677ea6

Browse files
jshimada47GitHub Enterprise
authored andcommitted
Removed beamformtest workflow test, which is no longer needed after (#965)
integration of beamformer into ISCE3.
1 parent fd74d38 commit 1677ea6

File tree

3 files changed

+0
-43
lines changed

3 files changed

+0
-43
lines changed

tools/imagesets/imgset.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ def fetchmindata(self):
270270
mindata = ["L0B_RRSD_REE1",
271271
"L0B_RRSD_REE_NOISEST1",
272272
"L0B_RRSD_REE17_PTA",
273-
"L0B_RRSD_REE_beamform",
274273
"L1_RSLC_UAVSAR_SanAnd_05024_18038_006_180730_L090_CX_129_05",
275274
"L1_RSLC_UAVSAR_NISARP_32039_19049_005_190717_L090_CX_129_03",
276275
"L1_RSLC_UAVSAR_NISARP_32039_19052_004_190726_L090_CX_129_02",
@@ -490,27 +489,6 @@ def ptatest(self, tests=None):
490489
except subprocess.CalledProcessError as e:
491490
raise RuntimeError(f"CalTool point target analyzer tool test {testname} failed") from e
492491

493-
def beamformtest(self, tests=None):
494-
if tests is None:
495-
tests = workflowtests['beamform'].items()
496-
for testname, dataname in tests:
497-
print(f"\nRunning CalTool beamformer test {testname}\n")
498-
testdir = os.path.abspath(pjoin(self.testdir, testname))
499-
os.makedirs(pjoin(testdir, f"output_beamform"), exist_ok=True)
500-
log = pjoin(testdir, f"output_beamform", "stdouterr.log")
501-
cmd = [f"""time beamform_tx.py -i input_{dataname[0]}/{dataname[1]} \
502-
-a input_{dataname[0]}/{dataname[2]} \
503-
-o output_beamform/beamform_tx_output.txt""",
504-
f"""time beamform_rx.py -i input_{dataname[0]}/{dataname[1]} \
505-
-a input_{dataname[0]}/{dataname[2]} \
506-
-c input_{dataname[0]}/{dataname[3]} \
507-
-o output_beamform/beamform_rx_output.txt"""]
508-
try:
509-
self.distribrun(testdir, cmd, logfile=log, dataname=dataname[0], nisarimg=True,
510-
loghdlrname=f"wftest.{os.path.basename(testdir)}")
511-
except subprocess.CalledProcessError as e:
512-
raise RuntimeError(f"CalTool beamformer tool test {testname} failed") from e
513-
514492
def soilmtest(self, tests=None):
515493
if tests is None:
516494
tests = workflowtests['soilm'].items()
@@ -539,7 +517,6 @@ def mintests(self):
539517
self.insartest(tests=list(workflowtests['insar'].items())[:1])
540518
self.noisesttest(tests=list(workflowtests['noisest'].items())[:1])
541519
self.ptatest(tests=list(workflowtests['pta'].items())[:1])
542-
self.beamformtest(tests=list(workflowtests['beamform'].items())[:1])
543520

544521
def workflowqa(self, wfname, testname, suf="", description=""):
545522
"""

tools/imagesets/workflowdata.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@
8484
"rslc_ree17.h5",
8585
],
8686

87-
"L0B_RRSD_REE_beamform":
88-
[
89-
"REE_L0B_ECHO_DATA.h5",
90-
"REE_ANTPAT_CUTS_DATA.h5",
91-
"instrumentTables_bf_19000101.h5",
92-
"ree_gen_nisar_product.log",
93-
"README.txt",
94-
],
95-
9687
"L1_RSLC_S1B_IW_SLC__1SDV_20180504T104507_20180504T104535_010770_013AEE_919F":
9788
[
9889
"S1B_IW_SLC__1SDV_20180504T104507_20180504T104535_010770_013AEE_919F.h5",
@@ -256,16 +247,6 @@
256247
"REE17_PTA",
257248
]},
258249

259-
'beamform': {
260-
"beamform_L0B_RRSD_REE_beamform":
261-
[
262-
"L0B_RRSD_REE_beamform", # input data directory
263-
"REE_L0B_ECHO_DATA.h5", # L0B data
264-
"REE_ANTPAT_CUTS_DATA.h5", # antenna pattern
265-
"instrumentTables_bf_19000101.h5", # instrument tables
266-
],
267-
},
268-
269250
'soilm': {"soilm_" + name: "L2_GCOV_" + name for name in [
270251
"001_005_A_219_4020_HH_20200926T135152_20200926T135219_P01101_M_P_001-004",
271252
]},

tools/run.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ def run(*, steps, imgset, **kwargs):
2424
"makedistrib_nisar",
2525
"noisesttest",
2626
"ptatest",
27-
"beamformtest",
2827
"soilmtest",
2928
"rslcqa",
3029
"gslcqa",

0 commit comments

Comments
 (0)