Unverified Commit 6bdf2888 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Adds support for JAXA archive Level 2B2 images to Kaguya MI in ISIS. (#3823) 



* Get kaguyami2isis working with l2b2 images from Jaxa archive and update unittest to includes images of this type.

* Updated documentation to include level 2B2 support.

* Added NIR image to unit test

Co-authored-by: default avatarKaitlyn Lee <kdl222@nau.edu>
parent ac84c96d

isis/src/kaguya/apps/kaguyami2isis/KaguyaMiInstrument.trn

+3 −0
Original line number Diff line number Diff line
@@ -33,11 +33,13 @@ End_Group 
Group = SpacecraftName

  Auto

  InputKey       = SPACECRAFT_NAME

  InputKey       = INSTRUMENT_HOST_NAME

  InputGroup     = ROOT

  InputPosition  = ROOT

  OutputName     = SpacecraftName

  OutputPosition = (Object, IsisCube, Group, Instrument)

  Translation    = (KAGUYA, SELENE-M)

  Translation    = (KAGUYA, "SELENE MAIN ORBITER")

End_Group



Group = InstrumentName
@@ -513,6 +515,7 @@ End_Group 
Group = FirstDetectorElementPosition

  Auto

  InputKey       = FIRST_DETECTOR_ELEMENT_POSITION

  InputKey       = FIRST_DETECTOR_ELEM_POSITION

  InputGroup     = ROOT

  InputPosition  = ROOT

  OutputName     = FirstDetectorElementPosition

isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.xml

+6 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


  <description>

    <p>

      This program will import a PDS formatted Kaguya MI VIS and NIR level 1 (EDR)

      This program will import a PDS formatted Kaguya MI VIS and NIR level 1 (EDR) or level 2B2

      image into an Isis cube.

    </p>

    <p>
@@ -78,6 +78,9 @@ 
      Added a new error message informing the user that the file they are using is not compatible with

      kaguyami2isis. Fixes #2358.

    </change>

    <change name="Kaitlyn Lee" date="2020-03-31">

      Updated documentation to include level 2B2 support.

    </change>

  </history>



  <category>
@@ -94,11 +97,10 @@ 
        </brief>

        <description>

          Use this parameter to select the Kaguya MI VIS or

	  NIR EDR filename. This file must contain the PDS

          labels.

	        NIR level 1 or level 2B2 filename. This file must contain the PDS labels.

        </description>

        <filter>

          *.img *.IMG

          *.img *.IMG *.lbl *.LBL

        </filter>

      </parameter>

isis/src/kaguya/apps/kaguyami2isis/tsts/level2b2/Makefile

0 → 100644
+18 −0
Original line number Diff line number Diff line 
APPNAME = kaguyami2isis



include $(ISISROOT)/make/isismake.tsts



commands:

	# Visible

	$(APPNAME) from=$(INPUT)/MNA_2B2_01_01228N602E1354.lbl \

	  to=$(OUTPUT)/MNA_2B2_01_01228N602E1354.cub > /dev/null;

	catlab from=$(OUTPUT)/MNA_2B2_01_01228N602E1354.cub \

	  to=$(OUTPUT)/MNA_2B2_01_01228N602E1354.pvl > /dev/null;



        # IR

	$(APPNAME) from=$(INPUT)/MVA_2B2_01_01228N608E1354.lbl \

          to=$(OUTPUT)/MVA_2B2_01_01228N608E1354.cub > /dev/null;

	catlab from=$(OUTPUT)/MVA_2B2_01_01228N608E1354.cub \

	  to=$(OUTPUT)/MVA_2B2_01_01228N608E1354.pvl > /dev/null;

isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ namespace Isis { 




    KaguyaMiCameraDistortionMap *distMap = new KaguyaMiCameraDistortionMap(this);

    //LroNarrowAngleDistortionMap *distMap = new LroNarrowAngleDistortionMap(this);

    distMap->SetDistortion(naifIkCode());



    // Setup the ground and sky map

isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


namespace Isis {

  /**

   * @brief LRO Narrow Angle Camera Model

   * @brief Kaguya MI Camera Model

   *

   * This is the camera model for the Kaguya Multiband pushbroom imagers (VIR and NIR)

   *