resolved conflicts

Author: jungkyoJung

python/packages/nisar/workflows/insar.py

@@ -56,6 +56,11 @@ def run(cfg: dict, out_paths: dict, run_steps: dict):
         else:
             crossmul.run(cfg, out_paths['RIFG'], 'coarse')
 
+    # Run insar_filter only
+    if run_steps['filter_interferogram'] and \
+        cfg['processing']['filter_interferogram']['filter_type'] != 'no_filter':
+        filter_interferogram.run(cfg, out_paths['RIFG'])
+
     if run_steps['unwrap'] and 'RUNW' in out_paths:
         unwrap.run(cfg, out_paths['RIFG'], out_paths['RUNW'])
 

tests/python/packages/CMakeLists.txt

@@ -48,6 +48,8 @@ set_tests_properties(test.python.pkg.nisar.workflows.resample_slc PROPERTIES
              DEPENDS test.python.pkg.nisar.workflows.geo2rdr)
 set_tests_properties(test.python.pkg.nisar.workflows.crossmul PROPERTIES
              DEPENDS test.python.pkg.nisar.workflows.resample_slc)
+set_tests_properties(test.python.pkg.nisar.workflows.filter_interferogram PROPERTIES
+             DEPENDS test.python.pkg.nisar.workflows.crossmul)
 # using rdr2geo outputs as RUNW rasters to confirm geocode run
 # using RUNW HDF5 needed as a verifiable dummy RUNW input
 set_tests_properties(test.python.pkg.nisar.workflows.geocode_insar PROPERTIES