From 1054fe0f255eb20253d5cd4134b8ce4d9322b0ef Mon Sep 17 00:00:00 2001 From: Kaitlyn Lee Date: Tue, 3 Mar 2020 10:21:48 -0700 Subject: [PATCH 1/7] Added translation files. --- .../apps/junocam2isis/junoJunoCamArchive.trn | 55 +++++++++ .../apps/junocam2isis/junoJunoCamBandBin.trn | 37 ++++++ .../junocam2isis/junoJunoCamInstrument.trn | 116 ++++++++++++++++++ .../junocam2isis/junoSerialNumber0001.trn | 54 ++++++++ 4 files changed, 262 insertions(+) create mode 100644 isis/src/juno/apps/junocam2isis/junoJunoCamArchive.trn create mode 100644 isis/src/juno/apps/junocam2isis/junoJunoCamBandBin.trn create mode 100644 isis/src/juno/apps/junocam2isis/junoJunoCamInstrument.trn create mode 100644 isis/src/juno/apps/junocam2isis/junoSerialNumber0001.trn diff --git a/isis/src/juno/apps/junocam2isis/junoJunoCamArchive.trn b/isis/src/juno/apps/junocam2isis/junoJunoCamArchive.trn new file mode 100644 index 0000000000..2f571c4de0 --- /dev/null +++ b/isis/src/juno/apps/junocam2isis/junoJunoCamArchive.trn @@ -0,0 +1,55 @@ +Group = MissionPhase + Auto + Optional + InputKey = MISSION_PHASE_NAME + InputGroup = ROOT + InputPosition = ROOT + OutputName = MissionPhase + OutputPosition = (Object, IsisCube, Group, Archive) + Translation = (*, *) +End_Group + +Group = OrbitNumber + Auto + Optional + InputKey = ORBIT_NUMBER + InputGroup = ROOT + InputPosition = ROOT + OutputName = OrbitNumber + OutputPosition = (Object, IsisCube, Group, Archive) + Translation = (*, *) +End_Group + +Group = FocalPlaneTemperature + Auto + Optional + InputKey = FOCAL_PLANE_TEMPERATURE + InputGroup = ROOT + InputPosition = ROOT + OutputName = FocalPlaneTemperature + OutputPosition = (Object, IsisCube, Group, Archive) + Translation = (*, *) +End_Group + +Group = TDICount + Auto + Optional + InputKey = JNO:TDI_STAGES_COUNT + InputGroup = ROOT + InputPosition = ROOT + OutputName = TDICount + OutputPosition = (Object, IsisCube, Group, Archive) + Translation = (*, *) +End_Group + +Group = CompressionType + Auto + Optional + InputKey = COMPRESSION_TYPE + InputGroup = ROOT + InputPosition = ROOT + OutputName = CompressionType + OutputPosition = (Object, IsisCube, Group, Archive) + Translation = (*, *) +End_Group +End \ No newline at end of file diff --git a/isis/src/juno/apps/junocam2isis/junoJunoCamBandBin.trn b/isis/src/juno/apps/junocam2isis/junoJunoCamBandBin.trn new file mode 100644 index 0000000000..ce77a57000 --- /dev/null +++ b/isis/src/juno/apps/junocam2isis/junoJunoCamBandBin.trn @@ -0,0 +1,37 @@ +Group = FilterName + Auto + Optional + InputGroup = ROOT + InputPosition = ROOT + InputKey = FILTER_NAME + OutputName = FilterName + OutputPosition = (Object, IsisCube, Group, BandBin) + Translation = (*, *) +End_Group + +Group = Center + Auto + Optional + InputGroup = ROOT + InputPosition = ROOT + InputKey = FILTER_NAME + OutputName = Center + OutputPosition = (Object, IsisCube, Group, BandBin) + Translation = (BLUE, 480.1) + Translation = (GREEN, 553.5) + Translation = (RED, 698.9) +End_Group + +Group = Width + Auto + Optional + InputGroup = ROOT + InputPosition = ROOT + InputKey = FILTER_NAME + OutputName = Width + OutputPosition = (Object, IsisCube, Group, BandBin) + Translation = (BLUE, 45.5) + Translation = (GREEN, 79.3) + Translation = (RED, 175.4) +End_Group +End \ No newline at end of file diff --git a/isis/src/juno/apps/junocam2isis/junoJunoCamInstrument.trn b/isis/src/juno/apps/junocam2isis/junoJunoCamInstrument.trn new file mode 100644 index 0000000000..cd98607c30 --- /dev/null +++ b/isis/src/juno/apps/junocam2isis/junoJunoCamInstrument.trn @@ -0,0 +1,116 @@ +Group = SpacecraftName + Auto + Optional + InputKey = SPACECRAFT_NAME + InputGroup = ROOT + InputPosition = ROOT + OutputName = SpacecraftName + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = InstrumentHostId + Auto + InputKey = INSTRUMENT_HOST_ID + InputDefault = UNKNOWN + OutputName = InstrumentHostId + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = SpacecraftId + Auto + Optional + InputKey = INSTRUMENT_HOST_ID + InputGroup = ROOT + InputPosition = ROOT + OutputName = SpacecraftId + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = InstrumentName + Auto + Optional + InputKey = INSTRUMENT_NAME + InputGroup = ROOT + InputPosition = ROOT + OutputName = InstrumentName + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = InstrumentId + Auto + Optional + InputKey = INSTRUMENT_ID + InputGroup = ROOT + InputPosition = ROOT + OutputName = InstrumentId + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = TargetName + Auto + Optional + InputKey = TARGET_NAME + InputGroup = ROOT + InputPosition = ROOT + OutputName = TargetName + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = StartTime + Auto + InputKey = START_TIME + OutputName = StartTime + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = SpacecraftClockStartCount + Auto + Optional + InputKey = SPACECRAFT_CLOCK_START_COUNT + InputGroup = ROOT + InputPosition = ROOT + OutputName = SpacecraftClockStartCount + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = ExposureDuration + Auto + Optional + InputKey = EXPOSURE_DURATION + InputGroup = ROOT + InputPosition = ROOT + OutputName = ExposureDuration + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = InterFrameDelay + Auto + Optional + InputKey = INTERFRAME_DELAY + InputGroup = ROOT + InputPosition = ROOT + OutputName = InterFrameDelay + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group + +Group = SummingMode + Auto + Optional + InputKey = SAMPLING_FACTOR + InputGroup = ROOT + InputPosition = ROOT + OutputName = SummingMode + OutputPosition = (Object, IsisCube, Group, Instrument) + Translation = (*, *) +End_Group +End \ No newline at end of file diff --git a/isis/src/juno/apps/junocam2isis/junoSerialNumber0001.trn b/isis/src/juno/apps/junocam2isis/junoSerialNumber0001.trn new file mode 100644 index 0000000000..4e61894e79 --- /dev/null +++ b/isis/src/juno/apps/junocam2isis/junoSerialNumber0001.trn @@ -0,0 +1,54 @@ +ObservationKeys = 4 +Group = Keyword1 + Auto + InputKey = SpacecraftName + InputGroup = "IsisCube,Instrument" + InputPosition = (IsisCube, Instrument) + OutputName = Keyword1 + OutputPosition = (Group, SerialNumberKeywords) + Translation = (*, *) +End_Group + +Group = Keyword2 + Auto + InputKey = InstrumentId + InputGroup = "IsisCube,Instrument" + InputPosition = (IsisCube, Instrument) + OutputName = Keyword2 + OutputPosition = (Group, SerialNumberKeywords) + Translation = (*, *) +End_Group + +Group = Keyword3 + Auto + InputKey = StartTime + InputGroup = "IsisCube,Instrument" + InputPosition = (IsisCube, Instrument) + OutputName = Keyword3 + OutputPosition = (Group, SerialNumberKeywords) + Translation = (*, *) +End_Group + +Group = Keyword4 + Auto + InputKey = FrameletNumber + InputGroup = "IsisCube,Instrument" + InputPosition = (IsisCube, Instrument) + OutputName = Keyword4 + OutputPosition = (Group, SerialNumberKeywords) + Translation = (*, *) +End_Group + +Group = Keyword5 + Auto + InputKey = FilterName + InputGroup = "IsisCube,BandBin" + InputPosition = (IsisCube, BandBin) + OutputName = Keyword5 + OutputPosition = (Group, SerialNumberKeywords) + Translation = (*, *) +End_Group + + +End + From c3a0592879e2348e3f068ae67d762f48183af23f Mon Sep 17 00:00:00 2001 From: Kaitlyn Lee Date: Tue, 3 Mar 2020 10:22:23 -0700 Subject: [PATCH 2/7] Renamed junoSerialNumber0001.trn --- .../{junoSerialNumber0001.trn => junoSerialNumber.trn} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename isis/src/juno/apps/junocam2isis/{junoSerialNumber0001.trn => junoSerialNumber.trn} (100%) diff --git a/isis/src/juno/apps/junocam2isis/junoSerialNumber0001.trn b/isis/src/juno/apps/junocam2isis/junoSerialNumber.trn similarity index 100% rename from isis/src/juno/apps/junocam2isis/junoSerialNumber0001.trn rename to isis/src/juno/apps/junocam2isis/junoSerialNumber.trn From c3ec8ac294670eca648679d4abf2e537857ab0f0 Mon Sep 17 00:00:00 2001 From: Kaitlyn Lee Date: Tue, 3 Mar 2020 10:49:25 -0700 Subject: [PATCH 3/7] Updated Preference file to use ISISDATA env variable for juno. --- isis/IsisPreferences | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isis/IsisPreferences b/isis/IsisPreferences index c98e6a5901..b266b36107 100644 --- a/isis/IsisPreferences +++ b/isis/IsisPreferences @@ -189,7 +189,7 @@ Group = DataDirectory Galileo = $ISIS3DATA/galileo Hayabusa = $ISIS3DATA/hayabusa Hayabusa2 = $ISIS3DATA/hayabusa2 - Juno = $ISIS3DATA/juno + Juno = $ISISDATA/juno Kaguya = $ISIS3DATA/kaguya Lo = $ISIS3DATA/lo Lro = $ISIS3DATA/lro From a579d8cfb89e972a1799f3fe310472f2ad2eb107 Mon Sep 17 00:00:00 2001 From: Kaitlyn Lee Date: Tue, 3 Mar 2020 12:19:35 -0700 Subject: [PATCH 4/7] Moved SN xfile to appdata and updated app to point to appdata/translations. --- .../serialnumbers/junoJunoCameSerialNumber.trn} | 0 isis/src/juno/apps/junocam2isis/main.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename isis/{src/juno/apps/junocam2isis/junoSerialNumber.trn => appdata/serialnumbers/junoJunoCameSerialNumber.trn} (100%) diff --git a/isis/src/juno/apps/junocam2isis/junoSerialNumber.trn b/isis/appdata/serialnumbers/junoJunoCameSerialNumber.trn similarity index 100% rename from isis/src/juno/apps/junocam2isis/junoSerialNumber.trn rename to isis/appdata/serialnumbers/junoJunoCameSerialNumber.trn diff --git a/isis/src/juno/apps/junocam2isis/main.cpp b/isis/src/juno/apps/junocam2isis/main.cpp index bac45bad14..f8e5f7f0b8 100644 --- a/isis/src/juno/apps/junocam2isis/main.cpp +++ b/isis/src/juno/apps/junocam2isis/main.cpp @@ -291,11 +291,11 @@ void IsisMain() { */ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) { // Get the directory where the Juno translation tables are - PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory"); - QString missionDir = (QString) dataDir["Juno"]; + // PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory"); + QString transDir = "$ISISROOT/appdata/translations/"; // Translate the Instrument group - FileName instTransFile(missionDir + "/translations/junoJunoCamInstrument.trn"); + FileName instTransFile(transDir + "junoJunoCamInstrument.trn"); PvlToPvlTranslationManager instrumentXlater(inputLabel, instTransFile.expanded()); instrumentXlater.Auto(outputLabel); PvlGroup &inst = outputLabel.findGroup("Instrument", PvlObject::Traverse); @@ -317,7 +317,7 @@ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) { } // Translate the BandBin group - FileName bandBinTransFile(missionDir + "/translations/junoJunoCamBandBin.trn"); + FileName bandBinTransFile(transDir + "junoJunoCamBandBin.trn"); PvlToPvlTranslationManager bandBinXlater(inputLabel, bandBinTransFile.expanded()); bandBinXlater.Auto(outputLabel); PvlGroup &bandBin = outputLabel.findGroup("BandBin", PvlObject::Traverse); @@ -341,7 +341,7 @@ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) { } // Translate the Archive group - FileName archiveTransFile(missionDir + "/translations/junoJunoCamArchive.trn"); + FileName archiveTransFile(transDir + "junoJunoCamArchive.trn"); PvlToPvlTranslationManager archiveXlater(inputLabel, archiveTransFile.expanded()); archiveXlater.Auto(outputLabel); PvlGroup &archive = outputLabel.findGroup("Archive", PvlObject::Traverse); From 69874270e8c47bb3668b84bdd7cfc042d0207d2f Mon Sep 17 00:00:00 2001 From: Kaitlyn Lee Date: Thu, 5 Mar 2020 13:50:21 -0700 Subject: [PATCH 5/7] Removed commented line. --- isis/src/juno/apps/junocam2isis/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/isis/src/juno/apps/junocam2isis/main.cpp b/isis/src/juno/apps/junocam2isis/main.cpp index f8e5f7f0b8..d325d89d4c 100644 --- a/isis/src/juno/apps/junocam2isis/main.cpp +++ b/isis/src/juno/apps/junocam2isis/main.cpp @@ -291,7 +291,6 @@ void IsisMain() { */ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) { // Get the directory where the Juno translation tables are - // PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory"); QString transDir = "$ISISROOT/appdata/translations/"; // Translate the Instrument group From 8501c87b3a4e4378e719396ed07fc08b8a957990 Mon Sep 17 00:00:00 2001 From: Kaitlyn Lee Date: Thu, 5 Mar 2020 14:45:20 -0700 Subject: [PATCH 6/7] Renamed files to be upper camel case. --- .../{junoJunoCamArchive.trn => JunoJunoCamArchive.trn} | 0 .../{junoJunoCamBandBin.trn => JunoJunoCamBandBin.trn} | 0 ...{junoJunoCamInstrument.trn => JunoJunoCamInstrument.trn} | 0 isis/src/juno/apps/junocam2isis/main.cpp | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename isis/src/juno/apps/junocam2isis/{junoJunoCamArchive.trn => JunoJunoCamArchive.trn} (100%) rename isis/src/juno/apps/junocam2isis/{junoJunoCamBandBin.trn => JunoJunoCamBandBin.trn} (100%) rename isis/src/juno/apps/junocam2isis/{junoJunoCamInstrument.trn => JunoJunoCamInstrument.trn} (100%) diff --git a/isis/src/juno/apps/junocam2isis/junoJunoCamArchive.trn b/isis/src/juno/apps/junocam2isis/JunoJunoCamArchive.trn similarity index 100% rename from isis/src/juno/apps/junocam2isis/junoJunoCamArchive.trn rename to isis/src/juno/apps/junocam2isis/JunoJunoCamArchive.trn diff --git a/isis/src/juno/apps/junocam2isis/junoJunoCamBandBin.trn b/isis/src/juno/apps/junocam2isis/JunoJunoCamBandBin.trn similarity index 100% rename from isis/src/juno/apps/junocam2isis/junoJunoCamBandBin.trn rename to isis/src/juno/apps/junocam2isis/JunoJunoCamBandBin.trn diff --git a/isis/src/juno/apps/junocam2isis/junoJunoCamInstrument.trn b/isis/src/juno/apps/junocam2isis/JunoJunoCamInstrument.trn similarity index 100% rename from isis/src/juno/apps/junocam2isis/junoJunoCamInstrument.trn rename to isis/src/juno/apps/junocam2isis/JunoJunoCamInstrument.trn diff --git a/isis/src/juno/apps/junocam2isis/main.cpp b/isis/src/juno/apps/junocam2isis/main.cpp index d325d89d4c..00b7eebe58 100644 --- a/isis/src/juno/apps/junocam2isis/main.cpp +++ b/isis/src/juno/apps/junocam2isis/main.cpp @@ -294,7 +294,7 @@ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) { QString transDir = "$ISISROOT/appdata/translations/"; // Translate the Instrument group - FileName instTransFile(transDir + "junoJunoCamInstrument.trn"); + FileName instTransFile(transDir + "JunoJunoCamInstrument.trn"); PvlToPvlTranslationManager instrumentXlater(inputLabel, instTransFile.expanded()); instrumentXlater.Auto(outputLabel); PvlGroup &inst = outputLabel.findGroup("Instrument", PvlObject::Traverse); @@ -316,7 +316,7 @@ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) { } // Translate the BandBin group - FileName bandBinTransFile(transDir + "junoJunoCamBandBin.trn"); + FileName bandBinTransFile(transDir + "JunoJunoCamBandBin.trn"); PvlToPvlTranslationManager bandBinXlater(inputLabel, bandBinTransFile.expanded()); bandBinXlater.Auto(outputLabel); PvlGroup &bandBin = outputLabel.findGroup("BandBin", PvlObject::Traverse); @@ -340,7 +340,7 @@ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) { } // Translate the Archive group - FileName archiveTransFile(transDir + "junoJunoCamArchive.trn"); + FileName archiveTransFile(transDir + "JunoJunoCamArchive.trn"); PvlToPvlTranslationManager archiveXlater(inputLabel, archiveTransFile.expanded()); archiveXlater.Auto(outputLabel); PvlGroup &archive = outputLabel.findGroup("Archive", PvlObject::Traverse); From 25c77a7cd54b3cad9205515902c13662a5b30ef9 Mon Sep 17 00:00:00 2001 From: Kaitlyn Lee Date: Thu, 5 Mar 2020 14:47:20 -0700 Subject: [PATCH 7/7] Fixed typo. --- .../{junoJunoCameSerialNumber.trn => JunoJunoCamSerialNumber.trn} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename isis/appdata/serialnumbers/{junoJunoCameSerialNumber.trn => JunoJunoCamSerialNumber.trn} (100%) diff --git a/isis/appdata/serialnumbers/junoJunoCameSerialNumber.trn b/isis/appdata/serialnumbers/JunoJunoCamSerialNumber.trn similarity index 100% rename from isis/appdata/serialnumbers/junoJunoCameSerialNumber.trn rename to isis/appdata/serialnumbers/JunoJunoCamSerialNumber.trn