Add caltool tests (#837)

* Update PTA test and remove obsolete test/data
* Add beamformer tests

Author: yzheng6

tools/imagesets/centos7conda/distrib_nisar/Dockerfile

@@ -11,9 +11,9 @@ RUN cd /opt \
  && git clone https://[email protected]/NISAR-ADT/QualityAssurance \
  && git clone https://[email protected]/NISAR-ADT/CFChecker \
  && git clone https://[email protected]/NISAR-ADT/calTools \
- && cd /opt/QualityAssurance && git checkout R1.1 && rm -rf .git \
+ && cd /opt/QualityAssurance && git checkout cd455fd && rm -rf .git \
  && cd /opt/CFChecker && git checkout R1.1 && rm -rf .git \
- && cd /opt/calTools && git checkout R1.1 && rm -rf .git 
+ && cd /opt/calTools && git checkout R2 && rm -rf .git 
 
 FROM $distrib_img
 

tools/imagesets/imgset.py

@@ -404,15 +404,33 @@ def ptatest(self, tests=None):
             testdir = os.path.abspath(pjoin(self.testdir, testname))
             os.makedirs(pjoin(testdir, f"output_pta"), exist_ok=True)
             log = pjoin(testdir, f"output_pta", "stdouterr.log")
-            cmd = [f"""time python -m pybind_nisar.workflows.point_target_info \
-                                   input_{dataname}/{workflowdata[dataname][0]} 512 256 256 \
-                                   --fs-bw-ratio 2 --mlobe-nulls 2 --search-null > output_pta/pta.json"""]
+            cmd = [f"""time point_target_analysis.py -i input_{dataname}/rslc_ree17.h5\
+                            -f 'A' -p 'HH' -c 3.177 -54.58 0 --fs-bw-ratio 2 --mlobe-nulls 2 \
+                            --search-null --num-lobes 10 --num-search-pix 6 -o output_pta/pta.json"""]
             try:
                 self.distribrun(testdir, cmd, logfile=log, dataname=dataname, nisarimg=True,
                                 loghdlrname=f'wftest.{os.path.basename(testdir)}')
             except subprocess.CalledProcessError as e:
                 raise RuntimeError(f"CalTool point target analyzer tool test {testname} failed") from e
 
+    def beamformtest(self, tests=None):
+        if tests is None:
+            tests = workflowtests['beamform'].items()
+        for testname, dataname in tests:
+            print(f"\nRunning CalTool beamformer test {testname}\n")
+            testdir = os.path.abspath(pjoin(self.testdir, testname))
+            os.makedirs(pjoin(testdir, f"output_beamform"), exist_ok=True)
+            log = pjoin(testdir, f"output_beamform", "stdouterr.log")
+            for btype, copt in [("tx", ""), ("rx", f"-c input_{dataname[0]}/{dataname[3]}")]:
+                cmd = [f"""time beamform_{btype}.py -i input_{dataname[0]}/{dataname[1]} \
+                                -a input_{dataname[0]}/{dataname[2]} {copt} \
+                                -o output_beamform/beamform_{btype}_output.txt"""] 
+                try:
+                    self.distribrun(testdir, cmd, logfile=log, dataname=dataname[0], nisarimg=True,
+                                    loghdlrname=f"wftest.{os.path.basename(testdir)}")
+                except subprocess.CalledProcessError as e:
+                    raise RuntimeError(f"CalTool beamformer tool test {testname} failed") from e
+
     def mintests(self):
         """
         Only run first test from each workflow
@@ -423,6 +441,7 @@ def mintests(self):
         self.insartest(tests=list(workflowtests['insar'].items())[:1])
         self.noisesttest(tests=list(workflowtests['noisest'].items())[:1])
         self.ptatest(tests=list(workflowtests['pta'].items())[:1])
+        self.beamformtest(tests=list(workflowtests['beamform'].items())[:1])
 
     def workflowqa(self, wfname, testname):
         """

tools/imagesets/workflowdata.py

@@ -54,9 +54,18 @@
             "L0B_RRSD_REE_NOISEST1.h5", 
             "README.txt",
         ],
-        "L0B_RRSD_REE_PTA1":
+
+        "L0B_RRSD_REE17_PTA":
+        [
+            "rslc_ree17.h5",
+        ],
+
+        "L0B_RRSD_REE_beamform":
         [
-            "L0B_RRSD_REE_PTA1.c8",
+            "REE_L0B_ECHO_DATA.h5",
+            "REE_ANTPAT_CUTS_DATA.h5",
+            "instrumentTables_bf_19000101.h5",
+            "ree_gen_nisar_product.log",
             "README.txt",
         ],
 
@@ -187,6 +196,16 @@
     ]},
 
     'pta': {"pta_" + name: "L0B_RRSD_" + name for name in [
-        "REE_PTA1",
+        "REE17_PTA",
     ]},
+
+    'beamform': {                                                    
+        "beamform_L0B_RRSD_REE_beamform":
+            [
+                "L0B_RRSD_REE_beamform",            # input data directory
+                "REE_L0B_ECHO_DATA.h5",             # L0B data
+                "REE_ANTPAT_CUTS_DATA.h5",          # antenna pattern 
+                "instrumentTables_bf_19000101.h5",  # instrument tables
+            ],
+    },
 }    

tools/run.py

@@ -23,6 +23,7 @@ def run(*, steps, imgset, **kwargs):
         "makedistrib_nisar",
         "noisesttest",
         "ptatest",
+        "beamformtest",
         "rslcqa",
         "gslcqa",
         "gcovqa",