Commit 1784b820 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Observation Id is going to be in the Instrument group not archive group.... 

Observation Id is going to be in the Instrument group not archive group. Changed ProductId to ObservationId when mosaicing an image.
parent 7a222fdc

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

+4 −4
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ void IsisMain() { 




    PvlGroup mos("Mosaic");

    mos += PvlKeyword("ProductId ", ProdId);

    mos += PvlKeyword("ObservationId ", ProdId);

//     mos += PvlKeyword(sourceProductId);

    mos += PvlKeyword("StartTime ", startTime);

    mos += PvlKeyword("SpacecraftClockStartCount ", startClock);

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

+5 −3
Original line number Diff line number Diff line
@@ -47,16 +47,18 @@ void IsisMain() { 
  // by the user, set it to the Observation Id.

  // This is added before the translation instead of adding it to the exported xml

  // because of the ease of editing pvl vs xml.

  PvlGroup &archiveGroup = label->findObject("IsisCube").findGroup("Archive");

  PvlGroup &instrumentGroup = label->findObject("IsisCube").findGroup("Instrument");

  PvlKeyword productId = PvlKeyword("ProductId");

  if ( ui.WasEntered("PRODUCTID") ) {

    productId.setValue( ui.GetString("PRODUCTID") );

    instrumentGroup.addKeyword(productId);



  }

  else {

    QString observationId = archiveGroup.findKeyword("ObservationId").QString();

    QString observationId = instrumentGroup.findKeyword("ObservationId")[0];

    productId.setValue(observationId);

  }

  archiveGroup.addKeyword(productId);

  instrumentGroup.addKeyword(productId);



  /*

  * Add additional pds label data here