Unverified Commit 1166a68e authored by Makayla Shepherd's avatar Makayla Shepherd Committed by GitHub
Browse files

Merge pull request #163 from kberryUSGS/CaSSIS_Pipeline 

Minor fixes to get tgocassismos tests running and added an intial app…
parents 37ca85a7 dc8b2098

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

+9 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ void IsisMain() { 
  UserInterface &ui = Application::GetUserInterface();

  FileList flist(ui.GetFileName("FROMLIST"));





  vector<Cube *> clist;

  try {

    if(flist.size() < 1) {
@@ -86,7 +85,6 @@ void IsisMain() { 
    proj->SetGround(avgLat, avgLon);

    avgLat = proj->UniversalLatitude();

    avgLon = proj->UniversalLongitude();



    // Use camera class to get Inc., emi., phase, and other values

    double Cemiss;

    double Cphase;
@@ -170,14 +168,16 @@ void IsisMain() { 
      throw IException(IException::User, msg, _FILEINFO_);

    }



    // get the min and max SCLK values ( do this with QString comp.)

    // get the min SCLK values ( do this with QString comp.)

    // get the value from the original label blob

    QString startClock;

    QString startTime;

    for(int i = 0; i < (int)clist.size(); i++) {

      OriginalLabel origLab;

      clist[i]->read(origLab);

      PvlGroup timegrp = origLab.ReturnLabels().findGroup("Instrument", Pvl::Traverse);

      // himos used original label here. 



      Pvl *origLab = clist[i]->label();

      PvlGroup timegrp = origLab->findGroup("Instrument", Pvl::Traverse);



      if(i == 0) {

        startClock = (QString)timegrp["SpacecraftClockStartCount"];

        startTime = (QString)timegrp["StartTime"];
@@ -192,8 +192,7 @@ void IsisMain() { 
    }



    // Get the blob of original labels from first image in list

    OriginalLabel org;

    clist[0]->read(org);

   // Pvl *org = clist[0]->label();



    //close all cubes

    for(int i = 0; i < (int)clist.size(); i++) {
@@ -212,6 +211,7 @@ void IsisMain() { 


    // write out new information to new group mosaic





    PvlGroup mos("Mosaic");

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

//     mos += PvlKeyword(sourceProductId);
@@ -230,7 +230,7 @@ void IsisMain() { 
    PvlObject &lab = mosCube.label()->findObject("IsisCube");

    lab.addGroup(mos);

    //add orginal label blob to the output cube

    mosCube.write(org);

//    mosCube.write(org);

    mosCube.close();



  }

isis/src/tgo/apps/tgocassismos/tsts/case01/Makefile

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
APPNAME = tgocassismos



include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cube.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis \

		   to=$(OUTPUT)/test_tgocassismos_070418.cub > /dev/null;

	catlab from=$(OUTPUT)/test_tgocassismos_070418.cub to=$(OUTPUT)/tgocassismos.pvl > /dev/null;

	$(RM) $(OUTPUT)/cube.lis;

isis/src/tgo/apps/tgocassismos/tsts/case02pole/Makefile

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
APPNAME = tgocassismos



include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cube.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis \

		   to=$(OUTPUT)/test_tgocassismos_pole.cub > /dev/null;

	catlab from=$(OUTPUT)/test_tgocassismos_pole.cub to=$(OUTPUT)/tgocassismos_pole.pvl > /dev/null;

	$(RM) $(OUTPUT)/cube.lis;

isis/src/tgo/apps/tgocassismos/tsts/default/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
APPNAME = tgocassismos



include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/mosaic.lis;

	$(APPNAME) fromlist=$(OUTPUT)/mosaic.lis \

		   to=$(OUTPUT)/tgocassismos.cub >& /dev/null;

	catlab from=$(OUTPUT)/tgocassismos.cub to=$(OUTPUT)/tgocassismos.pvl > /dev/null;

	$(RM) $(OUTPUT)/mosaic.lis;