Skip to content

Commit

Permalink
moved hayabusa2 data into source (#3752)
Browse files Browse the repository at this point in the history
* 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)

* moves hayabusa2 translation and serial number files into source

* renamed translation files to match naming conventions

* updates references to 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 8c742c5 commit e34a698
Show file tree
Hide file tree
Showing 6 changed files with 710 additions and 12 deletions.
29 changes: 29 additions & 0 deletions isis/appdata/serialnumbers/Hayabusa2OncSerialNumber.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Group = Keyword1
Auto
InputKey = SpacecraftName
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword1
OutputPosition = ("Group","SerialNumberKeywords")
Translation = ("Hayabusa2", "HAYABUSA-2")
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
105 changes: 105 additions & 0 deletions isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncArchive.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#
# This translation file is used to produce the ISIS 3 Archive label group
# for the Hayabusa 2 ONC-W1, ONC-W2, and ONC-T cameras.
#

Group = ProducerId
Auto
Optional
InputKey = ORIGIN
InputPosition = FitsExtras
OutputName = ProducerId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = L0FileName
Auto
InputKey = P_L0NAME
InputPosition = FitsLabels
OutputName = L0FileName
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = FormatType
Auto
Optional
InputKey = FMTTYPE
InputPosition = FitsExtras
OutputName = FormatType
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = FormatTypeVersion
Auto
Optional
InputKey = FTYPEVER
InputPosition = FitsExtras
OutputName = FormatTypeVersion
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = ContentType
Auto
Optional
InputKey = CNTTYPE
InputPosition = FitsExtras
OutputName = ContentType
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = ContentVersion
Auto
Optional
InputKey = CNTVER
InputPosition = FitsExtras
OutputName = ContentVersion
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = ImageType
Auto
Optional
InputKey = P_IMGTYP
InputPosition = FitsExtras
OutputName = ImageType
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = SourceProductId
Auto
InputKey = FILENAME
InputPosition = FitsExtras
OutputName = SourceProductId
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
End_Group

Group = SubImageCount
Auto
InputKey = NSUBIMG
InputPosition = FitsLabels
OutputName = SubImageCount
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

# the following image ID is assigned by the onboard image processor.
# AMICA calls this one "ImageNumber"
Group = ImageNumber
Auto
InputKey = P_IMGID
InputPosition = FitsExtras
OutputName = ImageNumber
OutputPosition = (Object, IsisCube, Group, Instrument)
Translation = (*, *)
End_Group

End

75 changes: 75 additions & 0 deletions isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncBandBin.trn
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#
# This translation file is used to produce the ISIS 3 BandBin label group
# for the Hayabusa 2 ONC-T camera.
# Translation = (left,right) convert the input "right" to "left"
#

Group = FilterNumber
Auto
Optional
InputKey = FILTER
InputPosition = FitsLabels
OutputName = FilterNumber
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (1, "NO.1: 390nm")
Translation = (2, "NO.2: WIDE")
Translation = (3, "NO.3: 550nm")
Translation = (4, "NO.4: 700nm")
Translation = (5, "NO.5: 860nm")
Translation = (6, "NO.6: 589nm")
Translation = (7, "NO.7: 950nm")
Translation = (8, "NO.8: 480nm")
End_Group

Group = FilterName
Auto
InputKey = FILTER
InputPosition = FitsLabels
OutputName = FilterName
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (ul, "NO.1: 390nm")
Translation = (Wide, "NO.2: WIDE")
Translation = (v, "NO.3: 550nm")
Translation = (w, "NO.4: 700nm")
Translation = (x, "NO.5: 860nm")
Translation = (Na, "NO.6: 589nm")
Translation = (p, "NO.7: 950nm")
Translation = (b, "NO.8: 480nm")
Translation = (None, "NONE")
End_Group

Group = Center
Auto
Optional
InputKey = FILTER
InputPosition = FitsLabels
OutputName = Center
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (390, "NO.1: 390nm")
Translation = (775, "NO.2: WIDE")
Translation = (550, "NO.3: 550nm")
Translation = (700, "NO.4: 700nm")
Translation = (860, "NO.5: 860nm")
Translation = (589.5, "NO.6: 589nm")
Translation = (950, "NO.7: 950nm")
Translation = (480, "NO.8: 480nm")
End_Group

Group = Width
Auto
Optional
InputKey = FILTER
InputPosition = FitsLabels
OutputName = Width
OutputPosition = (Object, IsisCube, Group, BandBin)
Translation = (40, "NO.1: 390nm")
Translation = (850, "NO.2: WIDE")
Translation = (30, "NO.3: 550nm")
Translation = (30, "NO.4: 700nm")
Translation = (40, "NO.5: 860nm")
Translation = (10, "NO.6: 589nm")
Translation = (60, "NO.7: 950nm")
Translation = (30, "NO.8: 480nm")
End_Group

End
Loading

0 comments on commit e34a698

Please sign in to comment.