Skip to content

Commit ab21d36

Browse files
authored
Merge branch 'isce-framework:develop' into develop
2 parents a75e7f1 + 9df1acf commit ab21d36

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

python/packages/nisar/products/writers/BaseWriterSingleInput.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,10 +663,16 @@ def populate_identification_common(self):
663663
processing_type = np.bytes_('Nominal')
664664
elif processing_type_runconfig == 'UR':
665665
processing_type = np.bytes_('Urgent')
666-
elif processing_type_runconfig == 'OD':
667-
processing_type = np.bytes_('Custom')
668666
else:
669-
processing_type = np.bytes_('Undefined')
667+
if processing_type_runconfig != 'OD':
668+
warning_channel = journal.warning(
669+
'BaseWriterSingleInput.populate_identification_common()')
670+
warning_channel.log(
671+
'The processing type in the runconfig is set to'
672+
f' "{processing_type_runconfig}", which is not a valid value'
673+
' for the output product metadata. Defaulting to "Custom"')
674+
processing_type = np.bytes_('Custom')
675+
670676
self.set_value(
671677
'identification/processingType',
672678
processing_type,

python/packages/nisar/products/writers/GcovWriter.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -813,16 +813,17 @@ def populate_processing_information_timing_corrections(self):
813813
Populate the `processingInformation/timingCorrections` group of the
814814
GCOV product
815815
"""
816-
timing_corrections_group_path = \
817-
(self.output_product_path +
818-
'/metadata/processingInformation/'
819-
'timingCorrections')
820816

821817
processing_information_geogrid = self.cfg['processing'][
822818
'processing_information']['geogrid']
823819

824820
for frequency in self.input_freq_pols_dict.keys():
825821

822+
timing_corrections_group_path = \
823+
(self.output_product_path +
824+
'/metadata/processingInformation/'
825+
f'timingCorrections/frequency{frequency}')
826+
826827
if (self.timing_corrections_dict is not None and
827828
frequency in
828829
self.timing_corrections_dict['az_correction'].keys()):

share/nisar/defaults/gcov.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ runconfig:
201201
# omitted from the output. If the input data does not contain
202202
# HV and VH channels, then the "symmetrize_cross_pol_channels"
203203
# flag will be ignored by the workflow.
204-
symmetrize_cross_pol_channels: True
204+
symmetrize_cross_pol_channels: False
205205

206206
# NOT YET IMPLEMENTED - Only checked when internet access is available
207207
dem_download:

0 commit comments

Comments
 (0)