Skip to content

Commit

Permalink
App test fixes (#3779)
Browse files Browse the repository at this point in the history
* Removed ISIS3DATA from base apps

* Removing ISIS3DATA from base/objs

* more ISIS3DATAs

* more ISIS3DATAs

* Other non base ISIS3DATAs

* Remove ISIS3DATA from docsys

* Update maptemplate.xml

* Update smtk.xml

* Update unitTest.xml

* Fixed another file name

* Removed local Standard preference file references and took all but the ShapeModel group out of the other two preference files in the input dir

* Moving ISIS3DATA to ISISDATA fixing apptests

* Fixing app tests

* More app test fixes
  • Loading branch information
scsides authored Mar 19, 2020
1 parent 60e3b91 commit 62e5413
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion isis/src/messenger/apps/mdis2isis/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ int CreateFilterSpecs(const QString &instId, int filter_code,
else if(instId == "MDIS-WAC") {
// Set up WAC calibration file
FileName calibFile("$ISISROOT/appdata/translations/MessengerMdisCalibration.trn");
calibFile = calibFile.highestVersion();
Pvl config(calibFile.expanded());

PvlGroup &confgrp = config.findGroup("FilterWheel");
Expand Down
1 change: 0 additions & 1 deletion isis/src/messenger/apps/mdiscal/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ void IsisMain() {
// calibration a one pass system in this case, rather than two.
ProcessByLine p;
FileName calibFile("$ISISROOT/appdata/translations/MessengerMdisCalibration.trn");
calibFile = calibFile.highestVersion();
g_configFile.read(calibFile.expanded());

// Initialize variables
Expand Down
2 changes: 1 addition & 1 deletion isis/src/messenger/apps/mdisddr/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void IsisMain() {
p.CheckStatus();

// All done...write result.
pdsLabel.setFormatTemplate("$ISISROOT/appdata/templates/mdisddr/mdisPdsDdr.def");
pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/mdisPdsDdr.def");
QString ofile(output.expanded());
ofstream outstream(ofile.toLatin1().data());
processPds.OutputLabel(outstream);
Expand Down

0 comments on commit 62e5413

Please sign in to comment.