Skip to content

Commit

Permalink
Update camstats PvlGroup "User Parameters" to UserParameters (DOI-USG…
Browse files Browse the repository at this point in the history
…S#5672)

* Updated 'User Parameters' group to UserParameters for PVL compliance

* Updated changelog
  • Loading branch information
AustinSanders authored Nov 18, 2024
1 parent dd0bf99 commit 32120b8
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ release.
- 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)
- Changed 'User Parameters' group in camstats to UserParameters for PVL compliance [#5625](https://github.com/DOI-USGS/ISIS3/issues/5625).

### Fixed
- Fixed noseam bug where a debugging output statement was inadvertently left in noseam.cpp.
Expand Down
2 changes: 1 addition & 1 deletion isis/src/base/apps/caminfo/caminfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ namespace Isis{
camstats->append(MakePair("ObliqueResolutionMaximum", cg["ObliqueResolutionMaximum"][0]));

// Add keywords for all camera values
// Skips first "User Parameters" group.
// Skips first "UserParameters" group.
for (int i = 1; i < camPvl.groups(); i++) {
PvlGroup &group = camPvl.group(i);

Expand Down
2 changes: 1 addition & 1 deletion isis/src/base/apps/camstats/camstats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ namespace Isis {
Table table(cam_name, record);

// Place all the gathered camera statistics in a table and attach it to the
// cube. Skip "User Parameters" group.
// cube. Skip "UserParameters" group.
for (int i = 1; i < statsPvl.groups(); i++) {
PvlGroup &group = statsPvl.group(i);

Expand Down
6 changes: 3 additions & 3 deletions isis/src/base/objs/CameraStatistics/CameraStatistics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace Isis {
* numbers can be used to improve performance. The filename provided does
* not serve a functional purpose during the statistics gathering process,
* but will report the filename used to create the Camera instance in the
* "User Parameters" section of the PVL output from the "toPvl" method.
* "UserParameters" section of the PVL output from the "toPvl" method.
*
* @param cam Camera pointer upon which statistics will be gathered
* @param sinc Sample increment for gathering statistics
Expand Down Expand Up @@ -294,7 +294,7 @@ namespace Isis {
* The general format will look as follows:
*
* @code
* Group = User Parameters
* Group = UserParameters
* Filename (not provided for constructor w/ Camera but not filename)
* Linc
* Sinc
Expand Down Expand Up @@ -366,7 +366,7 @@ namespace Isis {
Pvl CameraStatistics::toPvl() const {
// Set up the Pvl groups and get min, max, avg, and sd for each statstics
// object
PvlGroup pUser("User Parameters");
PvlGroup pUser("UserParameters");
if (m_filename != "") pUser += PvlKeyword("Filename", m_filename);
pUser += PvlKeyword("Linc", toString(m_linc));
pUser += PvlKeyword("Sinc", toString(m_sinc));
Expand Down
2 changes: 1 addition & 1 deletion isis/src/base/objs/CameraStatistics/CameraStatistics.truth
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
UnitTest for Camera Statistics

User Parameters:
UserParameters:
Linc = 1
Sinc = 1

Expand Down
2 changes: 1 addition & 1 deletion isis/tests/FunctionalTestsCamstats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TEST(CamStats, FunctionalTestCamstatsDefaultParameters) {

camstats(options, &appLog);

PvlGroup group = appLog.findGroup("User Parameters");
PvlGroup group = appLog.findGroup("UserParameters");
EXPECT_DOUBLE_EQ((double) group.findKeyword("Linc"), 1.0);
EXPECT_DOUBLE_EQ((double) group.findKeyword("Sinc"), 1.0);

Expand Down

0 comments on commit 32120b8

Please sign in to comment.