Unverified Commit 4b8b0b60 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Cisscal Output Change (#3496) 

* Updated cisscal output cub creation to after bitweight correction and dark subtraction

* Updated history in cisscal app xml

* Added issue number

* Added new test for cisscal

* Typo

* Removed cube when an exception is thrown rather than moving the instantiation point
parent a11394f4

isis/src/cassini/apps/cisscal/cisscal.xml

+9 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
      division.  The user may choose between intensity units and I/F for the DN

      to flux conversion.



      If you are trying to run run cisscal on a cube ingested/created with an ISIS

      If you are trying to run cisscal on a cube ingested/created with an ISIS

      version less than 3.9 and are getting these errors:

      **ERROR** PVL Keyword [ShutterStateId] does not exist in [Group = Instrument].

      **ERROR** Labels do not appear contain a valid Cassini ISS instrument.
@@ -229,6 +229,11 @@ 
      updated values in divideByAreaPixel, and added sensitivity vs

      time correction. Fixes #3351.

    </change>

    <change name="Adam Paquette" date="2019-11-06">

      Removed the cube when either an associated bitweight file is not present,

      or the dark current calculation fails.

      Fixes #3446.

    </change>

  </history>



  <category>

isis/src/cassini/apps/cisscal/main.cpp

+8 −4
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ void IsisMain() { 
  else { // Bitweight correction

    FileName bitweightFile = gbl::FindBitweightFile();

    if(!bitweightFile.fileExists()) { // bitweight file not found, stop calibration

      // Remove the output cube since it will be empty at this point

      outcube->close(true);

      throw IException(IException::Io,

                       "Unable to calibrate image. BitweightFile ***"

                       + bitweightFile.expanded() + "*** not found.", _FILEINFO_);
@@ -203,6 +205,8 @@ void IsisMain() { 
  }

  catch(IException &e) { // cannot perform dark current, stop calibration

    e.print();

    // Remove the output cube since it will be empty at this point

    outcube->close(true);

    throw IException(e, IException::Unknown,

                     "Unable to calibrate image. Dark current calculations failed.",

                     _FILEINFO_);

isis/src/cassini/apps/cisscal/tsts/badCisscalImage/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
APPNAME = cisscal



include $(ISISROOT)/make/isismake.tsts





commands:

	-$(APPNAME) from=$(INPUT)/N1605851822_1.cub \

	to=$(OUTPUT)/N1605851822_1.truth.cub >& $(OUTPUT)/error.txt;

	$(RM) print.prt > /dev/null;