Skip to content

Commit

Permalink
Moved Near Data into Source (#3755)
Browse files Browse the repository at this point in the history
* Set MALLOC_CHECK_ in Jenkinsfile as a temporary fix for the failing tests

* Used CK quality for PCK selection in spiceinit (#3716)

* Changed PCK to use CK quality in spiceinit

* Added spiceinit history for change

* Adds the ability to save and restore a greyscale stretch to/from a Cube (#3717)

* Update meta.yaml to rename conda package to isis from isis3

* Initial stretch attempt

* Now will write a single stretch with a name and type to the cube

* Stretch updated to inherit from Blob, re-loading a saved stretch works but only if Linear right now

* Clean up Stretch class

* Completely move stretchTypes into stretch class, and some minor cleanup

* Fixed combo-box not updating bug and more cleanup

* Further cleanup of propagated earlier changes with types and names being removed from unnecessary classes

* Removed added unneeded member variables from StretchType

* Cleanup StretchTool class

* Update enter-text dialogs to drop down selection options

* Wrapped some long strings

* Initial commit to address most of review comments

* Removed buttons in case of RGB stretch and add a 'Color' PvlKeyword to Stretch output

Co-authored-by: Stuart Sides <[email protected]>

* Updated kaguyatc2isis to allow ingestion of data provided by JAXA online archive (#3713)

* Updated to allow ingestion of data provided by JAXA online archive

* Listed SLN-L-TC-5-MORNING-MAP-V4.0 as a supported format.

* Added tests + testing data

* Replaced several label parsing tests with cube attribute tests.

* Fixes ddd2isis to support updated uvflat files (#3719)

* Fixes ddd2isis to support updated uvflat files

* Added history comment

* Changed version numbers for 4.1 RC (#3722)

* Added near translation files.

Co-authored-by: Jesse Mapel <[email protected]>
Co-authored-by: Kristin <[email protected]>
Co-authored-by: Stuart Sides <[email protected]>
Co-authored-by: AustinSanders <[email protected]>
Co-authored-by: acpaquette <[email protected]>
  • Loading branch information
6 people authored Mar 12, 2020
1 parent b77e8dd commit 31f4fda
Show file tree
Hide file tree
Showing 3 changed files with 142 additions and 1 deletion.
28 changes: 28 additions & 0 deletions isis/appdata/serialnumbers/NearMsiSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Group = Keyword1
Auto
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword1
OutputPosition = ("Group","SerialNumberKeywords")
Translation = ("Near", "NEAR EARTH ASTEROID RENDEZVOUS")
Translation = (*,*)
EndGroup
Group = Keyword2
Auto
InputKey = InstrumentId
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword2
OutputPosition = ("Group","SerialNumberKeywords")
Translation = (*,*)
EndGroup
Group = Keyword3
Auto
InputKey = SpacecraftClockStartCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword3
OutputPosition = ("Group","SerialNumberKeywords")
Translation = (*,*)
EndGroup
113 changes: 113 additions & 0 deletions isis/src/near/apps/msi2isis/NearMsiImportPdsLabel.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
############################# To Instrument Group #############################
Group = SpacecraftName
Auto
InputKey = INSTRUMENT_HOST_NAME
InputPostion = ROOT
OutputName = SpacecraftName
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = ("NEAR EARTH ASTEROID RENDEZVOUS", *)
End_Group

Group = InstrumentId
Auto
InputKey = INSTRUMENT_ID
InputPostion = ROOT
OutputName = InstrumentId
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (MSI, *)
End_Group

Group = TargetName
Auto
InputKey = TARGET_NAME
InputPostion = ROOT
OutputName = TargetName
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

Group = StartTime
Auto
InputKey = START_TIME
InputPosition = ROOT
OutputName = StartTime
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

Group = StopTime
Auto
InputKey = STOP_TIME
InputPosition = ROOT
OutputName = StopTime
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

Group = SpacecraftClockStartCount
Auto
InputKey = SPACECRAFT_CLOCK_START_COUNT
InputPosition = ROOT
OutputName = SpacecraftClockStartCount
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

Group = SpacecraftClockStopCount
Auto
InputKey = SPACECRAFT_CLOCK_STOP_COUNT
InputPosition = ROOT
OutputName = SpacecraftClockStopCount
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

Group = ExposureDuration
Auto
InputKey = EXPOSURE_DURATION
InputPosition = ROOT
OutputName = ExposureDuration
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

############################## To BandBin Group ##############################
Group = FilterNumber
Auto
InputKey = FILTER_NUMBER
InputPosition = ROOT
OutputName = FilterNumber
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (*, *)
End_Group

# Get the center wavelength from the filter number.
# The filter number is also the value for "m" in the PRODUCT_ID pattern,
# MnnnnnnnnnnXm_pY.FIT
#
# filter wavelength
# broadband filter: 0 700 nm
# spectral filters: 1 550 nm
# 2 450 nm
# 3 760 nm
# 4 950 nm
# 5 900 nm
# 6 1000 nm
# 7 1050 nm
Group = Center
Auto
InputKey = FILTER_NUMBER
InputPosition = ROOT
OutputName = Center
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (700, 0)
Translation = (550, 1)
Translation = (450, 2)
Translation = (760, 3)
Translation = (950, 4)
Translation = (900, 5)
Translation = (1000, 6)
Translation = (1050, 7)
End_Group
End

2 changes: 1 addition & 1 deletion isis/src/near/apps/msi2isis/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void translateMsiLabels(Pvl inputLabelPvl, Pvl *isisLabelPvl) {
kernelsGrp += PvlKeyword("NaifFrameCode", "-93001");

PvlToPvlTranslationManager labelXlater(inputLabelPvl,
"$near/translations/nearImportPdsLabel.trn");
"$ISISROOT/appdata/translations/NearMsiImportPdsLabel.trn");
labelXlater.Auto(*isisLabelPvl);

// Add units to center wave length
Expand Down

0 comments on commit 31f4fda

Please sign in to comment.