resolved conflicts

Author: jungkyoJung

python/packages/nisar/workflows/insar.py

@@ -3,8 +3,8 @@
 
 import journal
 from nisar.workflows import (crossmul, dense_offsets, geo2rdr,
-                             geocode_insar, h5_prep, rdr2geo,
-                             resample_slc, rubbersheet, unwrap,
+                             geocode_insar, h5_prep, filter_interferogram,
+                             rdr2geo, resample_slc, rubbersheet, unwrap,
                              bandpass_insar)
 from nisar.workflows.insar_runconfig import InsarRunConfig
 from nisar.workflows.persistence import Persistence

python/packages/nisar/workflows/persistence.py

@@ -7,9 +7,9 @@ class Persistence():
     basic class that determines InSAR persistence
     '''
     # init InSAR steps in reverse chronological run order
-    insar_steps = ['geocode', 'unwrap', 'crossmul', 'fine_resample', 'rubbersheet',
-                   'dense_offsets', 'coarse_resample', 'geo2rdr', 'rdr2geo', 'h5_prep',
-                   'bandpass_insar']
+    insar_steps = ['geocode', 'unwrap', 'filter_interferogram', 'crossmul', 'fine_resample', 
+                   'rubbersheet', 'dense_offsets', 'coarse_resample', 'geo2rdr', 'rdr2geo', 
+                   'h5_prep', 'bandpass_insar']
 
     def __init__(self, restart=False):
         # bool flag that determines if insar.run is called

tests/python/packages/CMakeLists.txt

@@ -11,6 +11,7 @@ nisar/workflows/geocode_insar.py
 nisar/workflows/gslc.py
 nisar/workflows/gpu_check.py
 nisar/workflows/insar.py
+nisar/workflows/filter_interferogram.py
 nisar/workflows/bandpass_insar.py
 nisar/workflows/process_args.py
 nisar/workflows/point_target_info.py