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

Added Kaguya instrument serial number support (#4365) 

* Added Kaguya instriments

* Added change entry

* Change entry

* Update Instruments.trn
parent e14c209e

CHANGELOG.md

+4 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ release. 


## [Unreleased]





### Added

- The following calibration applications were updated to not require local mission-specific SPICE kernels when working with spiceinited cubes: amicacal, ctxcal, lrowaccal, moccal, mdiscal, hical, hicalbeta, vikcal, and gllssical. This makes it possible to first run spiceinit using the spice server and then run these calibration applications without ever needing to download mission-specific kernels. If spiceinit has not been run on the input cube, these apps will still require the kernels area to run. [#4303](https://github.com/USGS-Astrogeology/ISIS3/issues/4303)

- Added the new csminit application and CSM Library loading to the IsisPreferences file. Together these allow users to get CSM state strings from ISD files. Once CSM camera model support is added, these will be used to setup a Cube to use a CSM camera model.
@@ -44,6 +45,7 @@ release. 
### Fixed



- Fixed relative paths not being properly converted to absolute paths in isisVarInit.py [4274](https://github.com/USGS-Astrogeology/ISIS3/issues/4274)

- Fixed issue where serial numbers for Kaguya TC and MI image could not be generated. [4235](https://github.com/USGS-Astrogeology/ISIS3/issues/4235)



## [4.4.0] - 2021-02-11

isis/appdata/serialnumbers/KaguyaMiSerialNumber.trn

0 → 100644
+32 −0
Original line number Diff line number Diff line 
ObservationKeys = 3



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

End

isis/appdata/serialnumbers/KaguyaTcSerialNumber.trn

0 → 100644
+33 −0
Original line number Diff line number Diff line 
ObservationKeys = 3



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    = (TC1, TC)

  Translation    = (*, *)

End_Group



Group = Keyword3

  Auto

  InputKey       = StartTime

  InputGroup     = "IsisCube,Instrument"

  InputPosition  = (IsisCube, Instrument)

  OutputName     = Keyword3

  OutputPosition = (Group, SerialNumberKeywords)

  Translation    = (*, *)

End_Group

End

isis/appdata/translations/Instruments.trn

+8 −9
Original line number Diff line number Diff line
@@ -8,22 +8,21 @@ 
# 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.

# groups in the input label. Traversing this list will

# lead to the correct level to find the output key.

#

# InputKey is the keyword within the group which holds

# the information.

#

# InputDefault is the value used if there is no value for

# the keyword

# the keyword in the label

#

# Translation is the native and corresponding foreign values.

# Translation is the output and corresponding input values.

# Translation may be repeated as needed.

#

# This file is used to translate the InstrumentId from the

# Isis cube Instrument group to an InstrumentName

#

# history Jeannie Backer and Adam Goins - Added Kaguya TC.



Group = InstrumentName
@@ -84,10 +83,10 @@ Group = InstrumentName 
  Translation   = (JunoCam, JNC)



  # Kaguya

  Translation   = (Kaguya, MI-VIS)

  Translation   = (Kaguya, MI-NIR)

  Translation   = (Kaguya, TC1)

  Translation   = (Kaguya, TC2)

  Translation   = (Mi, MI-VIS)

  Translation   = (Mi, MI-NIR)

  Translation   = (Tc, TC1)

  Translation   = (Tc, TC2)



  # LO

  Translation   = (Hrc, "High Resolution Camera")

isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp

+0 −18
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ find files of those names at the top level of this repository. **/ 


using namespace std;



static double range(double x);



namespace Isis {



  void kaguyami2isis(UserInterface &ui) {
@@ -148,20 +146,4 @@ namespace Isis { 


    p.EndProcess();

  }



  double range(double x) {

    double a,b,c;

    b = x / 360;

    if(b > 0) {

      c = floor(b);

    }

    else {

      c = ceil(b);

    }

    a = 360 * (b - c);

    if(a < 0) {

      a = a + 360;

    }

    return a;

  }

}