Unverified Commit 2cf5c021 authored by Kaitlyn Lee's avatar Kaitlyn Lee Committed by GitHub
Browse files

Fixed CissLabels unit test. (#3428)

parent 56bb32fc

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

+10 −1
Original line number Diff line number Diff line
@@ -13,7 +13,16 @@ 
      correction, bias subtraction, dark subtraction, non-linearity correction,

      flat field correction, DN to flux conversion, and correction factor

      division.  The user may choose between intensity units and I/F for the DN

      to flux conversion.  This application is derived from the IDL CISSCAL

      to flux conversion.  



      If you are trying to run 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.

      You will need to reingest the original image using ciss2isis or another

      ingesting program. 



      This application is derived from the IDL CISSCAL

      application developed by the Cassini Imaging Central Laboratory for

      Operations (CICLPOS) using the following set of steps:

    </p>

isis/src/cassini/objs/CissLabels/CissLabels.truth

+6 −2
Original line number Diff line number Diff line
@@ -23,11 +23,12 @@ Instrument Data Rate = 365.6 
Instrument ID                = ISSWA

Readout Cycle Index          = 0

Shutter Mode ID              = WacOnly

Shutter State ID             = Enabled

Summing Mode                 = 1



ISSNA,Lossy,Table,CAS-ISS2,NacOnly,Sum2 test...

IsNarrowAngle?                 1

Bias Strip Mean              = 120.75

Bias Strip Mean              = 1041.25

Compression Ratio            = 18.437473

Compression Type             = Lossy

Data Conversion Type         = Table
@@ -46,11 +47,12 @@ Instrument Data Rate = 182.784 
Instrument ID                = ISSNA

Readout Cycle Index          = 15

Shutter Mode ID              = NacOnly

Shutter State ID             = Enabled

Summing Mode                 = 2



ISSNA,Lossless,Table,CAS-ISS4,BothSim,Sum4 test...

IsNarrowAngle?                 1

Bias Strip Mean              = 30

Bias Strip Mean              = 108

Compression Ratio            = 3.721945

Compression Type             = Lossless

Data Conversion Type         = Table
@@ -69,6 +71,7 @@ Instrument Data Rate = 182.784 
Instrument ID                = ISSNA

Readout Cycle Index          = 15

Shutter Mode ID              = BothSim

Shutter State ID             = Enabled

Summing Mode                 = 4



ISSNA,Lossless,8LSB,CAS-ISS,NacOnly,Full test...
@@ -92,5 +95,6 @@ Instrument Data Rate = 182.8 
Instrument ID                = ISSNA

Readout Cycle Index          = 15

Shutter Mode ID              = NacOnly

Shutter State ID             = Enabled

Summing Mode                 = 1

isis/src/cassini/objs/CissLabels/unitTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ int main(int argc, char *argv[]) { 
    cout << "Instrument ID                = " << lab1.InstrumentId()          << endl;

    cout << "Readout Cycle Index          = " << lab1.ReadoutCycleIndex()     << endl;

    cout << "Shutter Mode ID              = " << lab1.ShutterModeId()         << endl;

    cout << "Shutter State ID             = " << lab1.ShutterStateId()        << endl;

    cout << "Summing Mode                 = " << lab1.SummingMode()           << endl;
@@ -64,6 +65,7 @@ int main(int argc, char *argv[]) { 
    cout << "Instrument ID                = " << lab2.InstrumentId()          << endl;

    cout << "Readout Cycle Index          = " << lab2.ReadoutCycleIndex()     << endl;

    cout << "Shutter Mode ID              = " << lab2.ShutterModeId()         << endl;

    cout << "Shutter State ID             = " << lab1.ShutterStateId()        << endl;

    cout << "Summing Mode                 = " << lab2.SummingMode()           << endl;
@@ -88,6 +90,7 @@ int main(int argc, char *argv[]) { 
    cout << "Instrument ID                = " << lab3.InstrumentId()          << endl;

    cout << "Readout Cycle Index          = " << lab3.ReadoutCycleIndex()     << endl;

    cout << "Shutter Mode ID              = " << lab3.ShutterModeId()         << endl;

    cout << "Shutter State ID             = " << lab1.ShutterStateId()        << endl;

    cout << "Summing Mode                 = " << lab3.SummingMode()           << endl;



    // 8LSB
@@ -112,6 +115,7 @@ int main(int argc, char *argv[]) { 
    cout << "Instrument ID                = " << lab4.InstrumentId()          << endl;

    cout << "Readout Cycle Index          = " << lab4.ReadoutCycleIndex()     << endl;

    cout << "Shutter Mode ID              = " << lab4.ShutterModeId()         << endl;

    cout << "Shutter State ID             = " << lab1.ShutterStateId()        << endl;

    cout << "Summing Mode                 = " << lab4.SummingMode()           << endl;

    cout  << endl;

    return 0;

isis/src/cassini/objs/CissLabels/CissLabels.cpp

+22 −22

File changed.

Contains only whitespace changes.