Commit b34a9e0f authored by Kristin Berry's avatar Kristin Berry
Browse files

Updated tgocassis2isis to import the output of tgocassisrdrgen

parent 7d3838f6

isis/src/tgo/apps/tgocassis2isis/tgocassis2isis.cpp

+38 −9
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@ 
#include "UserInterface.h"

#include "XmlToPvlTranslationManager.h"

#include "iTime.h"

#include "IException.h"



using namespace std;

using namespace Isis;



void translateCoreInfo(FileName &inputLabel, ProcessImport &importer);

void translateLabels(FileName &inputLabel, Cube *outputCube);

void translateCoreInfo(XmlToPvlTranslationManager labelXlater, ProcessImport &importer);

void translateLabels(FileName &inputLabel, Cube *outputCube, QString transFile);



void IsisMain() {
@@ -41,7 +43,14 @@ void IsisMain() { 
    }

    

    Cube *outputCube = importer.SetOutputCube("TO");

    translateLabels(xmlFileName, outputCube);



    QString transRawFile("/translations/tgoCassisInstrument.trn");

    QString transExportFile("/translations/tgoCassisExportedInstrument.trn");

    try {

      translateLabels(xmlFileName, outputCube, transRawFile); 

    } catch (IException &e) {

      translateLabels(xmlFileName, outputCube, transExportFile); 

    }



    FileName outputCubeFileName(ui.GetFileName("TO"));
@@ -81,12 +90,33 @@ void translateCoreInfo(FileName &inputLabel, ProcessImport &importer) { 
  PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory");

  QString missionDir = (QString) dataDir["Tgo"];



  // How to tell that this is an ISIS3 exported product (generated by tgocassisrdrgen?)



  // Get the translation manager ready

  FileName transFile(missionDir + "/translations/tgoCassis.trn");

  FileName transFile; 

  try {

    transFile = FileName(missionDir + "/translations/tgoCassis.trn"); 

    XmlToPvlTranslationManager labelXlater(inputLabel, transFile.expanded());

    translateCoreInfo(labelXlater, importer);

  } catch (IException &e) {

   // if exported, use this!

   transFile = FileName(missionDir + "/translations/tgoCassisExported.trn"); 

   XmlToPvlTranslationManager labelXlater(inputLabel, transFile.expanded());

   translateCoreInfo(labelXlater, importer);

  }

}



  QString str;

/**

 * Translate core info from labels and set ProcessImport object with 

 * these values.

 *

 * @param labelXlater Reference to the XmlToPvlTranslationManager objcet to use for the translation.

 * @param importer Reference to the ProcessImport object to which core info will

 *                 be set.

 */

void translateCoreInfo(XmlToPvlTranslationManager labelXlater, ProcessImport &importer) {

  // Set up the ProcessImport

  QString str;

  str = labelXlater.Translate("CoreSamples");

  int ns = toInt(str);

  str = labelXlater.Translate("CoreLines");
@@ -109,7 +139,6 @@ void translateCoreInfo(FileName &inputLabel, ProcessImport &importer) { 
  importer.SetMultiplier(toDouble(str));

}





/**

 * Translate instrument, bandbin, and archive info from xml label into ISIS3 

 * label and add kernels group.
@@ -122,11 +151,11 @@ void translateCoreInfo(FileName &inputLabel, ProcessImport &importer) { 
 *   @history 2017-01-20 Jeannie Backer - Original Version

 *   @history 2017-01-23 Kristin Berry - Added support for bandBin group and archive group

 */

void translateLabels(FileName &inputLabel, Cube *outputCube) {

void translateLabels(FileName &inputLabel, Cube *outputCube, QString instTransFile) {

  // Get the directory where the Tgo translation tables are

  PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory");

  QString missionDir = (QString) dataDir["Tgo"];

  FileName transFile(missionDir + "/translations/tgoCassisInstrument.trn");

  FileName transFile(missionDir + instTransFile);



  // Get the translation manager ready for translating the instrument label

  XmlToPvlTranslationManager labelXlater(inputLabel, transFile.expanded());

isis/src/tgo/apps/tgocassis2isis/tgocassis2isis.xml

+4 −1
Original line number Diff line number Diff line
@@ -107,7 +107,10 @@ 
      Added check to verify input input xml file corresponds to valid filter image. 

    </change>

    <change name="Summer Stapleton" date="2018-02-16">

      Added handling for image file extesnions of either .dat or .img. Fixs #5334. 

      Added handling for image file extesnions of either .dat or .img. Fixes #5334. 

    </change>

    <change name="Kristin Berry and Makayla Shepherd" date="2018-05-15">

     Updated to ingest images which have been exported using tgocassisrdrgen. Fixes #5418.

    </change>

  </history>