Commit 8e202bdf authored by Kristin Berry's avatar Kristin Berry
Browse files

Fix logical_identifier output in tgocassisrdrgen and removed _filtername from... 

Fix logical_identifier output in tgocassisrdrgen and removed _filtername from tgocassismos-generated ProductIds
parent 06368dca

isis/src/tgo/apps/tgocassismos/tgocassismos.cpp

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ void IsisMain() { 
      Pvl *pcomp = clist[i]->label();

      CompareLabels(*pmatch, *pcomp);

      ProdId = (QString)pmatch->findGroup("Archive", Pvl::Traverse)["UniqueIdentifier"];

      QString bandname = (QString)pmatch->findGroup("BandBin", Pvl::Traverse)["FilterName"];

      bandname = bandname.toUpper();

      ProdId = ProdId + "_" + bandname;

    }



    bool runXY = true;

isis/src/tgo/apps/tgocassismos/tgocassismos.xml

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ 
    <change name="Adam Goins" date="2018-05-17">

      Added SpacecraftName and InstrumentId to mosaic group.

    </change>

    <change name="Kristin Berry" date="2018-06-12">

      Removed the "_filtername" from the ProductId. 

    </change>

  </history>



  <groups>

isis/src/tgo/apps/tgocassisrdrgen/tgocassisrdrgen.cpp

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void IsisMain() { 


  if ( label->findObject("IsisCube").hasGroup("Instrument") ) {

    targetGroup = label->findObject("IsisCube").findGroup("Instrument");

    if (label->hasGroup("Mapping")) {

    if (label->findObject("IsisCube").hasGroup("Mapping")) {

      logicalId += "data_projected:";

    }

    else {
@@ -47,7 +47,7 @@ void IsisMain() { 
  }

  else if ( label->findObject("IsisCube").hasGroup("Mosaic") ) {

    targetGroup = label->findObject("IsisCube").findGroup("Mosaic");

    logicalId = "data_mosaic";

    logicalId += "data_mosaic:";

  }



  // Check if the cube is able to be translated into a CaSSIS xml file