Quick PR updating GCOV memory option (#990)

gshiroma · GitHub Enterprise · commit 2336120efd74 · 2022-04-01T10:15:41.000-07:00
* rename GCOV memory option `geogrid_radar_grid` to `geogrid_and_radar_grid`

* raise an error if memory mode is invalid
diff --git a/python/packages/nisar/workflows/gcov_runconfig.py b/python/packages/nisar/workflows/gcov_runconfig.py
@@ -38,10 +38,13 @@ def load(self):
             geocode_dict['memory_mode'] = isce3.geocode.GeocodeMemoryMode.SINGLE_BLOCK
         elif geocode_dict['memory_mode'] == 'geogrid':
             geocode_dict['memory_mode'] = isce3.geocode.GeocodeMemoryMode.BLOCKS_GEOGRID
-        elif geocode_dict['memory_mode'] == 'geogrid_radargrid':
+        elif geocode_dict['memory_mode'] == 'geogrid_and_radargrid':
             geocode_dict['memory_mode'] = isce3.geocode.GeocodeMemoryMode.BLOCKS_GEOGRID_AND_RADARGRID
-        else:
+        elif geocode_dict['memory_mode'] == 'auto':
             geocode_dict['memory_mode'] = isce3.geocode.GeocodeMemoryMode.AUTO
+        else:
+            err_msg = f"ERROR memory_mode: {geocode_dict['memory_mode']}"
+            raise ValueError(err_msg)
 
         rtc_output_type = rtc_dict['output_type']
         if rtc_output_type == 'sigma0':
diff --git a/share/nisar/defaults/gcov.yaml b/share/nisar/defaults/gcov.yaml
@@ -115,7 +115,7 @@ runconfig:
                 # OPTIONAL - Apply RTC
                 apply_rtc: True
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/end2end_pair_ALPSRP110160680_ALPSRP116870680_Rosamond_gcov_ref.yaml b/tools/imagesets/runconfigs/end2end_pair_ALPSRP110160680_ALPSRP116870680_Rosamond_gcov_ref.yaml
@@ -85,7 +85,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/end2end_pair_ALPSRP110160680_ALPSRP116870680_Rosamond_gcov_sec.yaml b/tools/imagesets/runconfigs/end2end_pair_ALPSRP110160680_ALPSRP116870680_Rosamond_gcov_sec.yaml
@@ -85,7 +85,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/end2end_pair_ALPSRP262866750_ALPSRP269576750_Chile_gcov_ref.yaml b/tools/imagesets/runconfigs/end2end_pair_ALPSRP262866750_ALPSRP269576750_Chile_gcov_ref.yaml
@@ -85,7 +85,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/end2end_pair_ALPSRP262866750_ALPSRP269576750_Chile_gcov_sec.yaml b/tools/imagesets/runconfigs/end2end_pair_ALPSRP262866750_ALPSRP269576750_Chile_gcov_sec.yaml
@@ -85,7 +85,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_S1B_IW_SLC__1SDV_20180504T104507_20180504T104535_010770_013AEE_919F.yaml b/tools/imagesets/runconfigs/gcov_S1B_IW_SLC__1SDV_20180504T104507_20180504T104535_010770_013AEE_919F.yaml
@@ -85,7 +85,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode: auto
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_UAVSAR_NISARP_32039_19049_005_190717_L090_CX_129_03.yaml b/tools/imagesets/runconfigs/gcov_UAVSAR_NISARP_32039_19049_005_190717_L090_CX_129_03.yaml
@@ -86,7 +86,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_UAVSAR_NISARP_32039_19052_004_190726_L090_CX_129_02.yaml b/tools/imagesets/runconfigs/gcov_UAVSAR_NISARP_32039_19052_004_190726_L090_CX_129_02.yaml
@@ -86,7 +86,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_UAVSAR_SanAnd_05024_18038_006_180730_L090_CX_129_05.yaml b/tools/imagesets/runconfigs/gcov_UAVSAR_SanAnd_05024_18038_006_180730_L090_CX_129_05.yaml
@@ -86,7 +86,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_UAVSAR_SanAnd_05518_12018_000_120419_L090_CX_143_03.yaml b/tools/imagesets/runconfigs/gcov_UAVSAR_SanAnd_05518_12018_000_120419_L090_CX_143_03.yaml
@@ -86,7 +86,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_UAVSAR_SanAnd_05518_12128_008_121105_L090_CX_143_02.yaml b/tools/imagesets/runconfigs/gcov_UAVSAR_SanAnd_05518_12128_008_121105_L090_CX_143_02.yaml
@@ -86,7 +86,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_UAVSAR_Snjoaq_14511_18034_014_180720_L090_CX_143_02.yaml b/tools/imagesets/runconfigs/gcov_UAVSAR_Snjoaq_14511_18034_014_180720_L090_CX_143_02.yaml
@@ -86,7 +86,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
diff --git a/tools/imagesets/runconfigs/gcov_UAVSAR_Snjoaq_14511_18044_015_180814_L090_CX_143_02.yaml b/tools/imagesets/runconfigs/gcov_UAVSAR_Snjoaq_14511_18044_015_180814_L090_CX_143_02.yaml
@@ -86,7 +86,7 @@ runconfig:
                 # OPTIONAL -
                 algorithm_type: area_projection
  
-                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_radargrid", and "auto" (default)
+                # OPTIONAL - Choices: "single_block", "geogrid", "geogrid_and_radargrid", and "auto" (default)
                 memory_mode:
 
                 # OPTIONAL - Processing upsampling factor applied to input geogrid
