Commit 3a1f5a8d authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Updated the OSIRIS-REx ingestion app (ocams2isis) to read NAIF frame code for... 

Updated the OSIRIS-REx ingestion app (ocams2isis) to read NAIF frame code for PolyCam directly from the input label. Fixes #5128

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

isis/src/osirisrex/apps/ocams2isis/ocams2isis.cpp

+9 −10
Original line number Diff line number Diff line
@@ -54,16 +54,16 @@ void IsisMain() { 
  bandBinXlater.Auto(outLabel);

  output->putGroup(outLabel.findGroup("BandBin", Pvl::Traverse));



  // Create an Archive group

  // OREx team reduced the output keywords, so this was commented out

  // Remove if all goes well with next release

  //FileName archiveTransFile(transDir + "ocamsArchive_fit.trn");

  //PvlToPvlTranslationManager archiveXlater(fitsLabel, archiveTransFile.expanded());

  //archiveXlater.Auto(outLabel);

  //output->putGroup(outLabel.findGroup("Archive", Pvl::Traverse));



  // Create a Kernels group

  FileName kernelsTransFile(transDir + "ocamsKernels_fit.trn");

  QString kernelsTransFileName = "";

  QString instrument = outLabel.findGroup("Instrument", Pvl::Traverse)["InstrumentId"];

  if (QString::compare(instrument, "PolyCam", Qt::CaseInsensitive) == 0) {

    kernelsTransFileName = transDir + "ocamsPolyCamKernels_fit.trn";

  }

  else {

    kernelsTransFileName = transDir + "ocamsKernels_fit.trn";

  }

  FileName kernelsTransFile(kernelsTransFileName);

  PvlToPvlTranslationManager kernelsXlater(fitsLabel, kernelsTransFile.expanded());

  kernelsXlater.Auto(outLabel);

  output->putGroup(outLabel.findGroup("Kernels", Pvl::Traverse));
@@ -75,7 +75,6 @@ void IsisMain() { 
  output->write(originals);



  // Convert the image data

  //importFits.StartProcess(Convert);

  importFits.StartProcess();

  importFits.Finalize();

}

isis/src/osirisrex/apps/ocams2isis/ocams2isis.xml

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
    <change name="Jeannie Backer and Kaj Williams" date="2017-07-07">

      Modified to reflect ProcessImportFits method name change from fitsLabel to fitsImageLabel.

    </change>

    <change name="Jeannie Backer" date="2017-08-23">

      Updated to translate PolyCam kernels separately from other cameras. Fixes #5128

    </change>

  </history>



  <seeAlso>

isis/src/osirisrex/apps/ocams2isis/tsts/mapcam/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ 
#

# @history 2016-09-09 Jeannie Backer - Original version.

#

APPNAME = ocams2isis

include $(ISISROOT)/make/isismake.tsts



commands:

	ocams2isis $(TSTARGS)                      \

	$(APPNAME) $(TSTARGS)                      \

	           from=$(INPUT)/D19030320000.fits \

	           to=$(OUTPUT)/D19030320000.cub   \

	           >& /dev/null;

isis/src/osirisrex/apps/ocams2isis/tsts/polycam/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ 
#

# @history 2016-09-09 Jeannie Backer - Original version. 

#

APPNAME = ocams2isis

include $(ISISROOT)/make/isismake.tsts



commands:

	ocams2isis $(TSTARGS)                                               \

	$(APPNAME) $(TSTARGS)                                               \

	           from=$(INPUT)/2019-01-13T23_35_59.000_PCAM_L2b_V001.fits \

	           to=$(OUTPUT)/2019-01-13T23_35_59.000_PCAM_L2b_V001.cub   \

	           >& /dev/null;

isis/src/osirisrex/apps/ocams2isis/tsts/samcam/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
#

# @history 2016-09-09 Jeannie Backer - Original version.

#

APPNAME = ocams2isis

include $(ISISROOT)/make/isismake.tsts



commands:

	# import first image

	ocams2isis $(TSTARGS)                                                   \

	$(APPNAME) $(TSTARGS)                                           \

	           from=$(INPUT)/20141111T202650_SCAM_L2_V001_SCAM.fits \

	           to=$(OUTPUT)/20141111T202650_SCAM_L2_V001_SCAM.cub   \

	           >& /dev/null;