Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes mdiscal and osirisrex test failures in appdata branch #3799

Merged
merged 3 commits into from
Mar 25, 2020
Merged

Fixes mdiscal and osirisrex test failures in appdata branch #3799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd08cc3
move lopdsgen out of templates into translations, add hidtmgen templa…
krlberry Mar 23, 2020
c432ff0
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 24, 2020
f43b222
Fixes mdiscal and osirisrex test failures in appdata branch
krlberry Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions isis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,9 @@ add_dependencies(isis3 incs)
add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/serialnumbers/*.trn ${CMAKE_SOURCE_DIR}/appdata/translations/*.trn
${CMAKE_SOURCE_DIR}/appdata/translations/*.typ ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.typ
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/translations/*.trn
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.def
${CMAKE_SOURCE_DIR}/appdata/translations/*.def ${CMAKE_SOURCE_DIR}/appdata/translations/*.pvl
# ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pvl
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.def ${CMAKE_SOURCE_DIR}/appdata/translations/*.def
${CMAKE_SOURCE_DIR}/appdata/translations/*.pvl
${CMAKE_BINARY_DIR}/appdata/translations)
add_dependencies(isis3 appdata)

Expand Down
0 ...ialnumbers/OsirisRexOcamsSerialNumber.trn → ...ialnumbers/OsirisRexOCamsSerialNumber.trn
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion isis/src/messenger/apps/mdis2isis/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ 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");
FileName calibFile("$messenger/calibration/mdisCalibration????.trn");
calibFile = calibFile.highestVersion();
Pvl config(calibFile.expanded());

PvlGroup &confgrp = config.findGroup("FilterWheel");
Expand Down
5 changes: 3 additions & 2 deletions isis/src/messenger/apps/mdiscal/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ void IsisMain() {
// We will be processing by column in case of a linear dark current fit. This will make the
// calibration a one pass system in this case, rather than two.
ProcessByLine p;
FileName calibFile("$ISISROOT/appdata/translations/MessengerMdisCalibration.trn");
FileName calibFile("$messenger/calibration/mdisCalibration????.trn");
calibFile = calibFile.highestVersion();
g_configFile.read(calibFile.expanded());

// Initialize variables
Expand Down Expand Up @@ -491,7 +492,7 @@ void IsisMain() {
// Write Calibration group to file and log
ocube->putGroup(calibrationLog);
Application::Log(calibrationLog);
g_configFile.clear();
// g_configFile.clear();
}

FileName determineFlatFieldFile() {
Expand Down
59 changes: 0 additions & 59 deletions isis/src/messenger/translations/MessengerMdisCalibration.trn
View file
Open in desktop

This file was deleted.