From 43da86cd457306b71041bd8ac6c3874e25f5725e Mon Sep 17 00:00:00 2001
From: acpaquette <acpaquette@usgs.gov>
Date: Thu, 18 Apr 2024 12:23:56 -0700
Subject: [PATCH 1/2] Set default DN max values

---
 isis/src/cassini/apps/ciss2isis/ciss2isis.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp b/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp
index 4a083b040e..336a3c9962 100644
--- a/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp
+++ b/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp
@@ -77,6 +77,7 @@ namespace Isis{
 
     //SET PROGRESS TEXT, VALID MAXIMUM PIXEL VALUE, AND CREATE STRETCH IF NEEDED
     if(dataConversionType != "Table") {   //Conversion Type is 12Bit or 8LSB, only save off overclocked pixels
+      validMax = 255;
       if(dataConversionType == "12Bit") {
         p.Progress()->SetText("Image was 12 bit. No conversion needed. \nSaving line prefix data...");
       }
@@ -85,6 +86,7 @@ namespace Isis{
       }
     }
     else {  //if ConversionType == Table, Use LUT to create stretch pairs for conversion
+      validMax = 4095;
       CreateStretchPairs();
       // Pvl outputLabels;
       Pvl *outputLabel = ocube->label();
@@ -96,6 +98,14 @@ namespace Isis{
       p.Progress()->SetText("Image was converted using 12-to-8 bit table. \nConverting prefix pixels back to 12 bit and saving line prefix data...");
     }
 
+    Pvl inputLabel(in.expanded());
+    if (inputLabel.hasKeyword"VALID_MAXIMUM"()) {
+      PvlKeyword labelValidMax = inputLabel.findKeyword("VALID_MAXIMUM");
+      if (labelValidMax[1] != "UNK") {
+        validMax = toInt(labelValidMax[1]);
+      }
+    }
+
     p.StartProcess();
 
     // Write line prefix data to table in output cube
@@ -294,7 +304,6 @@ namespace Isis{
 
     //  initialize global variables
     dataConversionType = (QString) inst.findKeyword("DataConversionType");
-    validMax = inputLabel.findKeyword("ValidMaximum")[1].toInt();
     sumMode = inst.findKeyword("SummingMode");
     compressionType = (QString) inst.findKeyword("CompressionType");
     IString fsw((QString) inst.findKeyword("FlightSoftwareVersionId"));

From 821fcfb31ca2547b5ea84b9ec51eb726965815ed Mon Sep 17 00:00:00 2001
From: acpaquette <acpaquette@usgs.gov>
Date: Thu, 18 Apr 2024 12:30:17 -0700
Subject: [PATCH 2/2] Fixed method signature

---
 isis/src/cassini/apps/ciss2isis/ciss2isis.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp b/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp
index 336a3c9962..f7996c9a8a 100644
--- a/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp
+++ b/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp
@@ -99,7 +99,7 @@ namespace Isis{
     }
 
     Pvl inputLabel(in.expanded());
-    if (inputLabel.hasKeyword"VALID_MAXIMUM"()) {
+    if (inputLabel.hasKeyword("VALID_MAXIMUM")) {
       PvlKeyword labelValidMax = inputLabel.findKeyword("VALID_MAXIMUM");
       if (labelValidMax[1] != "UNK") {
         validMax = toInt(labelValidMax[1]);