Fixes mdiscal and osirisrex test failures in appdata branch (#3799)

* move lopdsgen out of templates into translations, add hidtmgen template, add controlnetwork template * Fixes mdiscal and osirisrex test failures in appdata branch
DOI-USGS · Mar 25, 2020 · 88187d7 · 88187d7
1 parent 6eb8363
commit 88187d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 66 deletions.
diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt
@@ -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)
 

diff --git a/...ialnumbers/OsirisRexOcamsSerialNumber.trn → ...ialnumbers/OsirisRexOCamsSerialNumber.trn b/...ialnumbers/OsirisRexOcamsSerialNumber.trn → ...ialnumbers/OsirisRexOCamsSerialNumber.trn
diff --git a/isis/src/messenger/apps/mdis2isis/main.cpp b/isis/src/messenger/apps/mdis2isis/main.cpp
@@ -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");

diff --git a/isis/src/messenger/apps/mdiscal/main.cpp b/isis/src/messenger/apps/mdiscal/main.cpp
@@ -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
@@ -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() {

diff --git a/isis/src/messenger/translations/MessengerMdisCalibration.trn b/isis/src/messenger/translations/MessengerMdisCalibration.trn