Unverified Commit bf00f5d7 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Merge branch 'dev' into rosetta_dark

parents a4c3f538 9efec548

isis/src/rosetta/apps/rosvirtis2isis/rosvirtis2isis.cpp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void IsisMain () 
  if (procLevel == 2) {

    p.SetDataTrailerBytes(864);

  }

  else if ((procLevel == 3)) {

  else if (procLevel == 3) {

    p.SetDataTrailerBytes(0);

    p.SetDataSuffixBytes(4);

  }

isis/src/rosetta/apps/rosvirtis2isis/rosvirtis2isis.xml

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 
    <change name="Kris Becker and Kaj Williams" date="2017-08-24">

       Fix issues with the translation of housekeeping data. Fixes #5131.

    </change>

    <change name="Jesse Mapel" date="2018-05-14">

       Fixed compiler warnings from new lvl3 ingestion code.

    </change>

    <change name="Jesse Mapel" date="2018-05-14">

       Nulled dark current scans in level 2 data. Fixes #5421.

    </change>