Unverified Commit 4a13290e authored by Stuart Sides's avatar Stuart Sides Committed by GitHub
Browse files

Add support for Mars Express HRSC SRC instrument (#3826) 



* Add support for MacOS 10.14, needed for make base tests

* Add support for MEX SRC instrument

* Fixs found by PR review

* Fixed PR issues

* Tweaking translation

* Added exposure duration

* Adding in the SRC model

* Now with lat/lon, and test updates

* Adding Mex SRC Camera unitest

* Fix spelling in application docs.

Co-authored-by: default avatarKristin <kberry@usgs.gov>
parent 3ad04cd8

isis/appdata/serialnumbers/MexSrcSerialNumber.trn

0 → 100644
+42 −0
Original line number Diff line number Diff line 
Group = Keyword1

  Auto

  InputKey       = SpacecraftName

  InputGroup     = "IsisCube,Instrument"

  InputPosition  = (IsisCube, Instrument)

  OutputName     = Keyword1

  OutputPosition = (Group, SerialNumberKeywords)

  Translation    = (MEX, "MARS EXPRESS")

  Translation    = (MEX, MARS_EXPRESS)

  Translation    = (*, *)

End_Group



Group = Keyword2

  Auto

  InputKey       = SpacecraftClockStartCount

  InputGroup     = "IsisCube,Instrument"

  InputPosition  = (IsisCube, Instrument)

  OutputName     = Keyword2

  OutputPosition = (Group, SerialNumberKeywords)

  Translation    = (*, *)

End_Group



Group = Keyword3

  Auto

  InputKey       = InstrumentId

  InputGroup     = "IsisCube,Instrument"

  InputPosition  = (IsisCube, Instrument)

  OutputName     = Keyword3

  OutputPosition = (Group, SerialNumberKeywords)

  Translation    = (*, *)

End_Group



Group = Keyword4

  Auto

  InputKey       = DetectorId

  InputGroup     = "IsisCube,Archive"

  InputPosition  = (IsisCube, Archive)

  OutputName     = Keyword4

  OutputPosition = (Group, SerialNumberKeywords)

  Translation    = (*, *)

End_Group

End

isis/appdata/translations/Instruments.trn

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ Group = InstrumentName 


  # MEX

  Translation   = (Hrsc, HRSC)

  Translation   = (Src, SRC)



  # Messenger

  Translation   = (Mdis, MDIS-NAC)

isis/src/mex/apps/hrsc2isis/MexHrscArchive.trn

+3 −22
Original line number Diff line number Diff line 
#

# 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.

#

# Translations for HRSC Stereo and SRC instrument.

# ISIS cube label Archive group



Group = DataSetId

  Auto

  InputKey       = DATA_SET_ID

isis/src/mex/apps/hrsc2isis/MexHrscBandBin.trn

+3 −24
Original line number Diff line number Diff line 
#

# 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.

#

# Translations for HRSC Stereo and SRC instrument.

# ISIS cube label BandBin group



Group = FilterWidth

  Auto

  InputKey       = BANDWIDTH

  OutputName     = Width

  OutputPosition = (Group, BandBin)

  Translation    = (*, *)

  Translation    = ("--- Illegal Value ---", *)

End_Group



Group = FilterCenter
@@ -35,6 +15,5 @@ Group = FilterCenter 
  OutputName     = Center

  OutputPosition = (Group, BandBin)

  Translation    = (*, *)

  Translation    = ("--- Illegal Value ---", *)

End_Group

End

isis/src/mex/apps/hrsc2isis/MexHrscInstrument.trn

+33 −24
Original line number Diff line number Diff line 
#

# 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.

#

# Translations for HRSC Stereo and SRC instrument.

# ISIS cube label Instrument group



Group = SpacecraftName

  Auto

  InputKey       = INSTRUMENT_HOST_NAME
@@ -31,10 +12,20 @@ End_Group 


Group = InstrumentId

  Auto

  InputKey       = INSTRUMENT_ID

  InputKey       = DETECTOR_ID

  OutputName     = InstrumentId

  OutputPosition = (Group, Instrument)

  Translation    = (*, *)

  Translation    = (HRSC, "MEX_HRSC_HEAD")

  Translation    = (HRSC, "MEX_HRSC_S2")

  Translation    = (HRSC, "MEX_HRSC_RED")

  Translation    = (HRSC, "MEX_HRSC_P2")

  Translation    = (HRSC, "MEX_HRSC_BLUE")

  Translation    = (HRSC, "MEX_HRSC_NADIR")

  Translation    = (HRSC, "MEX_HRSC_GREEN")

  Translation    = (HRSC, "MEX_HRSC_P1")

  Translation    = (HRSC, "MEX_HRSC_IR")

  Translation    = (HRSC, "MEX_HRSC_S1")

  Translation    = (SRC, "MEX_HRSC_SRC")

End_Group



Group = StartTime
@@ -88,6 +79,24 @@ Group = TargetName 
  Translation    = (Cal, CAL)

End_Group



Group = Summing

  Auto

  Optional

  InputKey       = MACROPIXEL_SIZE

  OutputName     = Summing

  OutputPosition = (Group, Instrument)

  Translation    = (*, *)

End_Group



Group = ExpousreDuration

  Auto

  Optional

  InputKey       = EXPOSURE_DURATION

  OutputName     = ExposureDuration

  OutputPosition = (Group, Instrument)

  Translation    = (*, *)

End_Group



Group = FocalPlaneTemperature

  Auto

  Optional