Commit aae2f31c authored by Adam Paquette's avatar Adam Paquette
Browse files

Modified mimap2isis to ingest new L3C data from kaguya. Also added tests and... 

Modified mimap2isis to ingest new L3C data from kaguya. Also added tests and error new error messages for mimap2isis and kaguyami2isis. Fixes #2358.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@8161 41f8697f-d340-4b68-9986-7bafba869bb8
parent ab8ff639

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

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ void IsisMain() { 
  QString id;

  Pvl lab(inFile.expanded());



  if (lab.hasObject("IMAGE_MAP_PROJECTION")) {

    QString msg = "Unsupported projected file [" + inFile.expanded() + "]";

    throw IException(IException::User, msg, _FILEINFO_);

  }



  try {

    id = (QString) lab.findKeyword("DATA_SET_ID");

  }

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

+14 −10
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ 
      Added parameters (SETNULLRANGE, SETHRSRANGE, SETHISRANGE, ETLRSRANGE, SETLISRANGE)

      to allow the user to specify special pixel values. Fixes #2033.

    </change>

    <change name="Adam Paqeutte" date="2016-08-04">

      Added a new error message informing the user that the file they are using is not compatible with

      kaguyami2isis. Fixes #2358.

    </change>

  </history>



  <category>

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

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

FILE=MIA_3C5_03_01351S791E0024SC



include $(ISISROOT)/make/isismake.tsts



commands:

#    TEST A: Check that lronac2isis is returning the correct error messages

	if [ `$(APPNAME) from=$(INPUT)/$(FILE) \

	  to=$(OUTPUT)/$(FILE).cub > /dev/null \

	  2>> $(OUTPUT)/error_message_temp.txt > /dev/null` ]; \

	  then true; \

	fi;

	$(SED) 's+\[/.*/input/+\[input/+' $(OUTPUT)/error_message_temp.txt > $(OUTPUT)/error_message.txt;

	$(RM)  $(OUTPUT)/error_message_temp.txt;
 
 No newline at end of file

isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp

+10 −4
Original line number Diff line number Diff line
@@ -72,7 +72,14 @@ void IsisMain() { 
  PvlToPvlTranslationManager instXlater(label, transFile.expanded());

  instXlater.Auto(otherLabels);



  PvlKeyword processId = label.findKeyword("PROCESS_VERSION_ID");



  if (processId[0] == "L3C") {

    transFile = transDir + "mil3cArchive.trn";;

  }

  else {

    transFile = transDir + "mimapArchive.trn";

  }

  PvlToPvlTranslationManager archiveXlater(label, transFile.expanded());

  archiveXlater.Auto(otherLabels);
@@ -106,4 +113,3 @@ void IsisMain() { 


  return;

}

isis/src/kaguya/apps/mimap2isis/mimap2isis.xml

+65 −61
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ 
      Added additional translation for other keywords in the

      PDS label. Fixes #1959.

    </change>

    <change name="Adam Paquette" date="2016-08-04">

      Added seperate translation table for L3C labels.

      Fixes #2358.

    </change>

    <change name="Summer Stapleton" date ="2017-06-27">

      Added conditional to check whether default offsets and multipliers where changed from their

      default values and log them if so.