Commit bc18c1a9 authored by jcwbacker's avatar jcwbacker
Browse files

Updated tests and added support for TC2 L2B0.

parent b926a9e1

isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ void IsisMain() { 
  id = id.simplified().trimmed();

  if (id != "TC_MAP" 

      && id != "TCO_MAP"

      && id != "TC1_Level2B") {

      && id != "TC1_Level2B"

      && id != "TC2_Level2B") {

    QString msg = "Input file [" + labelFile + "] does not appear to be " +

                  "a supported Kaguya Terrain Camera format. " +

                  "DATA_SET_ID is [" + id + "]" +

isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
    Supported input images include radiometrically corrected

    unprojected images, TC maps, or TC Ortho maps.

    To verify, input image labels must have DATA_SET_ID matching

    TC1_Level2B, TC_MAP or TCO_MAP.

    TC1_Level2B, TC2_Level2B, TC_MAP or TCO_MAP.

  </description>



  <history>
@@ -32,7 +32,7 @@ 
      Added check for TARGET_NAME keyword. Fixes #2036.

    </change>

    <change name="Jeannie Backer" date="2018-10-02">

      Added support for Kaguya L2B0 (TC1_Level2B) files. 

      Added support for Kaguya L2B0 (TC1_Level2B and TC2_Level2B) files. 

    </change>

  </history>

isis/src/kaguya/apps/kaguyatc2isis/tsts/tc1_s_l2b0/Makefile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
APPNAME = kaguyatc2isis



labels.txt.IGNORELINES = Bytes StartByte ByteOrder TileSamples TileLines



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/TC1W2B0_01_00296N081E2387.img \

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

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

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

isis/src/kaguya/apps/kaguyatc2isis/tsts/tc2_w_l2b0/Makefile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
APPNAME = kaguyatc2isis



labels.txt.IGNORELINES = Bytes StartByte ByteOrder TileSamples TileLines



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/TC2W2B0_01_02735N583E3115.img \

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

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

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