Commit 4acd70f2 authored by Kristin's avatar Kristin Committed by Jesse Mapel
Browse files

Fixes failing tgo cat tests and PEP4 unitTest (#3408) 

* Update date and other metadata

* Added changes to tgo-related applications and PEP4 to update PDS4 exported labels for CaSSIS based on requests

* Updated tgocassisrdrgen to add PSA schema

* Add function on cube to return actual min/max lat/lons based on DNs and updated PEP4 to format a couple of specific output map values with a trailing .0. Also update PEP4 to use the new function on Cube to calculate min/max lat/lons

* Fixed description order, updated geom schema details to pass validation, propagate Archive group to mosaic output needed for PDS4 export

* Update to PEP4

* Update tgocassisrdrgen

* Cleanup before commit

* More cleanup add header file history entries

* Clean up PEP4 before commit

* Updates to address review comments

* Fix raw image failing tests

* Update truthdata for PEP4
parent d030211d

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp

+7 −3
Original line number Diff line number Diff line
@@ -306,8 +306,10 @@ namespace Isis { 
          }

          else {

            QString timeValue = startTime.text();

            if (!timeValue.contains("Z")) {

              PvlToXmlTranslationManager::resetElementValue(startTime, timeValue + "Z"); 

            }

          }



          QDomElement stopTime  = timeNode.firstChildElement("stop_date_time"); 

          if (stopTime.text() == "") {
@@ -315,8 +317,10 @@ namespace Isis { 
          }

          else {

            QString timeValue = stopTime.text();

            if (!timeValue.contains("Z")) {

              PvlToXmlTranslationManager::resetElementValue(stopTime, timeValue + "Z"); 

            }

          }

          QStringList xmlPath;

          xmlPath << "Product_Observational"

            << "Observation_Area"

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.truth

+50 −50
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ Testing default CaSSIS export 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>-3.40282265508890445e+38</missing_constant>

    <high_instrument_saturation>-3.40282326356119256e+38</high_instrument_saturation>

    <high_representation_saturation>-3.4028234663852886e+38</high_representation_saturation>

    <low_instrument_saturation>-3.40282306073709653e+38</low_instrument_saturation>

    <low_representation_saturation>-3.40282285791300049e+38</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -61,11 +61,11 @@ Testing default CaSSIS export 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>-3.40282265508890445e+38</missing_constant>

    <high_instrument_saturation>-3.40282326356119256e+38</high_instrument_saturation>

    <high_representation_saturation>-3.4028234663852886e+38</high_representation_saturation>

    <low_instrument_saturation>-3.40282306073709653e+38</low_instrument_saturation>

    <low_representation_saturation>-3.40282285791300049e+38</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -97,11 +97,11 @@ Testing export pixel types 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>-32768</missing_constant>

    <high_instrument_saturation>-32765</high_instrument_saturation>

    <high_representation_saturation>-32764</high_representation_saturation>

    <low_instrument_saturation>-32766</low_instrument_saturation>

    <low_representation_saturation>-32767</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -126,11 +126,11 @@ Testing export pixel types 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>-32768</missing_constant>

    <high_instrument_saturation>-32765</high_instrument_saturation>

    <high_representation_saturation>-32764</high_representation_saturation>

    <low_instrument_saturation>-32766</low_instrument_saturation>

    <low_representation_saturation>-32767</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -157,11 +157,11 @@ Testing export pixel types 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>-3.40282265508890445e+38</missing_constant>

    <high_instrument_saturation>-3.40282326356119256e+38</high_instrument_saturation>

    <high_representation_saturation>-3.4028234663852886e+38</high_representation_saturation>

    <low_instrument_saturation>-3.40282306073709653e+38</low_instrument_saturation>

    <low_representation_saturation>-3.40282285791300049e+38</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -190,11 +190,11 @@ Testing export pixel types 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>0</missing_constant>

    <high_instrument_saturation>65534</high_instrument_saturation>

    <high_representation_saturation>65535</high_representation_saturation>

    <low_instrument_saturation>2</low_instrument_saturation>

    <low_representation_saturation>1</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -225,11 +225,11 @@ Testing export pixel types 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>0</missing_constant>

    <high_instrument_saturation>65534</high_instrument_saturation>

    <high_representation_saturation>65535</high_representation_saturation>

    <low_instrument_saturation>2</low_instrument_saturation>

    <low_representation_saturation>1</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -262,11 +262,11 @@ Testing export pixel types 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>0</missing_constant>

    <high_instrument_saturation>255</high_instrument_saturation>

    <high_representation_saturation>255</high_representation_saturation>

    <low_instrument_saturation>0</low_instrument_saturation>

    <low_representation_saturation>0</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -296,11 +296,11 @@ Testing missing start and end times 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>-3.40282265508890445e+38</missing_constant>

    <high_instrument_saturation>-3.40282326356119256e+38</high_instrument_saturation>

    <high_representation_saturation>-3.4028234663852886e+38</high_representation_saturation>

    <low_instrument_saturation>-3.40282306073709653e+38</low_instrument_saturation>

    <low_representation_saturation>-3.40282285791300049e+38</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>
@@ -331,11 +331,11 @@ Testing exporting a map projected product 
    <sequence_number>2</sequence_number>

   </Axis_Array>

   <Special_Constants>

    <missing_constant>-1.79769313486231491e+308</missing_constant>

    <high_instrument_saturation>-1.79769313486231551e+308</high_instrument_saturation>

    <high_representation_saturation>-1.79769313486231571e+308</high_representation_saturation>

    <low_instrument_saturation>-1.79769313486231531e+308</low_instrument_saturation>

    <low_representation_saturation>-1.79769313486231511e+308</low_representation_saturation>

    <missing_constant>-3.40282265508890445e+38</missing_constant>

    <high_instrument_saturation>-3.40282326356119256e+38</high_instrument_saturation>

    <high_representation_saturation>-3.4028234663852886e+38</high_representation_saturation>

    <low_instrument_saturation>-3.40282306073709653e+38</low_instrument_saturation>

    <low_representation_saturation>-3.40282285791300049e+38</low_representation_saturation>

   </Special_Constants>

  </Array_2D_Image>

 </File_Area_Observational>

isis/src/tgo/apps/tgocassis2isis/main.cpp

+17 −14
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ void IsisMain() { 
      }

    }



    if (!outputCube->group("Archive").hasKeyword("ObservationId")){

      convertUniqueIdToObservationId(*outputLabel); 

    }



    FileName outputCubeFileName(ui.GetFileName("TO"));
@@ -442,6 +444,7 @@ void translateLabels(FileName &inputLabel, Cube *outputCube, QString instTransFi 
  outputCube->putGroup(kern);



  // Add an alpha cube group based on the subwindowing

  if (archive.hasKeyword("Window_Count")) {

    int windowNumber = (int)archive["Window_Count"] + 1; 

    QString windowString = "Window_" + toString(windowNumber);

    int frameletStartSample = (int) archive[windowString + "_Start_Sample"] + 1;
@@ -454,7 +457,7 @@ void translateLabels(FileName &inputLabel, Cube *outputCube, QString instTransFi 
                           frameletStartSample - 0.5, frameletStartLine - 0.5,

                           frameletEndSample + 0.5, frameletEndLine + 0.5);

    frameletArea.UpdateGroup(*outputCube);



  }

}