Commit 0c052669 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Fixed ObservationId algorithm.

parent bf7dbb17

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

+3 −6
Original line number Diff line number Diff line
@@ -455,17 +455,14 @@ QString convertUniqueIdToObservationId(Pvl &outputLabel) { 
  PvlGroup &archiveGroup = outputLabel.findGroup("Archive", Pvl::Traverse);

  QString uniqueId = archiveGroup.findKeyword("UniqueIdentifier")[0];



  bool ok = false;

  QString observationId = "";

  int uniqueIdDecimalValue = uniqueId.toInt(&ok, 16);



  int operationPeriod = (uniqueIdDecimalValue & 1879048192);

  BigInt uniqueIdDecimalValue = uniqueId.toLongLong();

  BigInt operationPeriod = (uniqueIdDecimalValue & 1879048192);

  operationPeriod /= qPow(2,28);

  FileName transFile("$tgo/translations/tgoCassisOperationPeriod.trn");

  PvlTranslationTable transTable(transFile);

  observationId = transTable.Translate("OperationPeriod", toString(operationPeriod));



  int orbitNumber = (uniqueIdDecimalValue & 268433408);

  BigInt orbitNumber = (uniqueIdDecimalValue & 268433408);

  orbitNumber /= qPow(2,11);

  observationId += "_";

  observationId += QString("%1").arg(orbitNumber, 6, 10, QChar('0'));

isis/src/tgo/apps/tgocassis2isis/tgocassis2isis.xml

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ 
      Stripped the "Z" from the StartTime value in the "Instrument" group to handle re-ingestion 

      of PDS4 compliant .xml files.

    </change>

    <change name="Jeannie Backer" date="2018-08-12">

      Added ObservationId to Archive group.

    </change>

  </history>



  <category>