From 2a18e92724ebb6206a56a43f63c2030fa4d8e3a1 Mon Sep 17 00:00:00 2001 From: Kristin Date: Tue, 10 Mar 2020 14:58:18 -0700 Subject: [PATCH 1/4] Fix missed ProcessImportPds base references and update CMakelists to move translation files from the ISIS3/isis/src/missionName/translations level --- isis/CMakeLists.txt | 3 ++- .../base/objs/ProcessImportPds/ProcessImportPds.cpp | 13 +++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index 318d3933f0..49c6a9558f 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -507,7 +507,8 @@ 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/*/apps/*/*.pft + ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/translations/*.trn + ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft ${CMAKE_BINARY_DIR}/appdata/translations) add_dependencies(isis3 appdata) diff --git a/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp b/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp index 1dc6b97136..93d4e9cc35 100644 --- a/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp +++ b/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp @@ -60,7 +60,6 @@ namespace Isis { p_projectionOffsetGroup.setName("ProjectionOffsets"); // Set up a translater for PDS file of type IMAGE - Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory"); p_transDir = "$ISISROOT/appdata"; } @@ -1463,13 +1462,12 @@ namespace Isis { /** * Fill as many of the Isis3 BandBin labels as possible * - * @param lab The lable where the translated Isis2 keywords will + * @param lab The label where the translated Isis2 keywords will * be placed */ void ProcessImportPds::TranslateIsis2BandBin(Isis::Pvl &lab) { // Set up a translater for Isis2 labels - Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory"); - QString transDir = (QString) dataDir["Base"]; + QString transDir = "$ISISROOT/appdata"; Isis::FileName transFile(transDir + "/" + "translations/isis2bandbin.trn"); Isis::PvlToPvlTranslationManager isis2Xlater(p_pdsLabel, transFile.expanded()); @@ -1487,8 +1485,8 @@ namespace Isis { */ void ProcessImportPds::TranslateIsis2Instrument(Isis::Pvl &lab) { // Set up a translater for Isis2 labels - Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory"); - QString transDir = (QString) dataDir["Base"]; + QString transDir = "$ISISROOT/appdata"; + Isis::FileName transFile(transDir + "/" + "translations/isis2instrument.trn"); Isis::PvlToPvlTranslationManager isis2Xlater(p_pdsLabel, transFile.expanded()); @@ -1599,8 +1597,7 @@ namespace Isis { Isis::PvlToPvlTranslationManager projType(p_pdsLabel, trnsStrm); // Set up the correct projection translation table for this label - Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory"); - QString transDir = (QString) dataDir["Base"]; + QString transDir = "$ISISROOT/appdata"; Isis::FileName transFile; if (projType.InputHasKeyword("PdsProjectionTypeImage")) { From 2c1d6448d09c48750f39c90c5ed5669dd9fd01a5 Mon Sep 17 00:00:00 2001 From: Kristin Date: Sat, 14 Mar 2020 17:47:08 -0700 Subject: [PATCH 2/4] merge cmakelists --- isis/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index 672f243142..80cb5467ce 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -520,6 +520,8 @@ add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different ${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_BINARY_DIR}/appdata/translations) add_dependencies(isis3 appdata) From df4ebe7ac20e6fb26784ee3040321530ec4c081c Mon Sep 17 00:00:00 2001 From: Kristin Date: Wed, 18 Mar 2020 15:25:48 -0700 Subject: [PATCH 3/4] Remove unneeded references to DataDirectory, fix paths where needed, and add rolo translation files to this repo --- isis/src/apollo/apps/apollo2isis/main.cpp | 3 +- isis/src/apollo/apps/apollocal/main.cpp | 3 +- isis/src/base/apps/spiceserver/main.cpp | 2 +- .../ObservationNumber/ObservationNumber.cpp | 1 - isis/src/galileo/apps/gllnims2isis/main.cpp | 3 +- isis/src/hayabusa/apps/amica2isis/main.cpp | 3 +- isis/src/hayabusa/apps/nirs2isis/main.cpp | 1 - isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp | 1 - isis/src/kaguya/apps/kaguyami2isis/main.cpp | 1 - .../apps/kaguyatc2isis/kaguyatc2isis.cpp | 1 - isis/src/kaguya/apps/mimap2isis/main.cpp | 1 - isis/src/messenger/apps/mdis2isis/main.cpp | 2 - .../apps/leisa2isis/leisa2isis.cpp | 3 +- isis/src/newhorizons/apps/lorri2isis/main.cpp | 3 +- isis/src/newhorizons/apps/mvic2isis/main.cpp | 3 +- isis/src/rolo/apps/rolo2isis/RoloArchive.trn | 31 + isis/src/rolo/apps/rolo2isis/RoloBandBin.trn | 559 ++++++++++++++++++ .../rolo/apps/rolo2isis/RoloInstrument.trn | 281 +++++++++ isis/src/rolo/apps/rolo2isis/RoloMapping.trn | 106 ++++ isis/src/rolo/apps/rolo2isis/main.cpp | 12 +- 20 files changed, 990 insertions(+), 30 deletions(-) create mode 100644 isis/src/rolo/apps/rolo2isis/RoloArchive.trn create mode 100644 isis/src/rolo/apps/rolo2isis/RoloBandBin.trn create mode 100644 isis/src/rolo/apps/rolo2isis/RoloInstrument.trn create mode 100644 isis/src/rolo/apps/rolo2isis/RoloMapping.trn diff --git a/isis/src/apollo/apps/apollo2isis/main.cpp b/isis/src/apollo/apps/apollo2isis/main.cpp index 4e913305dc..2b078f0f95 100644 --- a/isis/src/apollo/apps/apollo2isis/main.cpp +++ b/isis/src/apollo/apps/apollo2isis/main.cpp @@ -269,8 +269,7 @@ void TranslateApolloLabels (IString filename, Cube *opack) { // Set up the nominal reseaus group Isis::PvlGroup &dataDir = Isis::Preference::Preferences().findGroup("DataDirectory"); Process p; - PvlTranslationTable tTable( - (QString)p.MissionData("base", "translations/MissionName2DataDir.trn")); + PvlTranslationTable tTable("$ISISROOT/appdata/translations/MissionName2DataDir.trn"); QString missionDir = dataDir[tTable.Translate("MissionName", apollo->SpacecraftName())][0]; Pvl resTemplate(missionDir + "/reseaus/" + apollo->InstrumentId() + "_NOMINAL.pvl"); PvlGroup *reseaus = &resTemplate.findGroup("Reseaus"); diff --git a/isis/src/apollo/apps/apollocal/main.cpp b/isis/src/apollo/apps/apollocal/main.cpp index 44fa372f9a..70fa0843ea 100644 --- a/isis/src/apollo/apps/apollocal/main.cpp +++ b/isis/src/apollo/apps/apollocal/main.cpp @@ -21,8 +21,7 @@ void IsisMain() { PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory"); - PvlTranslationTable tTable( - (QString)p.MissionData("base", "translations/MissionName2DataDir.trn")); + PvlTranslationTable tTable("$ISISROOT/appdata/translations/MissionName2DataDir.trn"); QString missionDir = dataDir[tTable.Translate("MissionName", (inCube->group("Instrument")).findKeyword("SpacecraftName")[0])][0]; QString camera = diff --git a/isis/src/base/apps/spiceserver/main.cpp b/isis/src/base/apps/spiceserver/main.cpp index c28148b5f4..c80e050d73 100644 --- a/isis/src/base/apps/spiceserver/main.cpp +++ b/isis/src/base/apps/spiceserver/main.cpp @@ -167,7 +167,7 @@ void IsisMain() { // Set up for getting the mission name // Get the directory where the system missions translation table is. - QString transFile = p.MissionData("base", "translations/MissionName2DataDir.trn"); + QString transFile = "$ISISROOT/appdata/translations/MissionName2DataDir.trn"; // Get the mission translation manager ready PvlToPvlTranslationManager missionXlater(label, transFile); diff --git a/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp b/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp index 31e9f26bf3..2c8b68834e 100644 --- a/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp +++ b/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp @@ -74,7 +74,6 @@ namespace Isis { */ PvlGroup ObservationNumber::FindObservationTranslation(Pvl &label) { Pvl outLabel; - static PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); // Get the mission name static QString missionTransFile = "$ISISROOT/appdata/translations/MissionName2DataDir.trn"; diff --git a/isis/src/galileo/apps/gllnims2isis/main.cpp b/isis/src/galileo/apps/gllnims2isis/main.cpp index beea4f7986..ed07532e02 100644 --- a/isis/src/galileo/apps/gllnims2isis/main.cpp +++ b/isis/src/galileo/apps/gllnims2isis/main.cpp @@ -477,8 +477,7 @@ void translateNIMSLabels(Pvl &pdsLab, Cube *ocube,FileName inFile,CubeType ctype PvlObject qube(pdsLab.findObject("Qube")); // Directory containing translation tables - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); - QString transDir = (QString) dataDir["galileo"] + "/translations/"; + QString transDir = "$ISISROOT/appdata/translations/"; QString instrument="GalileoNIMSInstrument.trn"; QString archive = "GalileoNIMSArchive.trn"; diff --git a/isis/src/hayabusa/apps/amica2isis/main.cpp b/isis/src/hayabusa/apps/amica2isis/main.cpp index 34db2bdd76..c4ad213663 100644 --- a/isis/src/hayabusa/apps/amica2isis/main.cpp +++ b/isis/src/hayabusa/apps/amica2isis/main.cpp @@ -96,8 +96,7 @@ void IsisMain () image.next(); } - // Get the directory where the Hayabusa translation tables are. - PvlGroup dataDir (Preference::Preferences().findGroup("DataDirectory")); + // Get the path where the Hayabusa translation tables are. QString transDir = "$ISISROOT/appdata/translations/"; // Create a PVL to store the translated labels in diff --git a/isis/src/hayabusa/apps/nirs2isis/main.cpp b/isis/src/hayabusa/apps/nirs2isis/main.cpp index 3ba1dc197d..805dc82762 100644 --- a/isis/src/hayabusa/apps/nirs2isis/main.cpp +++ b/isis/src/hayabusa/apps/nirs2isis/main.cpp @@ -122,7 +122,6 @@ void IsisMain() { stdevCube->write(stdevManager); } - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory", Pvl::Traverse)); QString transDir = "$ISISROOT/appdata/translations/"; Pvl newLabel; diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp b/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp index fe9899a95c..85ca026ae0 100644 --- a/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp +++ b/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp @@ -26,7 +26,6 @@ void IsisMain () { Cube *outputCube = importFits.SetOutputCube("TO"); // Get the directory where the Hayabusa translation tables are. - PvlGroup dataDir (Preference::Preferences().findGroup("DataDirectory")); QString transDir = "$ISISROOT/appdata/translations/"; // Create a PVL to store the translated labels in diff --git a/isis/src/kaguya/apps/kaguyami2isis/main.cpp b/isis/src/kaguya/apps/kaguyami2isis/main.cpp index 0f4e716d48..f687593259 100644 --- a/isis/src/kaguya/apps/kaguyami2isis/main.cpp +++ b/isis/src/kaguya/apps/kaguyami2isis/main.cpp @@ -66,7 +66,6 @@ void IsisMain() { p.StartProcess(); // Get the directory where the Kaguya MI translation tables are. - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); QString transDir = "$ISISROOT/appdata/translations/"; Pvl inputLabel(inFile.expanded()); Pvl *outputLabel = outcube->label(); diff --git a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp index f5d4cb87a9..cd13dc08d1 100644 --- a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp +++ b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp @@ -85,7 +85,6 @@ namespace Isis { importPds.TranslatePdsProjection(otherLabels); // Translate the remaining MI MAP labels - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); QString transDir = "$ISISROOT/appdata/translations/"; FileName transFile(transDir + "KaguyaTcBandBin.trn"); diff --git a/isis/src/kaguya/apps/mimap2isis/main.cpp b/isis/src/kaguya/apps/mimap2isis/main.cpp index b100e5ee9d..b5ad821771 100644 --- a/isis/src/kaguya/apps/mimap2isis/main.cpp +++ b/isis/src/kaguya/apps/mimap2isis/main.cpp @@ -61,7 +61,6 @@ void IsisMain() { p.TranslatePdsProjection(otherLabels); // Translate the remaining MI MAP labels - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); QString transDir = "$ISISROOT/appdata/translations/"; FileName transFile(transDir + "KaguyaMiMapBandBin.trn"); diff --git a/isis/src/messenger/apps/mdis2isis/main.cpp b/isis/src/messenger/apps/mdis2isis/main.cpp index f33514d77b..79bb050b00 100644 --- a/isis/src/messenger/apps/mdis2isis/main.cpp +++ b/isis/src/messenger/apps/mdis2isis/main.cpp @@ -182,8 +182,6 @@ Pvl TranslateMdisEdrLabels(FileName &labelFile, const QString &target) { //Create a PVL to store the translated labels Pvl outLabel; - // Get the directory where the MESSENGER/MDIS translation tables are. - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); QString transDir = "$ISISROOT/appdata/translations/"; // Get a filename for the MESSENGER EDR label diff --git a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp index 12fd194443..d94c1849bb 100644 --- a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp +++ b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp @@ -132,8 +132,7 @@ namespace Isis { output = importFits.SetOutputCube(ui.GetFileName("TO"), att); } - // Get the directory where the New Horizons translation tables are. - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); + // Get the path where the New Horizons translation tables are. QString transDir = "$ISISROOT/appdata/translations/"; // Temp storage of translated labels diff --git a/isis/src/newhorizons/apps/lorri2isis/main.cpp b/isis/src/newhorizons/apps/lorri2isis/main.cpp index 6063f50a5f..567b0b5d64 100644 --- a/isis/src/newhorizons/apps/lorri2isis/main.cpp +++ b/isis/src/newhorizons/apps/lorri2isis/main.cpp @@ -70,8 +70,7 @@ void IsisMain() { Cube *output = importFits.SetOutputCube("TO"); - // Get the directory where the New Horizons translation tables are. - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); + // Get the path where the New Horizons translation tables are. QString transDir = "$ISISROOT/appdata/translations/"; // Temp storage of translated labels diff --git a/isis/src/newhorizons/apps/mvic2isis/main.cpp b/isis/src/newhorizons/apps/mvic2isis/main.cpp index eb1e9c10f4..1b94a19341 100644 --- a/isis/src/newhorizons/apps/mvic2isis/main.cpp +++ b/isis/src/newhorizons/apps/mvic2isis/main.cpp @@ -202,8 +202,7 @@ void IsisMain() { void translateLabels(Pvl &label, Cube *ocube) { - // Get the directory where the New Horizons translation tables are. - PvlGroup dataDir(Preference::Preferences().findGroup("DataDirectory")); + // Get the path where the New Horizons translation tables are. QString transDir = "$ISISROOT/appdata/translations/"; Pvl *isisLabel = ocube->label(); diff --git a/isis/src/rolo/apps/rolo2isis/RoloArchive.trn b/isis/src/rolo/apps/rolo2isis/RoloArchive.trn new file mode 100644 index 0000000000..786e230f2b --- /dev/null +++ b/isis/src/rolo/apps/rolo2isis/RoloArchive.trn @@ -0,0 +1,31 @@ +#Begin +Group = CoreItemSize + Auto + InputKey = CORE_ITEM_SIZE + InputGroup = QUBE + InputPosition = QUBE + OutputName = CoreItemSize + OutputPosition = (Group, Archive) + Translation = (*, *) +End_Group + +Group = FlatFieldFiles + Auto + InputKey = FLAT_FIELD_FILES + InputGroup = QUBE + InputPosition = QUBE + OutputName = FlatFieldFiles + OutputPosition = (Group, Archive) + Translation = (*, *) +End_Group + +Group = BadPixelFile + Auto + InputKey = BAD_PIXEL_FILE + InputGroup = QUBE + InputPosition = QUBE + OutputName = BadPixelFile + OutputPosition = (Group, Archive) + Translation = (*, *) +End_Group +End diff --git a/isis/src/rolo/apps/rolo2isis/RoloBandBin.trn b/isis/src/rolo/apps/rolo2isis/RoloBandBin.trn new file mode 100644 index 0000000000..4eedd27002 --- /dev/null +++ b/isis/src/rolo/apps/rolo2isis/RoloBandBin.trn @@ -0,0 +1,559 @@ +#Begin +Group = BandBinUnit + InputKey = BAND_BIN_UNIT + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = OriginalBand + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = OriginalBand + Auto + InputKey = BAND_BIN_ORIGINAL_BAND + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = OriginalBand + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Center + Auto + InputKey = BAND_BIN_CENTER + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Center + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Width + Auto + InputKey = BAND_BIN_WIDTH + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Width + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ExposureUnit + InputKey = BAND_BIN_EXPOSURE_UNIT + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ExposureUnit + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Exposure + Auto + InputKey = BAND_BIN_EXPOSURE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Exposure + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = NumberCoAdds + Auto + InputKey = BAND_BIN_NUMBER_CO_ADDS + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = NumberCoAdds + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = CameraHeadTemp + Auto + InputKey = BAND_BIN_CAMERA_HEAD_TEMP + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = CameraHeadTemp + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = FilterId + Auto + InputKey = BAND_BIN_FILTER_ID + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = FilterId + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = FilterHole + Auto + InputKey = BAND_BIN_FILTER_HOLE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = FilterHole + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Ut + Auto + InputKey = BAND_BIN_UT + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Ut + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = HourAngle + Auto + InputKey = HOUR_ANGLE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = HourAngle + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = RightAscension + Auto + InputKey = RIGHT_ASCENSION + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = RightAscension + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Declination + Auto + InputKey = DECLINATION + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Declination + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Epoch + Auto + InputKey = EPOCH + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Epoch + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ZenithDistance + Auto + InputKey = ZENITH_DISTANCE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ZenithDistance + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Azimuth + Auto + InputKey = AZIMUTH + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Azimuth + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = SiderealTime + Auto + InputKey = SIDEREAL_TIME + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = SiderealTime + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = JulianDate + Auto + InputKey = JULIAN_DATE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = JulianDate + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = HourAngleRate + Auto + InputKey = HOUR_ANGLE_RATE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = HourAngleRate + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = DeclinationRate + Auto + InputKey = DECLINATION_RATE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = DeclinationRate + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = LunarPhase + Auto + InputKey = LUNAR_PHASE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = LunarPhase + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = LunarSemiDiameter + Auto + InputKey = LUNAR_SEMI_DIAMETER + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = LunarSemiDiameter + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = LunarBrightLimb + Auto + InputKey = LUNAR_BRIGHT_LIMB + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = LunarBrightLimb + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = LunarPositionAxis + Auto + InputKey = LUNAR_POSITION_AXIS + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = LunarPositionAxis + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = SubEarthLatitude + Auto + InputKey = SUB_EARTH_LATITUDE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = SubEarthLatitude + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = SubEarthLongitude + Auto + InputKey = SUB_EARTH_LONGITUDE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = SubEarthLongitude + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = SubSolarLatitude + Auto + InputKey = SUB_SOLAR_LATITUDE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = SubSolarLatitude + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = SubSolarLongitude + Auto + InputKey = SUB_SOLAR_LONGITUDE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = SubSolarLongitude + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = PlanetDeclination + Auto + InputKey = PLANET_DECLINATION + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = PlanetDeclination + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = PlanetRightAscension + Auto + InputKey = PLANET_RIGHT_ASCENSION + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = PlanetRightAscension + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = PlanetRotation + Auto + InputKey = PLANET_ROTATION + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = PlanetRotation + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ScTargetPositionX + Auto + InputKey = SC_TARGET_POSITION_X + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ScTargetPositionX + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ScTargetPositionY + Auto + InputKey = SC_TARGET_POSITION_Y + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ScTargetPositionY + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ScTargetPositionZ + Auto + InputKey = SC_TARGET_POSITION_Z + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ScTargetPositionZ + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ScSunPositionX + Auto + InputKey = SC_SUN_POSITION_X + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ScSunPositionX + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ScSunPositionY + Auto + InputKey = SC_SUN_POSITION_Y + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ScSunPositionY + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = ScSunPositionZ + Auto + InputKey = SC_SUN_POSITION_Z + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = ScSunPositionZ + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = MoonSum + Auto + InputKey = MOONSUM + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = MoonSum + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = MoonErr + Auto + InputKey = MOONERR + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = MoonErr + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = SkyVal + Auto + InputKey = SKYVAL + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = SkyVal + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = SkyErr + Auto + InputKey = SKYERR + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = SkyErr + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Ef2Sp1 + Auto + InputKey = EF2_SP1 + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Ef2Sp1 + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Ef2Sp2 + Auto + InputKey = EF2_SP2 + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Ef2Sp2 + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Ef2Sp3 + Auto + InputKey = EF2_SP3 + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Ef2Sp3 + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Quality + Auto + InputKey = QUALITY + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Quality + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = CenterLine + Auto + InputKey = BAND_BIN_CENTER_LINE + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = CenterLine + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = CenterSamp + Auto + InputKey = BAND_BIN_CENTER_SAMP + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = CenterSamp + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Radius + Auto + InputKey = BAND_BIN_RADIUS + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Radius + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = CenterLineError + Auto + InputKey = BAND_BIN_CENTER_LINE_ERROR + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = CenterLineError + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = CenterSampError + Auto + InputKey = BAND_BIN_CENTER_SAMP_ERROR + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = CenterSampError + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = RadiusError + Auto + InputKey = BAND_BIN_RADIUS_ERROR + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = RadiusError + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = CalibrationFactor + Auto + InputKey = BAND_BIN_CALIBRATION_FACTOR + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = CalibrationFactor + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = UcalibrationFactor + Auto + InputKey = BAND_BIN_U_CALIBRATION_FACTOR + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = UcalibrationFactor + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Extinction + Auto + InputKey = BAND_BIN_EXTINCTION + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Extinction + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group + +Group = Uextinction + Auto + InputKey = BAND_BIN_U_EXTINCTION + InputGroup = "QUBE,BAND_BIN" + InputPosition = (QUBE, BAND_BIN) + OutputName = Uextinction + OutputPosition = (Group, BandBin) + Translation = (*, *) +End_Group +End diff --git a/isis/src/rolo/apps/rolo2isis/RoloInstrument.trn b/isis/src/rolo/apps/rolo2isis/RoloInstrument.trn new file mode 100644 index 0000000000..b496f9a755 --- /dev/null +++ b/isis/src/rolo/apps/rolo2isis/RoloInstrument.trn @@ -0,0 +1,281 @@ +#Begin +Group = LunarDate + Auto + InputKey = LUNAR_DATE + InputGroup = QUBE + InputPosition = QUBE + OutputName = LunarDate + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = UniversalDate + Auto + InputKey = UNIVERSAL_DATE + InputGroup = QUBE + InputPosition = QUBE + OutputName = UniversalDate + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = SeriesNumber + Auto + InputKey = SERIES_NUMBER + InputGroup = QUBE + InputPosition = QUBE + OutputName = SeriesNumber + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = ObjectType + Auto + InputKey = OBJECT_TYPE + InputGroup = QUBE + InputPosition = QUBE + OutputName = ObjectType + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TargetName + Auto + InputKey = TARGET_NAME + InputGroup = QUBE + InputPosition = QUBE + OutputName = TargetName + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = ObjectId + Auto + InputKey = OBJECT_ID + InputGroup = QUBE + InputPosition = QUBE + OutputName = ObjectId + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = FlapPosition + Auto + InputKey = FLAP_POSITION + InputGroup = QUBE + InputPosition = QUBE + OutputName = FlapPosition + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = ShutterMode + Auto + InputKey = SHUTTER_MODE + InputGroup = QUBE + InputPosition = QUBE + OutputName = ShutterMode + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = RightAscension + Auto + InputKey = RIGHT_ASCENSION + InputGroup = QUBE + InputPosition = QUBE + OutputName = RightAscension + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = Declination + Auto + InputKey = DECLINATION + InputGroup = QUBE + InputPosition = QUBE + OutputName = Declination + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = Epoch + Auto + InputKey = EPOCH + InputGroup = QUBE + InputPosition = QUBE + OutputName = Epoch + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TeleHourAngle + Auto + InputKey = TELE_HOUR_ANGLE + InputGroup = QUBE + InputPosition = QUBE + OutputName = TeleHourAngle + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TeleRightAscension + Auto + InputKey = TELE_RIGHT_ASCENSION + InputGroup = QUBE + InputPosition = QUBE + OutputName = TeleRightAscension + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TeleDeclination + Auto + InputKey = TELE_DECLINATION + InputGroup = QUBE + InputPosition = QUBE + OutputName = TeleDeclination + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TeleEpoch + Auto + InputKey = TELE_EPOCH + InputGroup = QUBE + InputPosition = QUBE + OutputName = TeleEpoch + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = RaTrackingRate + Auto + InputKey = RA_TRACKING_RATE + InputGroup = QUBE + InputPosition = QUBE + OutputName = RaTrackingRate + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = DecTrackingRate + Auto + InputKey = DEC_TRACKING_RATE + InputGroup = QUBE + InputPosition = QUBE + OutputName = DecTrackingRate + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = CcdStartingRow + Auto + InputKey = CCD_STARTING_ROW + InputGroup = QUBE + InputPosition = QUBE + OutputName = CcdStartingRow + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = CcdStartingColumn + Auto + InputKey = CCD_STARTING_COLUMN + InputGroup = QUBE + InputPosition = QUBE + OutputName = CcdStartingColumn + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = Rows + Auto + InputKey = ROWS + InputGroup = QUBE + InputPosition = QUBE + OutputName = Rows + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = Columns + Auto + InputKey = COLUMNS + InputGroup = QUBE + InputPosition = QUBE + OutputName = Columns + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = AirTemperature + Auto + InputKey = AIR_TEMPERATURE + InputGroup = QUBE + InputPosition = QUBE + OutputName = AirTemperature + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = WindSpeed + Auto + InputKey = WIND_SPEED + InputGroup = QUBE + InputPosition = QUBE + OutputName = WindSpeed + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TelescopeLocationX + Auto + InputKey = TELESCOPE_LOCATION_X + InputGroup = QUBE + InputPosition = QUBE + OutputName = TelescopeLocationX + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TelescopeLocationY + Auto + InputKey = TELESCOPE_LOCATION_Y + InputGroup = QUBE + InputPosition = QUBE + OutputName = TelescopeLocationY + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = TelescopeLocationZ + Auto + InputKey = TELESCOPE_LOCATION_Z + InputGroup = QUBE + InputPosition = QUBE + OutputName = TelescopeLocationZ + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = PixelResolution + Auto + InputKey = PIXEL_RESOLUTION + InputGroup = QUBE + InputPosition = QUBE + OutputName = PixelResolution + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group + +Group = NorthOrientation + Auto + InputKey = NORTH_ORIENTATION + InputGroup = QUBE + InputPosition = QUBE + OutputName = NorthOrientation + OutputPosition = (Group, Instrument) + Translation = (*, *) +End_Group +End diff --git a/isis/src/rolo/apps/rolo2isis/RoloMapping.trn b/isis/src/rolo/apps/rolo2isis/RoloMapping.trn new file mode 100644 index 0000000000..c1b5ad1bae --- /dev/null +++ b/isis/src/rolo/apps/rolo2isis/RoloMapping.trn @@ -0,0 +1,106 @@ +#Begin +Group = ProjectionName + Auto + InputDefault = LunarAzimuthalEqualArea + OutputName = ProjectionName + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = TargetName + Auto + InputDefault = Moon + OutputName = TargetName + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = MaximumLibration + Auto + InputDefault = 11 + OutputName = MaximumLibration + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = EquatorialRadius + Auto + InputDefault = 1737400.0000 + OutputName = EquatorialRadius + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = PolarRadius + Auto + InputDefault = 1737400.0000 + OutputName = PolarRadius + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +# Group = LongitudeDirection +# Auto +# OutputPosition = ("Group","Mapping") +# OutputName = LongitudeDirection +# InputGroup = "QUBE,IMAGE_MAP_PROJECTION" +# InputKey = POSITIVE_LONGITUDE_DIRECTION +# Translation = (PositiveEast,EAST) +# Translation = (PositiveWest,WEST) +# EndGroup +Group = Scale + Auto + InputDefault = 5.02654 + OutputName = Scale + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = UpperLeftCornerX + Auto + InputDefault = -1737402.8501027 + OutputName = UpperLeftCornerX + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = UpperLeftCornerY + Auto + InputDefault = 1737402.8501027 + OutputName = UpperLeftCornerY + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = LatitudeType + Auto + InputDefault = Planetocentric + OutputName = LatitudeType + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = LongitudeDomain + Auto + InputDefault = 180 + OutputName = LongitudeDomain + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = LogitudeDirection + Auto + InputDefault = PositiveEast + OutputName = LongitudeDirection + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group + +Group = PixelResolution + Auto + InputDefault = 6032.6487850787 + OutputName = PixelResolution + OutputPosition = (Group, Mapping) + Translation = (*, *) +End_Group +End diff --git a/isis/src/rolo/apps/rolo2isis/main.cpp b/isis/src/rolo/apps/rolo2isis/main.cpp index a190803d73..3ab213af6c 100644 --- a/isis/src/rolo/apps/rolo2isis/main.cpp +++ b/isis/src/rolo/apps/rolo2isis/main.cpp @@ -18,30 +18,28 @@ void IsisMain() { Cube *ocube = p.SetOutputCube("TO"); p.StartProcess(); - PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory"); - QString transDir = (QString) dataDir["Rolo"]; + QString transDir = "$ISISROOT/appdata/translations/"; - FileName transFile; Pvl inputLabel(labelFile); Pvl outputLabel; PvlToPvlTranslationManager *translator; // translate Mapping group - transFile = transDir + "/" + "translations/roloMapping.trn"; + FileName transFile = transDir + "RoloMapping.trn"; translator = new PvlToPvlTranslationManager(inputLabel, transFile.expanded()); translator->Auto(outputLabel); delete translator; translator = NULL; // translate Instrument group - transFile = transDir + "/" + "translations/roloInstrument.trn"; + transFile = transDir + "RoloInstrument.trn"; translator = new PvlToPvlTranslationManager(inputLabel, transFile.expanded()); translator->Auto(outputLabel); delete translator; translator = NULL; // translate BandBin group - transFile = transDir + "/" + "translations/roloBandBin.trn"; + transFile = transDir + "RoloBandBin.trn"; translator = new PvlToPvlTranslationManager(inputLabel, transFile.expanded()); translator->Auto(outputLabel); outputLabel.findGroup("BandBin").findKeyword("OriginalBand").setUnits( @@ -56,7 +54,7 @@ void IsisMain() { translator = NULL; // translate Archive group - transFile = transDir + "/" + "translations/roloArchive.trn"; + transFile = transDir + "RoloArchive.trn"; translator = new PvlToPvlTranslationManager(inputLabel, transFile.expanded()); translator->Auto(outputLabel); delete translator; From 389d080f35e2425561a3105855bc530ee720aa1a Mon Sep 17 00:00:00 2001 From: Kristin Date: Thu, 19 Mar 2020 11:09:34 -0700 Subject: [PATCH 4/4] Fixes failing mro tests and remove unused label file in chan1 --- .../chandrayaan1/apps/chan1m32isis/labels.pvl | 239 ------------------ isis/src/mro/apps/hideal2pds/main.cpp | 4 +- .../mro/apps/hidtmgen/MroHiriseIdealPds.pft | 173 +++++++++++++ .../mro/apps/hidtmgen/MroHiriseIdealPds.typ | 109 ++++++++ .../mro/apps/hidtmgen/MroHirisePdsDTMEqui.pft | 84 ++++++ .../apps/hidtmgen/MroHirisePdsDTMPolar.pft | 74 ++++++ isis/src/mro/apps/hidtmgen/main.cpp | 4 +- .../mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft | 102 ++++++++ .../apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft | 115 +++++++++ .../apps/hirdrgen/MroHirisePdsRdrPolar.pft | 86 +++++++ .../apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft | 99 ++++++++ isis/src/mro/apps/hirdrgen/main.cpp | 10 +- 12 files changed, 851 insertions(+), 248 deletions(-) delete mode 100644 isis/src/chandrayaan1/apps/chan1m32isis/labels.pvl create mode 100644 isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.pft create mode 100644 isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.typ create mode 100644 isis/src/mro/apps/hidtmgen/MroHirisePdsDTMEqui.pft create mode 100644 isis/src/mro/apps/hidtmgen/MroHirisePdsDTMPolar.pft create mode 100644 isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft create mode 100644 isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft create mode 100644 isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft create mode 100644 isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/labels.pvl b/isis/src/chandrayaan1/apps/chan1m32isis/labels.pvl deleted file mode 100644 index adf3a23292..0000000000 --- a/isis/src/chandrayaan1/apps/chan1m32isis/labels.pvl +++ /dev/null @@ -1,239 +0,0 @@ -Object = IsisCube - Object = Core - StartByte = 65537 - Format = Tile - TileSamples = 304 - TileLines = 282 - - Group = Dimensions - Samples = 608 - Lines = 564 - Bands = 256 - End_Group - - Group = Pixels - Type = Real - ByteOrder = Lsb - Base = 0.0 - Multiplier = 1.0 - End_Group - End_Object - - Group = Instrument - SpacecraftName = CHANDRAYAAN-1 - MissionId = CH1 - InstrumentHostName = "CHANDRAYAAN-1 ORBITER" - InstrumentHostId = CH1-ORB - InstrumentName = "MOON MINERALOGY MAPPER" - InstrumentId = M3 - TargetName = MOON - MissionPhaseName = "PRIMARY MISSION" - StartTime = 2009-06-30T08:34:07 - StopTime = 2009-06-30T08:34:36 - SpacecraftClockStartCount = 12/1759028.348 - SpacecraftClockStopCount = 12/1759056.993 - OrbitNumber = 02804 - InstrumentModeId = TARGET - SpatialSumming = 1 - LineExposureDuration = 50.88 - SpacecraftYawDirection = FORWARD - OrbitLimbDirection = ASCENDING - SampleDisplayDirection = UNKNOWN - LineDisplayDirection = UNKNOWN - ProductType = CALIBRATED_IMAGE - End_Group - - Group = Archive - DataSetId = CH1-ORB-L-M3-4-L1B-RADIANCE-V3.0 - ProducerInstitutionName = "JET PROPULSION LABORATORY" - ProductId = M3T20090630T083407_V03_RDN - SourceProductId = M3T20090630T083407_V01_L0.IMG - ProductType = CALIBRATED_IMAGE - ProductCreationTime = 2009-05-10T18:01:10 - ProductVersionType = ACTUAL - ProductVersionId = 3.0 - SoftwareName = m3t_l1b_v07.exe - SoftwareVersionId = 07 - Description = "M3 Level 1B data product which contains pixel - located, radiometrically-calibrated data." - End_Group - - Group = BandBin - Center = (446.02, 456.00, 465.98, 475.96, 485.95, 495.93, 505.91, - 515.89, 525.87, 535.85, 545.83, 555.81, 565.79, 575.77, - 585.76, 595.74, 605.72, 615.70, 625.68, 635.66, 645.64, - 655.62, 665.60, 675.58, 685.56, 695.55, 705.53, 715.51, - 725.49, 735.47, 745.45, 755.43, 765.41, 775.39, 785.37, - 795.36, 805.34, 815.32, 825.30, 835.28, 845.26, 855.24, - 865.22, 875.20, 885.18, 895.17, 905.15, 915.13, 925.11, - 935.09, 945.07, 955.05, 965.03, 975.01, 984.99, 994.97, - 1004.96, 1014.94, 1024.92, 1034.90, 1044.88, 1054.86, - 1064.84, 1074.82, 1084.80, 1094.78, 1104.77, 1114.75, - 1124.73, 1134.71, 1144.69, 1154.67, 1164.65, 1174.63, - 1184.61, 1194.59, 1204.58, 1214.56, 1224.54, 1234.52, - 1244.50, 1254.48, 1264.46, 1274.44, 1284.42, 1294.40, - 1304.38, 1314.37, 1324.35, 1334.33, 1344.31, 1354.29, - 1364.27, 1374.25, 1384.23, 1394.21, 1404.19, 1414.18, - 1424.16, 1434.14, 1444.12, 1454.10, 1464.08, 1474.06, - 1484.04, 1494.02, 1504.00, 1513.99, 1523.97, 1533.95, - 1543.93, 1553.91, 1563.89, 1573.87, 1583.85, 1593.83, - 1603.81, 1613.80, 1623.78, 1633.76, 1643.74, 1653.72, - 1663.70, 1673.68, 1683.66, 1693.64, 1703.62, 1713.60, - 1723.59, 1733.57, 1743.55, 1753.53, 1763.51, 1773.49, - 1783.47, 1793.45, 1803.43, 1813.41, 1823.40, 1833.38, - 1843.36, 1853.34, 1863.32, 1873.30, 1883.28, 1893.26, - 1903.24, 1913.22, 1923.21, 1933.19, 1943.17, 1953.15, - 1963.13, 1973.11, 1983.09, 1993.07, 2003.05, 2013.03, - 2023.01, 2033.00, 2042.98, 2052.96, 2062.94, 2072.92, - 2082.90, 2092.88, 2102.86, 2112.84, 2122.82, 2132.81, - 2142.79, 2152.77, 2162.75, 2172.73, 2182.71, 2192.69, - 2202.67, 2212.65, 2222.63, 2232.62, 2242.60, 2252.58, - 2262.56, 2272.54, 2282.52, 2292.50, 2302.48, 2312.46, - 2322.44, 2332.42, 2342.41, 2352.39, 2362.37, 2372.35, - 2382.33, 2392.31, 2402.29, 2412.27, 2422.25, 2432.23, - 2442.22, 2452.20, 2462.18, 2472.16, 2482.14, 2492.12, - 2502.10, 2512.08, 2522.06, 2532.04, 2542.03, 2552.01, - 2561.99, 2571.97, 2581.95, 2591.93, 2601.91, 2611.89, - 2621.87, 2631.85, 2641.83, 2651.82, 2661.80, 2671.78, - 2681.76, 2691.74, 2701.72, 2711.70, 2721.68, 2731.66, - 2741.64, 2751.63, 2761.61, 2771.59, 2781.57, 2791.55, - 2801.53, 2811.51, 2821.49, 2831.47, 2841.45, 2851.44, - 2861.42, 2871.40, 2881.38, 2891.36, 2901.34, 2911.32, - 2921.30, 2931.28, 2941.26, 2951.25, 2961.23, 2971.21, - 2981.19, 2991.17) - Width = (12.31, 12.30, 12.30, 12.29, 12.29, 12.28, 12.28, 12.27, - 12.27, 12.26, 12.26, 12.26, 12.25, 12.25, 12.25, 12.24, - 12.24, 12.24, 12.24, 12.23, 12.23, 12.23, 12.23, 12.23, - 12.22, 12.22, 12.22, 12.22, 12.22, 12.22, 12.22, 12.22, - 12.22, 12.22, 12.22, 12.22, 12.22, 12.22, 12.22, 12.22, - 12.22, 12.23, 12.23, 12.23, 12.23, 12.23, 12.23, 12.24, - 12.24, 12.24, 12.24, 12.24, 12.25, 12.25, 12.25, 12.26, - 12.26, 12.26, 12.26, 12.27, 12.27, 12.27, 12.28, 12.28, - 12.29, 12.29, 12.29, 12.30, 12.30, 12.31, 12.31, 12.31, - 12.32, 12.32, 12.33, 12.33, 12.34, 12.34, 12.35, 12.35, - 12.36, 12.36, 12.37, 12.37, 12.38, 12.38, 12.39, 12.39, - 12.40, 12.40, 12.41, 12.41, 12.42, 12.42, 12.43, 12.43, - 12.44, 12.45, 12.45, 12.46, 12.46, 12.47, 12.47, 12.48, - 12.48, 12.49, 12.50, 12.50, 12.51, 12.51, 12.52, 12.52, - 12.53, 12.53, 12.54, 12.55, 12.55, 12.56, 12.56, 12.57, - 12.57, 12.58, 12.58, 12.59, 12.59, 12.60, 12.60, 12.61, - 12.61, 12.62, 12.62, 12.63, 12.63, 12.64, 12.64, 12.65, - 12.65, 12.66, 12.66, 12.67, 12.67, 12.68, 12.68, 12.68, - 12.69, 12.69, 12.70, 12.70, 12.70, 12.71, 12.71, 12.71, - 12.72, 12.72, 12.72, 12.73, 12.73, 12.73, 12.74, 12.74, - 12.74, 12.74, 12.75, 12.75, 12.75, 12.75, 12.76, 12.76, - 12.76, 12.76, 12.76, 12.76, 12.76, 12.76, 12.77, 12.77, - 12.77, 12.77, 12.77, 12.77, 12.77, 12.77, 12.77, 12.77, - 12.77, 12.77, 12.76, 12.76, 12.76, 12.76, 12.76, 12.76, - 12.75, 12.75, 12.75, 12.75, 12.74, 12.74, 12.74, 12.74, - 12.73, 12.73, 12.72, 12.72, 12.72, 12.71, 12.71, 12.70, - 12.70, 12.69, 12.69, 12.68, 12.67, 12.67, 12.66, 12.65, - 12.65, 12.64, 12.63, 12.63, 12.62, 12.61, 12.60, 12.59, - 12.58, 12.58, 12.57, 12.56, 12.55, 12.54, 12.53, 12.52, - 12.51, 12.50, 12.48, 12.47, 12.46, 12.45, 12.44, 12.42, - 12.41, 12.40, 12.38, 12.37, 12.36, 12.34, 12.33, 12.31, - 12.30, 12.28, 12.27, 12.25, 12.23, 12.22, 12.20, 12.18) - FilterNumber = (5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, - 252, 253, 254, 255, 256, 257, 258, 259, 260) - OriginalBand = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, - 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, - 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, - 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, - 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, - 250, 251, 252, 253, 254, 255, 256) - End_Group - - Group = Kernels - NaifFrameCode = -86520 - End_Group - - Group = RadiometricCalibration - Units = W/m2/um/sr - SolarDistance = 1.01711556761 - DetectorTemperature = 161.99 - SpectralCalibrationFileName = M3T20070912_RDN_SPC.TAB - RadGainFactorFileName = M3T20070912_RDN_GAIN.TAB - GlobalBandpassFileName = M3T20070912_RDN_SPC.TAB - End_Group -End_Object - -Object = Label - Bytes = 65536 -End_Object - -Object = Table - Name = UtcFile - StartByte = 351208051 - Bytes = 28200 - Records = 564 - ByteOrder = Lsb - - Group = Field - Name = LineNumber - Type = Integer - Size = 1 - End_Group - - Group = Field - Name = UtcTime - Type = Text - Size = 26 - End_Group - - Group = Field - Name = Year - Type = Text - Size = 4 - End_Group - - Group = Field - Name = Ddoy - Type = Text - Size = 16 - End_Group -End_Object - -Object = History - Name = IsisCube - StartByte = 351207425 - Bytes = 626 -End_Object - -Object = OriginalLabel - Name = IsisCube - StartByte = 351236251 - Bytes = 17097 -End_Object -End diff --git a/isis/src/mro/apps/hideal2pds/main.cpp b/isis/src/mro/apps/hideal2pds/main.cpp index 4348a9b4e1..f440be0c63 100644 --- a/isis/src/mro/apps/hideal2pds/main.cpp +++ b/isis/src/mro/apps/hideal2pds/main.cpp @@ -287,10 +287,10 @@ void IsisMain() { // Read in the proper keyword types (Real, Enum, String, Integer, etc) for // each PvlKeyword so that the PDS labels have proper format PvlFormat *formatter = pdsLabel.format(); - formatter->add("$mro/templates/labels/hiriseIdealPds.typ"); + formatter->add("$ISISROOT/appdata/translations/MroHiriseIdealPds.typ"); // Format ordering of keywords/objects/groups/comments in the PDS labels - pdsLabel.setFormatTemplate("$mro/templates/labels/hiriseIdealPds.pft"); + pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHiriseIdealPds.pft"); // image line/byte offsets are calculated and values are updated in the labels // now that all translations/additions/modifications to the labels have been diff --git a/isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.pft b/isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.pft new file mode 100644 index 0000000000..0ba52cc7ba --- /dev/null +++ b/isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.pft @@ -0,0 +1,173 @@ +PDS_VERSION_ID +RECORD_TYPE +RECORD_BYTES +FILE_RECORDS +LABEL_RECORDS +^IMAGE +^INSTRUMENT_POINTING_TABLE +^INSTRUMENT_POSITION_TABLE +^BODY_ROTATION_TABLE +^SUN_POSITION_TABLE +NOT_APPLICABLE_CONSTANT +DATA_SET_ID +DATA_SET_NAME +PRODUCER_INSTITUTION_NAME +PRODUCER_ID +PRODUCER_FULL_NAME +OBSERVATION_ID +PRODUCT_ID +PRODUCT_VERSION_ID +SPACECRAFT_NAME +INSTRUMENT_ID +INSTRUMENT_NAME +INSTRUMENT_HOST_ID +INSTRUMENT_HOST_NAME +TARGET_NAME +MISSION_PHASE_NAME +ORBIT_NUMBER +SOURCE_PRODUCT_ID +RATIONALE_DESC +SOFTWARE_NAME +SAMPLE_DETECTORS +LINE_DETECTORS +INSTRUMENT_TYPE +FOCAL_LENGTH +PIXEL_PITCH +EPHEMERIS_TIME +FOCAL_PLANE_X_DEPENDENCY +TRANS_X +TRANS_Y +EXPOSURE_DURATION +MATCHED_CUBE +IMAGE_JITTER_CORRECTED +SHAPE_MODEL +A_AXIS_RADIUS +B_AXIS_RADIUS +C_AXIS_RADIUS +BODY_FRAME_CODE +IDEAL_FOCAL_LENGTH +IDEAL_PIXEL_PITCH +IDEAL_TRANSX +IDEAL_TRANSY +IDEAL_TRANSL +IDEAL_TRANSS + +/* All xxx_COUNT values are for the MRO spacecraft clock (SCLK) */ +/* in seconds:subseconds form. A subsecond tick = 15.2588 microseconds. */ +/* All xxx_TIME values are referenced to UTC. */ +GROUP = TIME_PARAMETERS +/* Time when the observation first started */ + MRO:OBSERVATION_START_TIME + MRO:OBSERVATION_START_COUNT + /* Time of the first image line */ + START_TIME + SPACECRAFT_CLOCK_START_COUNT + /* Time of the last image line */ + STOP_TIME + SPACECRAFT_CLOCK_STOP_COUNT + /* Time when this RDR product was created */ + PRODUCT_CREATION_TIME +END_GROUP = TIME_PARAMETERS + +OBJECT = IMAGE + DESCRIPTION + LINES + LINE_SAMPLES + SOURCE_LINE_SAMPLES + SOURCE_LINES + FIRST_LINE_SAMPLE + FIRST_LINE + BANDS + OFFSET + SCALING_FACTOR + SAMPLE_BITS + SAMPLE_BIT_MASK + SAMPLE_TYPE + FILTER_NAME + CENTER_FILTER_WAVELENGTH + BAND_WIDTH + BAND_STORAGE_TYPE + CORE_NULL + CORE_LOW_REPR_SATURATION + CORE_LOW_INSTR_SATURATION + CORE_HIGH_REPR_SATURATION + CORE_HIGH_INSTR_SATURATION + VALID_MINIMUM + INTERCHANGE_FORMAT +END_OBJECT = IMAGE + +OBJECT = INSTRUMENT_POINTING_TABLE + INTERCHANGE_FORMAT + ROWS + COLUMNS + ROW_BYTES + ROW_SUFFIX_BYTES + TIME_DEPENDENT_FRAMES + CONSTANT_FRAMES + CONSTANT_ROTATION + CK_TABLE_START_TIME + CK_TABLE_END_TIME + CK_TABLE_ORIGINAL_SIZE + OBJECT = COLUMN + COLUMN_NUMBER + NAME + DATA_TYPE + START_BYTE + BYTES + END_OBJECT = COLUMN +END_OBJECT = INSTRUMENT_POINTING_TABLE + +OBJECT = INSTRUMENT_POSITION_TABLE + ROWS + COLUMNS + ROW_BYTES + ROW_SUFFIX_BYTES + CACHE_TYPE + SPK_TABLE_START_TIME + SPK_TABLE_END_TIME + SPK_TABLE_ORIGINAL_SIZE + OBJECT = COLUMN + COLUMN_NUMBER + NAME + DATA_TYPE + START_BYTE + BYTES + END_OBJECT = COLUMN +END_OBJECT = INSTRUMENT_POSITION_TABLE + +OBJECT = BODY_ROTATION_TABLE + ROWS + COLUMNS + ROW_BYTES + ROW_SUFFIX_BYTES + TIME_DEPENDENT_FRAMES + CK_TABLE_START_TIME + CK_TABLE_END_TIME + CK_TABLE_ORIGINAL_SIZE + SOLAR_LONGITUDE + OBJECT = COLUMN + COLUMN_NUMBER + NAME + DATA_TYPE + START_BYTE + BYTES + END_OBJECT = COLUMN +END_OBJECT = BODY_ROTATION_TABLE + +OBJECT = SUN_POSITION_TABLE + ROWS + COLUMNS + ROW_BYTES + ROW_SUFFIX_BYTES + CACHE_TYPE + SPK_TABLE_START_TIME + SPK_TABLE_END_TIME + SPK_TABLE_ORIGINAL_SIZE + OBJECT = COLUMN + COLUMN_NUMBER + NAME + DATA_TYPE + START_BYTE + BYTES + END_OBJECT = COLUMN +END_OBJECT = SUN_POSITION_TABLE diff --git a/isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.typ b/isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.typ new file mode 100644 index 0000000000..0a5e4bf3c9 --- /dev/null +++ b/isis/src/mro/apps/hidtmgen/MroHiriseIdealPds.typ @@ -0,0 +1,109 @@ +PDS_VERSION_ID = Enum +RECORD_TYPE = Enum +RECORD_BYTES = Integer +FILE_RECORDS = Integer +LABEL_RECORDS = Integer +^IMAGE = String +^INSTRUMENT_POINTING_TABLE = String +^INSTRUMENT_POSITION_TABLE = String +^BODY_ROTATION_TABLE = String +^SUN_POSITION_TABLE = String +NOT_APPLICABLE_CONSTANT = Integer +DATA_SET_ID = String +DATA_SET_NAME = String +PRODUCER_INSTITUTION_NAME = String +PRODUCER_ID = String +PRODUCER_FULL_NAME = String +OBSERVATION_ID = String +PRODUCT_ID = String +PRODUCT_VERSION_ID = String +SPACECRAFT_NAME = String +INSTRUMENT_ID = String +INSTRUMENT_NAME = String +INSTRUMENT_HOST_ID = String +INSTRUMENT_HOST_NAME = String +TARGET_NAME = String +MISSION_PHASE_NAME = String +ORBIT_NUMBER = Integer +#SOURCE_PRODUCT_ID = String +RATIONALE_DESC = String +SOFTWARE_NAME = String +SAMPLE_DETECTORS = Integer +LINE_DETECTORS = Integer +INSTRUMENT_TYPE = Enum +EPHEMERIS_TIME = Real +FOCAL_PLANE_X_DEPENDENCY = Integer +EXPOSURE_DURATION = (Real, 6) +IMAGE_JITTER_CORRECTED = Integer +SHAPE_MODEL = String +A_AXIS_RADIUS = (Real, 2) +B_AXIS_RADIUS = (Real, 2) +C_AXIS_RADIUS = (Real, 2) +BODY_FRAME_CODE = Integer +IDEAL_FOCAL_LENGTH = (Real, 12) +IDEAL_PIXEL_PITCH = (Real, 12) +IDEAL_TRANSX = (Real, 12) +IDEAL_TRANSY = (Real, 12) +IDEAL_TRANSS = (Real, 12) +IDEAL_TRANSL = (Real, 12) +MISSION_NAME = String +INSTRUMENT_MODE_ID = String + + + +# Time Parameters Group +MRO:OBSERVATION_START_TIME = Enum +MRO:OBSERVATION_START_COUNT = Enum +START_TIME = Enum +SPACECRAFT_CLOCK_START_COUNT = String +STOP_TIME = Enum +SPACECRAFT_CLOCK_STOP_COUNT = String +PRODUCT_CREATION_TIME = Enum + +# Image Object +DESCRIPTION = String +LINES = Integer +LINE_SAMPLES = Integer +BANDS = Integer +OFFSET = Real +SCALING_FACTOR = Real +SAMPLE_BITS = Integer +SAMPLE_BIT_MASK = ("Binary",16) +SAMPLE_TYPE = Enum +FILTER_NAME = String +CENTER_FILTER_WAVELENGTH = Real +BAND_WIDTH = Real +BAND_STORAGE_TYPE = Enum +CORE_NULL = Integer +CORE_LOW_REPR_SATURATION = Integer +CORE_LOW_INSTR_SATURATION = Integer +CORE_HIGH_REPR_SATURATION = Integer +CORE_HIGH_INSTR_SATURATION = Integer +VALID_MINIMUM = Integer +INTERCHANGE_FORMAT = Enum +ROWS = Integer +COLUMNS = Integer +ROW_BYTES = Integer +ROW_SUFFIX_BYTES = Integer +SOURCE_LINE_SAMPLES = Integer +SOURCE_LINES = Integer +FIRST_LINE_SAMPLE = Real +FIRST_LINE = Real + +# Table Objects +TIME_DEPENDENT_FRAMES = Real +CONSTANT_FRAMES = Real +CONSTANT_ROTATION = Real +CK_TABLE_START_TIME = Real +CK_TABLE_END_TIME = Real +CK_TABLE_ORIGINAL_SIZE = Integer +COLUMN_NUMBER = Integer +NAME = String +START_BYTE = Integer +DATA_TYPE = Enum +BYTES = Integer +CACHE_TYPE = Enum +SPK_TABLE_START_TIME = Real +SPK_TABLE_END_TIME = Real +SPK_TABLE_ORIGINAL_SIZE = Integer +SOLAR_LONGITUDE = Real diff --git a/isis/src/mro/apps/hidtmgen/MroHirisePdsDTMEqui.pft b/isis/src/mro/apps/hidtmgen/MroHirisePdsDTMEqui.pft new file mode 100644 index 0000000000..b1b39fb26f --- /dev/null +++ b/isis/src/mro/apps/hidtmgen/MroHirisePdsDTMEqui.pft @@ -0,0 +1,84 @@ +PDS_VERSION_ID + +/* File format and length */ +RECORD_TYPE +RECORD_BYTES +FILE_RECORDS +^IMAGE + +OBJECT = IMAGE + LINES + LINE_SAMPLES + BANDS + OFFSET + SCALING_FACTOR + NOTE + SAMPLE_BITS + SAMPLE_BIT_MASK + SAMPLE_TYPE + MISSING_CONSTANT + VALID_MINIMUM + VALID_MAXIMUM +END_OBJECT = IMAGE + +/* Identification Information */ +DATA_SET_ID +DATA_SET_NAME +PRODUCER_INSTITUTION_NAME +PRODUCER_ID +PRODUCER_FULL_NAME +PRODUCT_ID +PRODUCT_VERSION_ID +INSTRUMENT_HOST_NAME +INSTRUMENT_HOST_ID +INSTRUMENT_NAME +INSTRUMENT_ID +TARGET_NAME +SOURCE_PRODUCT_ID +RATIONALE_DESC +SOFTWARE_NAME + +OBJECT = IMAGE_MAP_PROJECTION + ^DATA_SET_MAP_PROJECTION = "DSMAP.CAT" + MAP_PROJECTION_TYPE + PROJECTION_LATITUDE_TYPE = PLANETOCENTRIC + /* NOTE: The EQUIRECTANGULAR projection is based on the formula */ + /* for a sphere. To eliminate confusion in the */ + /* IMAGE_MAP_PROJECTION object we have set all three radii, */ + /* A_AXIS_RADIUS, B_AXIS_RADIUS, and C_AXIS_RADIUS to the same */ + /* number. The value recorded in the three radii is the local */ + /* radius at the center latitude on the Mars ellipsoid. That is, */ + /* equatorial radius of 3396.190000 km and polar radius of */ + /* 3376.200000 kilometers. Using the local radius of the */ + /* ellipsoid implies that the MAP_SCALE and MAP_RESOLUTION are */ + /* true at the center latitude. */ + A_AXIS_RADIUS + B_AXIS_RADIUS + C_AXIS_RADIUS + COORDINATE_SYSTEM_NAME + POSITIVE_LONGITUDE_DIRECTION + KEYWORD_LATITUDE_TYPE + /* NOTE: CENTER_LATITUDE and CENTER_LONGITUDE describe the location */ + /* of the center of projection, which is not necessarily equal to the */ + /* location of the center point of the image. */ + CENTER_LATITUDE + CENTER_LONGITUDE + LINE_FIRST_PIXEL + LINE_LAST_PIXEL + SAMPLE_FIRST_PIXEL + SAMPLE_LAST_PIXEL + MAP_PROJECTION_ROTATION + MAP_RESOLUTION + MAP_SCALE + MAXIMUM_LATITUDE + MINIMUM_LATITUDE + LINE_PROJECTION_OFFSET + SAMPLE_PROJECTION_OFFSET + EASTERNMOST_LONGITUDE + WESTERNMOST_LONGITUDE +END_OBJECT = IMAGE_MAP_PROJECTION + +OBJECT = VIEWING_PARAMETERS + NORTH_AZIMUTH +END_OBJECT = VIEWING_PARAMETERS +END diff --git a/isis/src/mro/apps/hidtmgen/MroHirisePdsDTMPolar.pft b/isis/src/mro/apps/hidtmgen/MroHirisePdsDTMPolar.pft new file mode 100644 index 0000000000..1679bf0fa6 --- /dev/null +++ b/isis/src/mro/apps/hidtmgen/MroHirisePdsDTMPolar.pft @@ -0,0 +1,74 @@ +PDS_VERSION_ID + +/* File format and length */ +RECORD_TYPE +RECORD_BYTES +FILE_RECORDS +^IMAGE + +OBJECT = IMAGE + LINES + LINE_SAMPLES + BANDS + OFFSET + SCALING_FACTOR + NOTE + SAMPLE_BITS + SAMPLE_BIT_MASK + SAMPLE_TYPE + MISSING_CONSTANT + VALID_MINIMUM + VALID_MAXIMUM +END_OBJECT = IMAGE + +/* Identification Information */ +DATA_SET_ID +DATA_SET_NAME +PRODUCER_INSTITUTION_NAME +PRODUCER_ID +PRODUCER_FULL_NAME +PRODUCT_ID +PRODUCT_VERSION_ID +INSTRUMENT_HOST_NAME +INSTRUMENT_HOST_ID +INSTRUMENT_NAME +INSTRUMENT_ID +TARGET_NAME +SOURCE_PRODUCT_ID +RATIONALE_DESC +SOFTWARE_NAME + +OBJECT = IMAGE_MAP_PROJECTION + ^DATA_SET_MAP_PROJECTION = "DSMAP.CAT" + MAP_PROJECTION_TYPE + PROJECTION_LATITUDE_TYPE = PLANETOCENTRIC + A_AXIS_RADIUS + B_AXIS_RADIUS + C_AXIS_RADIUS + COORDINATE_SYSTEM_NAME + POSITIVE_LONGITUDE_DIRECTION + KEYWORD_LATITUDE_TYPE + /* NOTE: CENTER_LATITUDE and CENTER_LONGITUDE describe the location */ + /* of the center of projection, which is not necessarily equal to the */ + /* location of the center point of the image. */ + CENTER_LATITUDE + CENTER_LONGITUDE + LINE_FIRST_PIXEL + LINE_LAST_PIXEL + SAMPLE_FIRST_PIXEL + SAMPLE_LAST_PIXEL + MAP_PROJECTION_ROTATION + MAP_RESOLUTION + MAP_SCALE + MAXIMUM_LATITUDE + MINIMUM_LATITUDE + LINE_PROJECTION_OFFSET + SAMPLE_PROJECTION_OFFSET + EASTERNMOST_LONGITUDE + WESTERNMOST_LONGITUDE +END_OBJECT = IMAGE_MAP_PROJECTION + +OBJECT = VIEWING_PARAMETERS + NORTH_AZIMUTH +END_OBJECT = VIEWING_PARAMETERS +END diff --git a/isis/src/mro/apps/hidtmgen/main.cpp b/isis/src/mro/apps/hidtmgen/main.cpp index ecea05b4f8..9bee7fa60f 100644 --- a/isis/src/mro/apps/hidtmgen/main.cpp +++ b/isis/src/mro/apps/hidtmgen/main.cpp @@ -476,11 +476,11 @@ void setProjectionInformation(Cube *inCube, Pvl &pdsLabel, setEquirectangularRadii(inCube, mappingObject); mappingObject["MAP_PROJECTION_TYPE"].setValue("\"EQUIRECTANGULAR\""); northAzimuth = 270; - pdsLabel.setFormatTemplate("$mro/templates/labels/hirisePdsDTMEqui.pft"); + pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHirisePdsDTMEqui.pft"); } else if (QString::compare(projectionType, "POLAR STEREOGRAPHIC", Qt::CaseInsensitive) == 0) { northAzimuth = polarStereoGraphicNorthAzimuth(mappingObject); - pdsLabel.setFormatTemplate("$mro/templates/labels/hirisePdsDTMPolar.pft"); + pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHirisePdsDTMPolar.pft"); } else { QString msg = "The projection type [" + diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft new file mode 100644 index 0000000000..f0f36af518 --- /dev/null +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft @@ -0,0 +1,102 @@ +PDS_VERSION_ID +/* File format & locations of Data Objects */ +/* This file contains an unstructured byte stream. */ +/* The UNDEFINED RECORD_TYPE is used to meet PDS standards requirements. */ +/* A label "record" is actually a single byte. */ +/* >>> Caution <<< The first byte is location 1 (not 0) */ +RECORD_TYPE +LABEL_RECORDS +^IMAGE +/* Identification Information */ +NOT_APPLICABLE_CONSTANT +DATA_SET_ID +DATA_SET_NAME +PRODUCER_INSTITUTION_NAME +PRODUCER_ID +PRODUCER_FULL_NAME +OBSERVATION_ID +PRODUCT_ID +PRODUCT_VERSION_ID +INSTRUMENT_HOST_NAME +INSTRUMENT_HOST_ID +INSTRUMENT_NAME +INSTRUMENT_ID +TARGET_NAME +MISSION_PHASE_NAME +ORBIT_NUMBER +SOURCE_PRODUCT_ID +RATIONALE_DESC +SOFTWARE_NAME + +/* All xxx_COUNT values are for the MRO spacecraft clock (SCLK) */ +/* in seconds:subseconds form. A subsecond tick = 15.2588 microseconds. */ +/* All xxx_TIME values are referenced to UTC. */ +GROUP = TIME_PARAMETERS +/* Time when the observation first started */ + MRO:OBSERVATION_START_TIME + MRO:OBSERVATION_START_COUNT + /* Time of the first image line */ + START_TIME + SPACECRAFT_CLOCK_START_COUNT + /* Time of the last image line */ + STOP_TIME + SPACECRAFT_CLOCK_STOP_COUNT + /* Time when this RDR product was created */ + PRODUCT_CREATION_TIME +END_GROUP = TIME_PARAMETERS + +GROUP = INSTRUMENT_SETTING_PARAMETERS + MRO:CCD_FLAG + MRO:BINNING + MRO:TDI +END_GROUP = INSTRUMENT_SETTING_PARAMETERS + +OBJECT = IMAGE + DESCRIPTION + LINES + LINE_SAMPLES + BANDS + SAMPLE_TYPE + SAMPLE_BITS + SAMPLE_BIT_MASK + /* NOTE: The conversion from DN to I/F (intensity/flux) is: */ + /* I/F = (DN * SCALING_FACTOR) + OFFSET */ + /* I/F is defined as the ratio of the observed radiance and */ + /* the radiance of a 100% lambertian reflector with the sun */ + /* and camera orthogonal to the observing surface. */ + SCALING_FACTOR + OFFSET + BAND_STORAGE_TYPE + VALID_MINIMUM + CORE_NULL + CORE_LOW_REPR_SATURATION + CORE_LOW_INSTR_SATURATION + CORE_HIGH_REPR_SATURATION + CORE_HIGH_INSTR_SATURATION + BAND_NAME + CENTER_FILTER_WAVELENGTH + BANDWIDTH + MRO:MINIMUM_STRETCH + MRO:MAXIMUM_STRETCH +END_OBJECT = IMAGE + +OBJECT = IMAGE_MAP_PROJECTION + ^DATA_SET_MAP_PROJECTION + MAP_PROJECTION_TYPE + PROJECTION_LATITUDE_TYPE + /* NOTE: The EQUIRECTANGULAR projection is based on the formula */ + /* for a sphere. To eliminate confusion in the */ + /* IMAGE_MAP_PROJECTION object we have set all three radii, */ + /* A_AXIS_RADIUS, B_AXIS_RADIUS, and C_AXIS_RADIUS to the same */ + /* number. The value recorded in the three radii is the local */ + /* radius at the CENTER_LATITUDE on the Mars ellipsoid. That is, */ + /* equatorial radius of 3396.190000 km and polar radius of */ + /* 3376.200000 kilometers. Using the local radius of the */ + /* ellipsoid implies that the MAP_SCALE and MAP_RESOLUTION are */ + /* true at the CENTER_LATITUDE. */ + A_AXIS_RADIUS + B_AXIS_RADIUS + C_AXIS_RADIUS + Isis:PvlTemplate:File = $base/templates/labels/pdsExportAllMapping.pft +END_OBJECT = IMAGE_MAP_PROJECTION +End diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft new file mode 100644 index 0000000000..3f58b25d3b --- /dev/null +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft @@ -0,0 +1,115 @@ +PDS_VERSION_ID +/* Identification Information */ +NOT_APPLICABLE_CONSTANT +DATA_SET_ID +DATA_SET_NAME +PRODUCER_INSTITUTION_NAME +PRODUCER_ID +PRODUCER_FULL_NAME +OBSERVATION_ID +PRODUCT_ID +PRODUCT_VERSION_ID +INSTRUMENT_HOST_NAME +INSTRUMENT_HOST_ID +INSTRUMENT_NAME +INSTRUMENT_ID +TARGET_NAME +MISSION_PHASE_NAME +ORBIT_NUMBER +SOURCE_PRODUCT_ID +RATIONALE_DESC +SOFTWARE_NAME + +/* All xxx_COUNT values are for the MRO spacecraft clock (SCLK) */ +/* in seconds:subseconds form. A subsecond tick = 15.2588 microseconds. */ +/* All xxx_TIME values are referenced to UTC. */ +GROUP = TIME_PARAMETERS +/* Time when the observation first started */ + MRO:OBSERVATION_START_TIME + MRO:OBSERVATION_START_COUNT + /* Time of the first image line */ + START_TIME + SPACECRAFT_CLOCK_START_COUNT + /* Time of the last image line */ + STOP_TIME + SPACECRAFT_CLOCK_STOP_COUNT + /* Time when this RDR product was created */ + PRODUCT_CREATION_TIME +END_GROUP = TIME_PARAMETERS + +GROUP = INSTRUMENT_SETTING_PARAMETERS + MRO:CCD_FLAG + MRO:BINNING + MRO:TDI +END_GROUP = INSTRUMENT_SETTING_PARAMETERS + +/* The JPEG2000 image data file associated with this label. */ +OBJECT = COMPRESSED_FILE + FILE_NAME + RECORD_TYPE + ENCODING_TYPE + ENCODING_TYPE_VERSION_NAME + INTERCHANGE_FORMAT + /* The name of the original source file. */ + UNCOMPRESSED_FILE_NAME + /* The amount of original image data. */ + REQUIRED_STORAGE_BYTES +END_OBJECT = COMPRESSED_FILE + +/* The source image data definition. */ +OBJECT = UNCOMPRESSED_FILE + FILE_NAME + RECORD_TYPE + RECORD_BYTES + FILE_RECORDS + ^IMAGE + OBJECT = IMAGE + DESCRIPTION + LINES + LINE_SAMPLES + BANDS + SAMPLE_TYPE + SAMPLE_BITS + SAMPLE_BIT_MASK + /* NOTE: The conversion from DN to I/F (intensity/flux) is: */ + /* I/F = (DN * SCALING_FACTOR) + OFFSET */ + /* I/F is defined as the ratio of the observed radiance and */ + /* the radiance of a 100% lambertian reflector with the sun */ + /* and camera orthogonal to the observing surface. */ + SCALING_FACTOR + OFFSET + BAND_STORAGE_TYPE + VALID_MINIMUM + CORE_NULL + CORE_LOW_REPR_SATURATION + CORE_LOW_INSTR_SATURATION + CORE_HIGH_REPR_SATURATION + CORE_HIGH_INSTR_SATURATION + BAND_NAME + CENTER_FILTER_WAVELENGTH + BANDWIDTH + MRO:MINIMUM_STRETCH + MRO:MAXIMUM_STRETCH + END_OBJECT = IMAGE +END_OBJECT = UNCOMPRESSED_FILE + +OBJECT = IMAGE_MAP_PROJECTION + ^DATA_SET_MAP_PROJECTION + MAP_PROJECTION_TYPE + PROJECTION_LATITUDE_TYPE + /* NOTE: The EQUIRECTANGULAR projection is based on the formula */ + /* for a sphere. To eliminate confusion in the */ + /* IMAGE_MAP_PROJECTION object we have set all three radii, */ + /* A_AXIS_RADIUS, B_AXIS_RADIUS, and C_AXIS_RADIUS to the same */ + /* number. The value recorded in the three radii is the local */ + /* radius at the CENTER_LATITUDE on the Mars ellipsoid. That is, */ + /* equatorial radius of 3396.190000 km and polar radius of */ + /* 3376.200000 kilometers. Using the local radius of the */ + /* ellipsoid implies that the MAP_SCALE and MAP_RESOLUTION are */ + /* true at the CENTER_LATITUDE. */ + A_AXIS_RADIUS + B_AXIS_RADIUS + C_AXIS_RADIUS + Isis:PvlTemplate:File = $base/templates/labels/pdsExportAllMapping.pft +END_OBJECT = IMAGE_MAP_PROJECTION +End diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft new file mode 100644 index 0000000000..95a15d3bc6 --- /dev/null +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft @@ -0,0 +1,86 @@ +PDS_VERSION_ID +/* File format & locations of Data Objects */ +/* This file contains an unstructured byte stream. */ +/* The UNDEFINED RECORD_TYPE is used to meet PDS standards requirements. */ +/* A label "record" is actually a single byte. */ +/* >>> Caution <<< The first byte is location 1 (not 0) */ +RECORD_TYPE +LABEL_RECORDS +^IMAGE +/* Identification Information */ +NOT_APPLICABLE_CONSTANT +DATA_SET_ID +DATA_SET_NAME +PRODUCER_INSTITUTION_NAME +PRODUCER_ID +PRODUCER_FULL_NAME +OBSERVATION_ID +PRODUCT_ID +PRODUCT_VERSION_ID +INSTRUMENT_HOST_NAME +INSTRUMENT_HOST_ID +INSTRUMENT_NAME +INSTRUMENT_ID +TARGET_NAME +MISSION_PHASE_NAME +ORBIT_NUMBER +SOURCE_PRODUCT_ID +RATIONALE_DESC +SOFTWARE_NAME + +/* All xxx_COUNT values are for the MRO spacecraft clock (SCLK) */ +/* in seconds:subseconds form. A subsecond tick = 15.2588 microseconds. */ +/* All xxx_TIME values are referenced to UTC. */ +GROUP = TIME_PARAMETERS +/* Time when the observation first started */ + MRO:OBSERVATION_START_TIME + MRO:OBSERVATION_START_COUNT + /* Time of the first image line */ + START_TIME + SPACECRAFT_CLOCK_START_COUNT + /* Time of the last image line */ + STOP_TIME + SPACECRAFT_CLOCK_STOP_COUNT + /* Time when this RDR product was created */ + PRODUCT_CREATION_TIME +END_GROUP = TIME_PARAMETERS + +GROUP = INSTRUMENT_SETTING_PARAMETERS + MRO:CCD_FLAG + MRO:BINNING + MRO:TDI +END_GROUP = INSTRUMENT_SETTING_PARAMETERS + +OBJECT = IMAGE + DESCRIPTION + LINES + LINE_SAMPLES + BANDS + SAMPLE_TYPE + SAMPLE_BITS + SAMPLE_BIT_MASK + /* NOTE: The conversion from DN to I/F (intensity/flux) is: */ + /* I/F = (DN * SCALING_FACTOR) + OFFSET */ + /* I/F is defined as the ratio of the observed radiance and */ + /* the radiance of a 100% lambertian reflector with the sun */ + /* and camera orthogonal to the observing surface. */ + SCALING_FACTOR + OFFSET + BAND_STORAGE_TYPE + VALID_MINIMUM + CORE_NULL + CORE_LOW_REPR_SATURATION + CORE_LOW_INSTR_SATURATION + CORE_HIGH_REPR_SATURATION + CORE_HIGH_INSTR_SATURATION + BAND_NAME + CENTER_FILTER_WAVELENGTH + BANDWIDTH + MRO:MINIMUM_STRETCH + MRO:MAXIMUM_STRETCH +END_OBJECT = IMAGE + +OBJECT = IMAGE_MAP_PROJECTION + Isis:PvlTemplate:File = $base/templates/labels/pdsExportAllMapping.pft +END_OBJECT = IMAGE_MAP_PROJECTION +End diff --git a/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft new file mode 100644 index 0000000000..6a58fae8fc --- /dev/null +++ b/isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft @@ -0,0 +1,99 @@ +PDS_VERSION_ID +/* Identification Information */ +NOT_APPLICABLE_CONSTANT +DATA_SET_ID +DATA_SET_NAME +PRODUCER_INSTITUTION_NAME +PRODUCER_ID +PRODUCER_FULL_NAME +OBSERVATION_ID +PRODUCT_ID +PRODUCT_VERSION_ID +INSTRUMENT_HOST_NAME +INSTRUMENT_HOST_ID +INSTRUMENT_NAME +INSTRUMENT_ID +TARGET_NAME +MISSION_PHASE_NAME +ORBIT_NUMBER +SOURCE_PRODUCT_ID +RATIONALE_DESC +SOFTWARE_NAME + +/* All xxx_COUNT values are for the MRO spacecraft clock (SCLK) */ +/* in seconds:subseconds form. A subsecond tick = 15.2588 microseconds. */ +/* All xxx_TIME values are referenced to UTC. */ +GROUP = TIME_PARAMETERS +/* Time when the observation first started */ + MRO:OBSERVATION_START_TIME + MRO:OBSERVATION_START_COUNT + /* Time of the first image line */ + START_TIME + SPACECRAFT_CLOCK_START_COUNT + /* Time of the last image line */ + STOP_TIME + SPACECRAFT_CLOCK_STOP_COUNT + /* Time when this RDR product was created */ + PRODUCT_CREATION_TIME +END_GROUP = TIME_PARAMETERS + +GROUP = INSTRUMENT_SETTING_PARAMETERS + MRO:CCD_FLAG + MRO:BINNING + MRO:TDI +END_GROUP = INSTRUMENT_SETTING_PARAMETERS + +/* The JPEG2000 image data file associated with this label. */ +OBJECT = COMPRESSED_FILE + FILE_NAME + RECORD_TYPE + ENCODING_TYPE + ENCODING_TYPE_VERSION_NAME + INTERCHANGE_FORMAT + /* The name of the original source file. */ + UNCOMPRESSED_FILE_NAME + /* The amount of original image data. */ + REQUIRED_STORAGE_BYTES +END_OBJECT = COMPRESSED_FILE + +/* The source image data definition. */ +OBJECT = UNCOMPRESSED_FILE + FILE_NAME + RECORD_TYPE + RECORD_BYTES + FILE_RECORDS + ^IMAGE + OBJECT = IMAGE + DESCRIPTION + LINES + LINE_SAMPLES + BANDS + SAMPLE_TYPE + SAMPLE_BITS + SAMPLE_BIT_MASK + /* NOTE: The conversion from DN to I/F (intensity/flux) is: */ + /* I/F = (DN * SCALING_FACTOR) + OFFSET */ + /* I/F is defined as the ratio of the observed radiance and */ + /* the radiance of a 100% lambertian reflector with the sun */ + /* and camera orthogonal to the observing surface. */ + SCALING_FACTOR + OFFSET + BAND_STORAGE_TYPE + VALID_MINIMUM + CORE_NULL + CORE_LOW_REPR_SATURATION + CORE_LOW_INSTR_SATURATION + CORE_HIGH_REPR_SATURATION + CORE_HIGH_INSTR_SATURATION + BAND_NAME + CENTER_FILTER_WAVELENGTH + BANDWIDTH + MRO:MINIMUM_STRETCH + MRO:MAXIMUM_STRETCH + END_OBJECT = IMAGE +END_OBJECT = UNCOMPRESSED_FILE + +OBJECT = IMAGE_MAP_PROJECTION + Isis:PvlTemplate:File = $base/templates/labels/pdsExportAllMapping.pft +END_OBJECT = IMAGE_MAP_PROJECTION +End diff --git a/isis/src/mro/apps/hirdrgen/main.cpp b/isis/src/mro/apps/hirdrgen/main.cpp index 924aa903c5..b09c45c377 100644 --- a/isis/src/mro/apps/hirdrgen/main.cpp +++ b/isis/src/mro/apps/hirdrgen/main.cpp @@ -474,24 +474,24 @@ void IsisMain() { // Add a keyword type (i.e., QString, bool, int...) file to the PDS label Pvl PvlFormat *formatter = pdsLabel.format(); - formatter->add("$ISISROOT/appdata/translations/hirisePdsRdrExtras.typ"); + formatter->add("$ISISROOT/appdata/translations/MroHirisePdsRdrExtras.typ"); // Add an output format template (group, object, & keyword output order) to // the PDS PVL if (projName == "EQUIRECTANGULAR") { if (enctype.Equal("jp2")) { - pdsLabel.setFormatTemplate("$mro/templates/labels/hirisePdsRdrEquiJP2.pft"); + pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHirisePdsRdrEquiJP2.pft"); } else { - pdsLabel.setFormatTemplate("$mro/templates/labels/hirisePdsRdrEqui.pft"); + pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHirisePdsRdrEqui.pft"); } } else { if (enctype.Equal("jp2")) { - pdsLabel.setFormatTemplate("$mro/templates/labels/hirisePdsRdrPolarJP2.pft"); + pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHirisePdsRdrPolarJP2.pft"); } else { - pdsLabel.setFormatTemplate("$mro/templates/labels/hirisePdsRdrPolar.pft"); + pdsLabel.setFormatTemplate("$ISISROOT/appdata/translations/MroHirisePdsRdrPolar.pft"); } }