Fix cphd optional pvp read #21
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… RcvAntenna and TxAntenna similar to AddedPVP which is the format the CPHD writer expects
…a.PVP.TxAntenna but I don't have any CRSD data to check and the draft standard I have doesn't include TxAntenna at all. This would be correct for CPHD data. Handle AddedPVP when outputting CPHD.
…a.PVP.TxAntenna but I don't have any CRSD data to check and the draft standard I have doesn't include TxAntenna at all. This would be correct for CPHD data. Handle AddedPVP when outputting CPHD.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Read optional PVP fields using the flattened structure (vectorParametersFlatten) similar to the CRSD code. That makes the for-loop a lot simpler. I also moved support for the AddedPVP from the for-loop to the flattened structure.
Note this keeps the PVP data structure to a single layer.
Previous => New
pvp.TxAntenna.TxACX => pvp.TxACX
pvp.TxAntenna.TxACY => pvp.TxACY
pvp.TxAntenna.TxEB=> pvp.TxEB
pvp.RcvAntenna.RcvACX => pvp.RcvACX
...
The new format seemed to be what write_cphd_vbmeta is expecting.
Also some other fixes. I'm pretty sure that xml_meta.PVP.TxPulse.TxAntenna should be xml_meta.PVP.TxAntenna but I don't have any CRSD data to check and the draft standard I have doesn't include TxAntenna at all. This would be correct for CPHD data. Also added code to handle AddedPVP when outputting CPHD (previously caused an error).