Change Input files in InSAR schema (#1010)

* Expose offsets processing options

* Generate standalone ROFF product

* Include offsets product computation in InSAR workflow

* Revert "Expose offsets processing options"

This reverts commit e3ce076edde8eaf0cba2c3a19b291380224c7ea4.

* Revert "Generate standalone ROFF product"

This reverts commit 96b46d8e00362a9ed00ed5541adbc704a49a144d.

* Revert "Include offsets product computation in InSAR workflow"

This reverts commit ba7986d5f5f2c0805fe66b00cd720d2543c06fd9.

* Change input file group to include ref/sec RSLC paths

* Change input_file_grup/path RSLC ref/secondary

* Change input_file_path to one list element

* Change runconfig test cases

* Modify test cases runconfig

* Fix bug due to merge with develop

* input_file_group as string (instead of list) for GSLC and GCOV

* Modify input_file_group to string for GSLC and GCOV workflow

* Modify GSLC/GCOV test cases to have string (not list) as input_file_group

* Remove spacing within function

Author: Virginia Brancato

python/packages/nisar/workflows/bandpass_insar.py

@@ -20,8 +20,8 @@ def run(cfg: dict):
     run bandpass
     '''
     # pull parameters from cfg
-    ref_hdf5 = cfg['input_file_group']['input_file_path']
-    sec_hdf5 = cfg['input_file_group']['secondary_file_path']
+    ref_hdf5 = cfg['input_file_group']['reference_rslc_file_path']
+    sec_hdf5 = cfg['input_file_group']['secondary_rslc_file_path']
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']
     blocksize = cfg['processing']['bandpass']['lines_per_block']
     window_function = cfg['processing']['bandpass']['window_function']
@@ -67,7 +67,7 @@ def run(cfg: dict):
             base_slc = sec_slc
 
             # update reference SLC path 
-            cfg['input_file_group']['input_file_path'] = ref_slc_output
+            cfg['input_file_group']['reference_rslc_file_path'] = ref_slc_output
             target_output = ref_slc_output
 
         elif target == 'sec':
@@ -76,7 +76,7 @@ def run(cfg: dict):
             base_slc = ref_slc
 
             # update secondary SLC path 
-            cfg['input_file_group']['secondary_file_path'] = sec_slc_output
+            cfg['input_file_group']['secondary_rslc_file_path'] = sec_slc_output
             target_output = sec_slc_output
 
         if os.path.exists(target_output):

python/packages/nisar/workflows/crossmul.py

@@ -23,8 +23,8 @@ def run(cfg: dict, output_hdf5: str = None, resample_type='coarse'):
     run crossmul
     '''
     # pull parameters from cfg
-    ref_hdf5 = cfg['input_file_group']['input_file_path']
-    sec_hdf5 = cfg['input_file_group']['secondary_file_path']
+    ref_hdf5 = cfg['input_file_group']['reference_rslc_file_path']
+    sec_hdf5 = cfg['input_file_group']['secondary_rslc_file_path']
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']
     flatten = cfg['processing']['crossmul']['flatten']
 

python/packages/nisar/workflows/dense_offsets.py

@@ -22,8 +22,8 @@ def run(cfg: dict):
     '''
 
     # Pull parameters from cfg
-    ref_hdf5 = cfg['input_file_group']['input_file_path']
-    sec_hdf5 = cfg['input_file_group']['secondary_file_path']
+    ref_hdf5 = cfg['input_file_group']['reference_rslc_file_path']
+    sec_hdf5 = cfg['input_file_group']['secondary_rslc_file_path']
     scratch_path = pathlib.Path(cfg['product_path_group']['scratch_path'])
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']
     offset_params = cfg['processing']['dense_offsets']

python/packages/nisar/workflows/geo2rdr.py

@@ -21,7 +21,7 @@ def run(cfg):
     '''
 
     # Pull parameters from cfg dict
-    sec_hdf5 = cfg['input_file_group']['secondary_file_path']
+    sec_hdf5 = cfg['input_file_group']['secondary_rslc_file_path']
     dem_file = cfg['dynamic_ancillary_file_group']['dem_file']
     scratch_path = pathlib.Path(cfg['product_path_group']['scratch_path'])
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']

python/packages/nisar/workflows/geocode_insar.py

@@ -188,7 +188,7 @@ def add_radar_grid_cube(cfg, freq, radar_grid, orbit, dst_h5):
     threshold_geo2rdr = cfg["processing"]["geo2rdr"]["threshold"]
     iteration_geo2rdr = cfg["processing"]["geo2rdr"]["maxiter"]
 
-    ref_hdf5 = cfg["input_file_group"]["input_file_path"]
+    ref_hdf5 = cfg["input_file_group"]["reference_rslc_file_path"]
     slc = SLC(hdf5file=ref_hdf5)
 
     # get doppler centroid
@@ -323,7 +323,7 @@ def cpu_run(cfg, runw_hdf5, output_hdf5):
         Path to output GUNW HDF5
     """
     # pull parameters from cfg
-    ref_hdf5 = cfg["input_file_group"]["input_file_path"]
+    ref_hdf5 = cfg["input_file_group"]["reference_rslc_file_path"]
     freq_pols = cfg["processing"]["input_subset"]["list_of_frequencies"]
     geogrids = cfg["processing"]["geocode"]["geogrids"]
     dem_file = cfg["dynamic_ancillary_file_group"]["dem_file"]
@@ -453,7 +453,7 @@ def gpu_run(cfg, runw_hdf5, output_hdf5):
 
     # Extract parameters from cfg dictionary
     dem_block_margin = cfg["processing"]["dem_margin"]
-    ref_hdf5 = cfg["input_file_group"]["input_file_path"]
+    ref_hdf5 = cfg["input_file_group"]["reference_rslc_file_path"]
     dem_file = cfg["dynamic_ancillary_file_group"]["dem_file"]
     freq_pols = cfg["processing"]["input_subset"]["list_of_frequencies"]
     geogrids = cfg["processing"]["geocode"]["geogrids"]

python/packages/nisar/workflows/geogrid.py

@@ -23,9 +23,9 @@ def _grid_size(stop, start, sz):
     return int(np.ceil(np.abs((stop-start)/sz)))
 
 
-def create(cfg, frequency_group = None, frequency = None,
-           geocode_dict = None,
-           default_spacing_x = None, default_spacing_y = None):
+def create(cfg, workflow_name=None, frequency_group=None,
+           frequency=None, geocode_dict=None,
+           default_spacing_x=None, default_spacing_y=None):
     '''
     - frequency_group is the name of the sub-group that
     holds the fields x_posting and y_posting, which is usually
@@ -53,7 +53,10 @@ def create(cfg, frequency_group = None, frequency = None,
     if geocode_dict is None:
         geocode_dict = cfg['processing']['geocode']
 
-    input_hdf5 = cfg['input_file_group']['input_file_path']
+    if workflow_name == 'insar':
+       input_hdf5 = cfg['input_file_group']['reference_rslc_file_path']
+    else:
+        input_hdf5 = cfg['input_file_group']['input_file_path']
     dem_file = cfg['dynamic_ancillary_file_group']['dem_file']
     slc = SLC(hdf5file=input_hdf5)
 

python/packages/nisar/workflows/h5_prep.py

@@ -101,9 +101,11 @@ def cp_geocode_meta(cfg, output_hdf5, dst):
 
     # unpack info
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']
-    input_hdf5 = cfg['input_file_group']['input_file_path']
     if is_insar:
-        secondary_hdf5 = cfg['input_file_group']['secondary_file_path']
+        input_hdf5 = cfg['input_file_group']['reference_rslc_file_path']
+        secondary_hdf5 = cfg['input_file_group']['secondary_rslc_file_path']
+    else:
+        input_hdf5 = cfg['input_file_group']['input_file_path']
 
     if dst == "GCOV":
         dem_interp_method = cfg['processing']['dem_interpolation_method']
@@ -336,7 +338,7 @@ def copy_insar_meta(cfg, dst, src_h5, dst_h5, src_meta_path):
     common_path = 'science/LSAR'
     dst_meta_path = f'{common_path}/{dst}/metadata'
 
-    secondary_hdf5 = cfg['input_file_group']['secondary_file_path']
+    secondary_hdf5 = cfg['input_file_group']['secondary_rslc_file_path']
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']
 
     # Open secondary SLC
@@ -456,7 +458,7 @@ def prep_ds_insar(pcfg, dst, dst_h5):
     dset.attrs["description"] = descr
 
     # Open reference SLC
-    ref_path = pcfg['input_file_group']['input_file_path']
+    ref_path = pcfg['input_file_group']['reference_rslc_file_path']
     ref_slc = SLC(hdf5file=ref_path)
     with h5py.File(ref_path, 'r', libver='latest', swmr=True) as src_h5:
         for freq, pol_list in freq_pols.items():

python/packages/nisar/workflows/insar_runconfig.py

@@ -164,8 +164,8 @@ def yaml_check(self):
             iono_method = iono_cfg['spectral_diversity']
 
             # Extract main range bandwidth from reference SLC
-            ref_slc_path = self.cfg['input_file_group']['input_file_path']
-            sec_slc_path = self.cfg['input_file_group']['secondary_file_path']
+            ref_slc_path = self.cfg['input_file_group']['reference_rslc_file_path']
+            sec_slc_path = self.cfg['input_file_group']['secondary_rslc_file_path']
 
             ref_slc = SLC(hdf5file=ref_slc_path)
             sec_slc = SLC(hdf5file=sec_slc_path)

python/packages/nisar/workflows/rdr2geo.py

@@ -33,7 +33,7 @@ def run(cfg):
     run rdr2geo
     '''
     # pull parameters from cfg
-    input_hdf5 = cfg['input_file_group']['input_file_path']
+    input_hdf5 = cfg['input_file_group']['reference_rslc_file_path']
     dem_file = cfg['dynamic_ancillary_file_group']['dem_file']
     scratch_path = pathlib.Path(cfg['product_path_group']['scratch_path'])
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']

python/packages/nisar/workflows/resample_slc.py

@@ -21,7 +21,7 @@ def run(cfg, resample_type):
     '''
     run resample_slc
     '''
-    input_hdf5 = cfg['input_file_group']['secondary_file_path']
+    input_hdf5 = cfg['input_file_group']['secondary_rslc_file_path']
     scratch_path = pathlib.Path(cfg['product_path_group']['scratch_path'])
     freq_pols = cfg['processing']['input_subset']['list_of_frequencies']