Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds apollo fixture #4080

Merged
merged 13 commits into from
Oct 29, 2020
Merged

Adds apollo fixture #4080

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4d1505d
jigsaw to app conversion and remove unnecessary tests
krlberry Oct 19, 2020
302db8a
Updated based on comments
krlberry Oct 22, 2020
68d7e5b
Updated spacing
krlberry Oct 22, 2020
e7b930c
Adds apollo fixture for jigsaw tests
krlberry Oct 23, 2020
2eb7693
Merge with dev
krlberry Oct 23, 2020
046d324
Updated to use pvl control network
krlberry Oct 23, 2020
b2ee463
Updated based on comments
krlberry Oct 28, 2020
8f7ffca
remove accidental jigsaw test commit
krlberry Oct 28, 2020
859d158
Update Jigsaw apollo test based on feedback
krlberry Oct 28, 2020
1bc29f5
Updated botched merge
krlberry Oct 29, 2020
cac661d
Remove accidentally updated files
krlberry Oct 29, 2020
dc0b995
merge with dev
krlberry Oct 29, 2020
fb353bf
Adding a space to try to trigger Jenkins
krlberry Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 106 additions & 4 deletions isis/tests/Fixtures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "Fixtures.h"
#include "LineManager.h"
#include "SpecialPixel.h"
#include "ControlNet.h"

namespace Isis {

Expand Down Expand Up @@ -122,6 +123,7 @@ namespace Isis {
TempTestingFiles::SetUp();

std::ifstream isdFile("data/defaultImage/defaultCube.isd");
std::ifstream isdFile1("data/defaultImage/defaultCube.isd");
krlberry marked this conversation as resolved.
Show resolved Hide resolved
std::ifstream cubeLabel("data/defaultImage/defaultCube.pvl");
std::ifstream projCubeLabel("data/defaultImage/projDefaultCube.pvl");

Expand Down Expand Up @@ -253,7 +255,110 @@ namespace Isis {
delete threeImageOverlapFile;
delete twoImageOverlapFile;
}


void ApolloNetwork::SetUp() {
TempTestingFiles::SetUp();

isdFile1 = new FileName("data/apolloNetwork/Sub4-AS15-M-0583_msk.isd");
Kelvinrr marked this conversation as resolved.
Show resolved Hide resolved
isdFile2 = new FileName("data/apolloNetwork/Sub4-AS15-M-0584_msk.isd");
isdFile3 = new FileName("data/apolloNetwork/Sub4-AS15-M-0585_msk.isd");
isdFile4 = new FileName("data/apolloNetwork/Sub4-AS15-M-0586_msk.isd");
isdFile5 = new FileName("data/apolloNetwork/Sub4-AS15-M-0587_msk.isd");
isdFile6 = new FileName("data/apolloNetwork/Sub4-AS15-M-1423.isd");
isdFile7 = new FileName("data/apolloNetwork/Sub4-AS15-M-1537.isd");

label1 = new FileName("data/apolloNetwork/Sub4-AS15-M-0583_msk.pvl");
label2 = new FileName("data/apolloNetwork/Sub4-AS15-M-0584_msk.pvl");
label3 = new FileName("data/apolloNetwork/Sub4-AS15-M-0585_msk.pvl");
label4 = new FileName("data/apolloNetwork/Sub4-AS15-M-0586_msk.pvl");
label5 = new FileName("data/apolloNetwork/Sub4-AS15-M-0587_msk.pvl");
label6 = new FileName("data/apolloNetwork/Sub4-AS15-M-1423.pvl");
label7 = new FileName("data/apolloNetwork/Sub4-AS15-M-1537.pvl");
Kelvinrr marked this conversation as resolved.
Show resolved Hide resolved

cube1 = new Cube();
cube1->fromIsd(tempDir.path() + "/cube1.cub", *label1, *isdFile1, "rw");

cube2 = new Cube();
cube2->fromIsd(tempDir.path() + "/cube2.cub", *label2, *isdFile2, "rw");

cube3 = new Cube();
cube3->fromIsd(tempDir.path() + "/cube3.cub", *label3, *isdFile3, "rw");

cube4 = new Cube();
cube4->fromIsd(tempDir.path() + "/cube4.cub", *label4, *isdFile4, "rw");

cube5 = new Cube();
cube5->fromIsd(tempDir.path() + "/cube5.cub", *label5, *isdFile5, "rw");

cube6 = new Cube();
cube6->fromIsd(tempDir.path() + "/cube6.cub", *label6, *isdFile6, "rw");

cube7 = new Cube();
cube7->fromIsd(tempDir.path() + "/cube7.cub", *label7, *isdFile7, "rw");

cubeList = new FileList();
cubeList->append(cube1->fileName());
cubeList->append(cube2->fileName());
cubeList->append(cube3->fileName());
cubeList->append(cube4->fileName());
cubeList->append(cube5->fileName());
cubeList->append(cube6->fileName());
cubeList->append(cube7->fileName());

cubeListFile = tempDir.path() + "/cubes.lis";
cubeList->write(cubeListFile);

ControlNet inputNet("data/apolloNetwork/apolloNet.pvl");
inputNet.Write(tempDir.path() + "/apolloNet.net");
}

void ApolloNetwork::TearDown() {
if (cube1->isOpen()) {
cube1->close();
}

if (cube2->isOpen()) {
cube1->close();
}

if (cube3->isOpen()) {
cube1->close();
}

if (cube4->isOpen()) {
cube1->close();
}

if (cube5->isOpen()) {
cube1->close();
}

if (cube6->isOpen()) {
cube1->close();
}

if (cube7->isOpen()) {
cube1->close();
}

delete isdFile1;
delete isdFile2;
delete isdFile3;
delete isdFile4;
delete isdFile5;
delete isdFile6;
delete isdFile7;

delete cube1;
delete cube2;
delete cube3;
delete cube4;
delete cube5;
delete cube6;
delete cube7;

delete cubeList;
Kelvinrr marked this conversation as resolved.
Show resolved Hide resolved
}

void MroCube::setInstrument(QString ikid, QString instrumentId, QString spacecraftName) {
PvlGroup &kernels = testCube->label()->findObject("IsisCube").findGroup("Kernels");
Expand Down Expand Up @@ -406,7 +511,4 @@ namespace Isis {
FAIL() << "Failed to create Jitter file" << std::endl;
}
}



}
14 changes: 13 additions & 1 deletion isis/tests/Fixtures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,19 @@ namespace Isis {
void TearDown() override;
};

class ApolloNetwork: public TempTestingFiles {
protected:
Cube *cube1, *cube2, *cube3, *cube4, *cube5, *cube6, *cube7;
FileName *isdFile1, *isdFile2, *isdFile3, *isdFile4, *isdFile5, *isdFile6, *isdFile7,
*cubeLabel, *label1, *label2, *label3, *label4, *label5, *label6, *label7;

Kelvinrr marked this conversation as resolved.
Show resolved Hide resolved
FileList *cubeList;
QString cubeListFile;
Kelvinrr marked this conversation as resolved.
Show resolved Hide resolved

void SetUp() override;
void TearDown() override;
};

class MroCube : public DefaultCube {
protected:
QString ckPath = "data/mroKernels/mroCK.bc";
Expand All @@ -130,7 +143,6 @@ namespace Isis {

void setInstrument(QString ikid, QString instrumentId, QString spacecraftName);
};

}

#endif
227 changes: 227 additions & 0 deletions isis/tests/data/apolloNetwork/Sub4-AS15-M-0583_msk.isd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@

{
"isis_camera_version": 2,
"image_lines": 5725,
"image_samples": 5725,
"name_platform": "APOLLO 15",
"name_sensor": "METRIC",
"reference_height": {
"maxheight": 1000,
"minheight": -1000,
"unit": "m"
},
"name_model": "USGS_ASTRO_FRAME_SENSOR_MODEL",
"center_ephemeris_time": -896911105.26287,
"radii": {
"semimajor": 1737.4,
"semiminor": 1737.4,
"unit": "km"
},
"body_rotation": {
"time_dependent_frames": [
310002,
1
],
"ck_table_start_time": -896911105.2697178,
"ck_table_end_time": -896911105.2697178,
"ck_table_original_size": 1,
"ephemeris_times": [
-896911105.2697178
],
"quaternions": [
[
0.8667010687397797,
-0.17539609663015418,
0.08192270841083461,
-0.45973267947673974
]
],
"angular_velocities": [
[
5.0478167578814155e-08,
-1.011766922017089e-06,
2.4614080110166304e-06
]
],
"constant_frames": [
310001,
310002
],
"constant_rotation": [
0.9999998785270937,
-0.0003097891271165534,
0.00038337513559243684,
0.0003097894216177017,
0.9999999520150048,
-7.087975496937881e-07,
-0.00038337489761840855,
8.275630251118787e-07,
0.9999999265114988
],
"reference_frame": 1
},
"instrument_pointing": {
"time_dependent_frames": [
-915240,
1
],
"ck_table_start_time": -896911105.2697178,
"ck_table_end_time": -896911105.2697178,
"ck_table_original_size": 1,
"ephemeris_times": [
-896911105.2697178
],
"quaternions": [
[
0.8989314685259762,
0.3580264860679803,
-0.15889177856130882,
0.19619544559741997
]
],
"angular_velocities": [
[
0.00021791627029893267,
0.000610121950907551,
-0.000647286294471189
]
],
"reference_frame": 1,
"constant_frames": [
-915240
],
"constant_rotation": [
1.0,
0.0,
0.0,
0.0,
1.0,
0.0,
0.0,
0.0,
1.0
]
},
"naif_keywords": {
"BODY301_RADII": [
1737.4,
1737.4,
1737.4
],
"BODY_FRAME_CODE": 310001,
"INS-915240_FOCAL_LENGTH": 76.054,
"INS-915240_PIXEL_PITCH": 0.005,
"INS-915240_TRANSX": [
0.0,
-0.005,
0.0
],
"INS-915240_TRANSY": [
0.0,
0.0,
0.005
],
"INS-915240_ITRANSS": [
0.0,
-200.0,
0.0
],
"INS-915240_ITRANSL": [
0.0,
0.0,
200.0
],
"INS-915240_PP": [
-0.006,
-0.002
],
"INS-915240_OD_K": [
-1.3361854e-06,
5.2261757e-10,
-5.0728336e-14
],
"INS-915240_DECENTER": [
-5.4958195e-07,
-4.608942e-11,
2.965907
]
},
"detector_sample_summing": 1,
"detector_line_summing": 1,
"focal_length_model": {
"focal_length": 76.054
},
"detector_center": {
"line": null,
"sample": null
},
"starting_detector_line": 0,
"starting_detector_sample": 0,
"focal2pixel_lines": [
0.0,
0.0,
200.0
],
"focal2pixel_samples": [
0.0,
-200.0,
0.0
],
"optical_distortion": {
"radial": {
"coefficients": [
0.0,
0.0,
0.0
]
}
},
"instrument_position": {
"spk_table_start_time": -896911105.2697178,
"spk_table_end_time": -896911105.2697178,
"spk_table_original_size": 1,
"ephemeris_times": [
-896911105.2697178
],
"positions": [
[
774.3132599461753,
1070.739644731857,
1281.8228287146535
]
],
"velocities": [
[
1.4213766312703031,
-0.7718275361962967,
-0.23012707696498996
]
],
"reference_frame": 1
},
"sun_position": {
"spk_table_start_time": -896911105.2697178,
"spk_table_end_time": -896911105.2697178,
"spk_table_original_size": 1,
"ephemeris_times": [
-896911105.2697178
],
"positions": [
[
-93469752.07396643,
109889881.16455618,
47689820.51194201
]
],
"velocities": [
[
-23.732438375062017,
-16.225964838595218,
-7.050420125606732
]
],
"reference_frame": 1
}
}


Loading