Skip to content

Commit

Permalink
Testing Valueless PVL Keyword Issues (#5573)
Browse files Browse the repository at this point in the history
* update Auto in .trn files

* update Optional in .trn files

* updated mission specific .trn files with Auto

* updated Debug in .trn files

* Account for valueless PVL keywords that are not reserved keywords

* Added dummy values for MappingGroupKeywords.pft

* Update all files that are weren't PVL compliant

* Fixed missing 'Debug' flag

* Missed a couple of test updates

* Addressed PR feeback

* Reverted if logic since keywordNameUpper is also const

* Added break when searching for reserved keyword

* reverted gtest

* Added changelog entries for PVL updates

---------

Co-authored-by: Amy Stamile <[email protected]>
  • Loading branch information
acpaquette and amystamile-usgs authored Nov 15, 2024
1 parent 14c8162 commit dd0bf99
Show file tree
Hide file tree
Showing 311 changed files with 5,665 additions and 5,656 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ release.
### Changed
- Refactored the pixel2map app
- Updated pixel2map documentation
- Changed PVL parsing to no longer allow valueless keywords [#5573](https://github.com/DOI-USGS/ISIS3/pull/5573)
- Changed all `.trn` files with an `Auto`, `Debug` or `Optional` keyword with no value to have a value of `1` [#5573](https://github.com/DOI-USGS/ISIS3/pull/5573)

### Fixed
- Fixed noseam bug where a debugging output statement was inadvertently left in noseam.cpp.
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Apollo15MetricSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -9,7 +9,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -19,7 +19,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Apollo15PanoramicSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ObservationKeys = 3

Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -11,7 +11,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -21,7 +21,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Apollo15SerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -9,7 +9,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -19,7 +19,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = SpacecraftClockCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Apollo16MetricSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -9,7 +9,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -19,7 +19,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Apollo16PanoramicSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ObservationKeys = 3

Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -11,7 +11,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -21,7 +21,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Apollo17MetricSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -9,7 +9,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -19,7 +19,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Apollo17PanoramicSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ObservationKeys = 3

Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -11,7 +11,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -21,7 +21,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/CassiniIssSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -10,7 +10,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -20,7 +20,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = SpacecraftClockCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
8 changes: 4 additions & 4 deletions isis/appdata/serialnumbers/CassiniVimsSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -10,7 +10,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -20,7 +20,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = Channel
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -30,7 +30,7 @@ Group = Keyword3
End_Group

Group = Keyword4
Auto
Auto = 1
InputKey = SpacecraftClockStartCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Chandrayaan1M3SerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ObservationKeys = 2

Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -12,7 +12,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -22,7 +22,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Chandrayaan1MinirfSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ObservationKeys = 2

Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -12,7 +12,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -22,7 +22,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Clementine1HiresSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -11,7 +11,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -21,7 +21,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Clementine1LwirSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -11,7 +11,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -21,7 +21,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
6 changes: 3 additions & 3 deletions isis/appdata/serialnumbers/Clementine1NirSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Group = Keyword1
Auto
Auto = 1
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -11,7 +11,7 @@ Group = Keyword1
End_Group

Group = Keyword2
Auto
Auto = 1
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand All @@ -21,7 +21,7 @@ Group = Keyword2
End_Group

Group = Keyword3
Auto
Auto = 1
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
Expand Down
Loading

0 comments on commit dd0bf99

Please sign in to comment.