Commit 646840a6 authored by Ian Humphrey's avatar Ian Humphrey Committed by Makayla Shepherd
Browse files

Revert "Revert "PROG fixed cub locations and updated input list files for... 

Revert "Revert "PROG fixed cub locations and updated input list files for ProcessMapMosaic unitTest""

This reverts commit f21a1a2534b103578841b78a8bb0b5fa5c4d8ce7.
parent bad57a73

isis/src/base/objs/ProcessMapMosaic/ProcessMapMosaic.truth

+48 −6
Original line number Diff line number Diff line
@@ -4,14 +4,17 @@ unittest: Initializing mosaic 
0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

unittest: Mosaicking unitTest1.cub

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

./unitTest1.cub is inside the mosaic

/usgs/cpkgs/isis3/data/base/testData/ProcessMapMosaic/unitTest1.cub is inside the mosaic

unittest: Mosaicking unitTest2.cub

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

./unitTest2.cub is inside the mosaic

/usgs/cpkgs/isis3/data/base/testData/ProcessMapMosaic/unitTest2.cub is inside the mosaic

Mosaic label: 

Object = IsisCube

  Object = Core

    StartByte   = 65537

    Format      = Tile

    TileSamples = 124

    TileLines   = 125



    Group = Dimensions

      Samples = 124
@@ -21,6 +24,7 @@ Object = IsisCube 


    Group = Pixels

      Type       = UnsignedByte

      ByteOrder  = Lsb

      Base       = 0.0

      Multiplier = 1.0

    End_Group
@@ -47,10 +51,13 @@ Object = IsisCube 
End_Object



Object = Label

  Bytes = 65536

End_Object



Object = History

  Name      = IsisCube

  StartByte = 81037

  Bytes     = 3022

End_Object

End

Testing Mosaic 2
@@ -58,14 +65,17 @@ unittest: Initializing mosaic 
0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

unittest: Mosaicking unitTest1.cub

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

./unitTest1.cub is inside the mosaic

/usgs/cpkgs/isis3/data/base/testData/ProcessMapMosaic/unitTest1.cub is inside the mosaic

unittest: Mosaicking unitTest2.cub

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

./unitTest2.cub is inside the mosaic

/usgs/cpkgs/isis3/data/base/testData/ProcessMapMosaic/unitTest2.cub is inside the mosaic

Mosaic label: 

Object = IsisCube

  Object = Core

    StartByte   = 65537

    Format      = Tile

    TileSamples = 248

    TileLines   = 249



    Group = Dimensions

      Samples = 248
@@ -75,6 +85,7 @@ Object = IsisCube 


    Group = Pixels

      Type       = UnsignedByte

      ByteOrder  = Lsb

      Base       = 0.0

      Multiplier = 1.0

    End_Group
@@ -101,10 +112,13 @@ Object = IsisCube 
End_Object



Object = Label

  Bytes = 65536

End_Object



Object = History

  Name      = IsisCube

  StartByte = 127289

  Bytes     = 3022

End_Object

End

Mosaic Data: -1.79769e+308	-1.79769e+308	-1.79769e+308
@@ -365,7 +379,10 @@ unittest: Mosaicking unitTest1.cub 
Mosaic label: 

Object = IsisCube

  Object = Core

    StartByte   = 65537

    Format      = Tile

    TileSamples = 38

    TileLines   = 25



    Group = Dimensions

      Samples = 38
@@ -375,6 +392,7 @@ Object = IsisCube 


    Group = Pixels

      Type       = UnsignedByte

      ByteOrder  = Lsb

      Base       = 0.0

      Multiplier = 1.0

    End_Group
@@ -401,11 +419,15 @@ Object = IsisCube 
End_Object



Object = Label

  Bytes = 65536

End_Object



Object = Table

  Name        = InstrumentPointing

  StartByte   = 66487

  Bytes       = 40

  Records     = 1

  ByteOrder   = Lsb

  Description = "Created by spiceinit"

  Kernels     = ($clementine1/kernels/fk/clem_v11.tf,

                 $Clementine1/kernels/ck/clem_5sc.bck)
@@ -443,7 +465,10 @@ End_Object 


Object = Table

  Name        = InstrumentPosition

  StartByte   = 66527

  Bytes       = 32

  Records     = 1

  ByteOrder   = Lsb

  Description = "Created by spiceinit"

  Kernels     = $Clementine1/kernels/spk/SPKMERGE_940219_940504_CLEMV001b.bsp
@@ -474,7 +499,10 @@ End_Object 


Object = Table

  Name           = BodyRotation

  StartByte      = 66559

  Bytes          = 40

  Records        = 1

  ByteOrder      = Lsb

  Description    = "Created by spiceinit"

  Kernels        = ($base/kernels/spk/de405.bsp,

                    $base/kernels/pck/pck00008.tpc,
@@ -515,7 +543,10 @@ End_Object 


Object = Table

  Name        = SunPosition

  StartByte   = 66599

  Bytes       = 32

  Records     = 1

  ByteOrder   = Lsb

  Description = "Created by spiceinit"

  Kernels     = $base/kernels/spk/de405.bsp
@@ -546,10 +577,14 @@ End_Object 


Object = History

  Name      = IsisCube

  StartByte = 71980

  Bytes     = 3022

End_Object



Object = OriginalLabel

  Name      = IsisCube

  StartByte = 66631

  Bytes     = 5349

End_Object

End
@@ -558,14 +593,17 @@ unittest: Initializing mosaic 
0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

unittest: Mosaicking unitTest_crop.cub

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

./unitTest_crop.cub is inside the mosaic

/usgs/cpkgs/isis3/data/base/testData/ProcessMapMosaic/unitTest_crop.cub is inside the mosaic

unittest: Mosaicking unitTest_nocrop.cub

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

./unitTest_nocrop.cub is inside the mosaic

/usgs/cpkgs/isis3/data/base/testData/ProcessMapMosaic/unitTest_nocrop.cub is inside the mosaic

Mosaic label: 

Object = IsisCube

  Object = Core

    StartByte   = 65537

    Format      = Tile

    TileSamples = 443

    TileLines   = 128



    Group = Dimensions

      Samples = 2215
@@ -575,6 +613,7 @@ Object = IsisCube 


    Group = Pixels

      Type       = Real

      ByteOrder  = Lsb

      Base       = 0.0

      Multiplier = 1.0

    End_Group
@@ -597,9 +636,12 @@ Object = IsisCube 
End_Object



Object = Label

  Bytes = 65536

End_Object



Object = History

  Name      = IsisCube

  StartByte = 29551617

  Bytes     = 3521

End_Object

End

isis/src/base/objs/ProcessMapMosaic/unitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void IsisMain() { 


  cout << endl << "Testing Mosaic where the input (x, y) is negative,"

          " according to the output cube." << endl;

  QString inputFile = "./unitTest1.cub";

  QString inputFile = "$base/testData/ProcessMapMosaic/unitTest1.cub";

  Cube inCube;

  inCube.open(inputFile);

  PvlGroup mapGroup = inCube.label()->findGroup("Mapping", Pvl::Traverse);

isis/src/base/objs/ProcessMapMosaic/unitTest.lis

+2 −2
Original line number Diff line number Diff line 
./unitTest1.cub

./unitTest2.cub
 
$base/testData/ProcessMapMosaic/unitTest1.cub

$base/testData/ProcessMapMosaic/unitTest2.cub

isis/src/base/objs/ProcessMapMosaic/unitTest_crop.lis

+2 −2
Original line number Diff line number Diff line 
./unitTest_crop.cub

./unitTest_nocrop.cub
 
$base/testData/ProcessMapMosaic/unitTest_crop.cub

$base/testData/ProcessMapMosaic/unitTest_nocrop.cub