Skip to content

Commit

Permalink
Moved Messenger data into source (#3745)
Browse files Browse the repository at this point in the history
* Abstracted campt app.

* Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3 into dev"

This reverts commit 521dd44, reversing
changes made to 2874acf.

* 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)

* moved mdessenger translation files into source

* moved mdisArchive translation files to MessengerMdisArchive.trn

* moved mdisBandBin translation files to MessengerMdisBandBin.trn

* moved mdisInstrument translation files to MessengerMdisInstrument.trn

* moved mdisCDRLabel translation files to MessengerMdisCdrLabel.trn

* moved mdisDDRLabel translation files to MessengerMdisDdrLabel.trn

* added translations directory with mdisCalibration translation files

* moved mdisCalibration files to MessengerMdisCalibration.trn

* updated mdis apps references to translation files.

* renamed mdisSerialNumber files to MessengerMdisSerialNumber.trn

* copied over mdis template files to source

* renamed mdis template files

* update references to template files in source code

* changed naming and references of template files

Co-authored-by: Kaitlyn Lee <[email protected]>
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
7 people authored Mar 10, 2020
1 parent 080e199 commit 24797a8
Show file tree
Hide file tree
Showing 13 changed files with 4,206 additions and 87 deletions.
31 changes: 31 additions & 0 deletions isis/appdata/serialnumbers/MessengerMdisSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Group = Keyword1
Auto
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword1
OutputPosition = (Group, SerialNumberKeywords)
Translation = (MeSSEnGeR, Messenger)
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 = SpacecraftClockCount
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword3
OutputPosition = (Group, SerialNumberKeywords)
Translation = (*, *)
End_Group
End
202 changes: 202 additions & 0 deletions isis/src/messenger/apps/mdis2isis/MessengerMdisArchive.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
#
# The group names listed here are the native names used by
# applications to get the foreign names and values
#
# There is only one level of groups the groups are not
# allowed to be nested
#
# The Group names can NOT be repeated.
#
# InputGroup is a comma delimited list of objects and/or
# groups in the foreign label. Traversing this list will
# lead to the correct level to find the foreign keyword.
#
# InputKey is the keyword within the group which holds
# the information.
#
# InputDefault is the value used if there is no value for
# the keyword
#
# Translation is the native and corresponding foreign values.
# Translation may be repeated as needed.
#
Group = DataSetId
Auto
InputKey = DATA_SET_ID
OutputName = DataSetId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = DataQualityDesc
Auto
Optional
InputKey = DATA_QUALITY_DESC
OutputName = DataQualityDesc
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (Null, NULL)
Translation = (*, *)
End_Group

Group = DataQualityId
Auto
Optional
InputKey = DATA_QUALITY_ID
OutputName = DataQualityId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (Null, NULL)
Translation = (*, *)
End_Group

Group = ProducerId
Auto
InputKey = PRODUCER_INSTITUTION_NAME
OutputName = ProducerId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = OriginalProductId
Auto
Optional
InputKey = ORIGINAL_PRODUCT_ID
OutputName = OriginalProductId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = EdrSourceProductId
Auto
Optional
InputKey = SOURCE_PRODUCT_ID
OutputName = EdrSourceProductId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = ProductId
Auto
InputKey = PRODUCT_ID
OutputName = ProductId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = SequenceName
Auto
InputKey = SEQUENCE_NAME
InputDefault = UNKNOWN
OutputName = SequenceName
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = ObservationId
Auto
InputKey = OBSERVATION_ID
InputDefault = UNKNOWN
OutputName = ObservationId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = ObservationType
Auto
InputKey = OBSERVATION_TYPE
InputDefault = UNKNOWN
OutputName = ObservationType
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = SiteId
Auto
InputKey = SITE_ID
InputDefault = UNKNOWN
OutputName = SiteId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = MissionElapsedTime
Auto
InputKey = MESS:MET_EXP
InputDefault = NULL
OutputName = MissionElapsedTime
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = EdrProductCreationTime
Auto
InputKey = PRODUCT_CREATION_TIME
OutputName = EdrProductCreationTime
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = ObservationStartTime
Auto
InputKey = START_TIME
OutputName = ObservationStartTime
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = SpacecraftClockStartCount
Auto
InputKey = SPACECRAFT_CLOCK_START_COUNT
InputDefault = -9999
OutputName = SpacecraftClockStartCount
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = SpacecraftClockStopCount
Auto
InputKey = SPACECRAFT_CLOCK_STOP_COUNT
InputDefault = -9999
OutputName = SpacecraftClockStopCount
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = Exposure
Auto
InputKey = MESS:EXPOSURE
InputDefault = -9999
OutputName = Exposure
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = CCDTemperature
Auto
InputKey = MESS:CCD_TEMP
InputDefault = -9999
OutputName = CCDTemperature
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = FilterNumber
Auto
InputKey = FILTER_NUMBER
InputDefault = 0
OutputName = OriginalFilterNumber
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (0, N/A)
Translation = (*, *)
End_Group

Group = OrbitNumber
Auto
Optional
InputKey = ORBIT_NUMBER
InputDefault = 0
OutputName = OrbitNumber
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (0, N/A)
Translation = (*, *)
End_Group
End
59 changes: 59 additions & 0 deletions isis/src/messenger/apps/mdis2isis/MessengerMdisBandBin.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#
# The group names listed here are the native names used by
# applications to get the foreign names and values
#
# There is only one level of groups the groups are not
# allowed to be nested
#
# The Group names can NOT be repeated.
#
# InputGroup is a comma delimited list of objects and/or
# groups in the foreign label. Traversing this list will
# lead to the correct level to find the foreign keyword.
#
# InputKey is the keyword within the group which holds
# the information.
#
# InputDefault is the value used if there is no value for
# the keyword
#
# Translation is the native and corresponding foreign values.
# Translation may be repeated as needed.
#
Group = FilterName
Auto
InputKey = FILTER_NAME
OutputName = Name
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (Monochrome, N/A)
Translation = (*, *)
End_Group

Group = FilterNumber
Auto
InputKey = FILTER_NUMBER
InputDefault = 0
OutputName = Number
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (0, N/A)
Translation = (*, *)
End_Group

Group = FilterCenter
Auto
InputKey = CENTER_FILTER_WAVELENGTH
OutputName = Center
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (750, N/A)
Translation = (*, *)
End_Group

Group = FilterWidth
Auto
InputKey = BANDWIDTH
OutputName = Width
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (50, N/A)
Translation = (*, *)
End_Group
End
Loading

0 comments on commit 24797a8

Please sign in to comment.