From 85d44b85660a7081955f7db640791e2544406dbe Mon Sep 17 00:00:00 2001
From: Jesse Mapel <jam826@nau.edu>
Date: Fri, 12 Apr 2019 11:57:24 -0700
Subject: [PATCH] Added pixel summing in framer (#222)
* Added pixel summing in framer
* Fixed logging in framer intersection
* type fixes
---
include/usgscsm/UsgsAstroFrameSensorModel.h | 4 +-
include/usgscsm/Utilities.h | 19 ++++-
src/UsgsAstroFrameSensorModel.cpp | 91 ++++++++++-----------
src/UsgsAstroLsSensorModel.cpp | 12 ++-
src/Utilities.cpp | 47 +++++++++--
tests/FrameCameraTests.cpp | 68 +++++++++++++++
tests/UtilitiesTests.cpp | 89 +++++++++++++++++++-
tests/data/simpleFramerISD.json | 2 +
8 files changed, 268 insertions(+), 64 deletions(-)
diff --git a/include/usgscsm/UsgsAstroFrameSensorModel.h b/include/usgscsm/UsgsAstroFrameSensorModel.h
index 28e3e25..c07d317 100644
--- a/include/usgscsm/UsgsAstroFrameSensorModel.h
+++ b/include/usgscsm/UsgsAstroFrameSensorModel.h
@@ -339,10 +339,10 @@ class UsgsAstroFrameSensorModel : public csm::RasterGM {
double m_focalLength;
double m_minElevation;
double m_maxElevation;
- double m_linePp;
- double m_samplePp;
double m_startingDetectorSample;
double m_startingDetectorLine;
+ double m_detectorSampleSumming;
+ double m_detectorLineSumming;
std::string m_targetName;
std::string m_modelName;
std::string m_sensorName;
diff --git a/include/usgscsm/Utilities.h b/include/usgscsm/Utilities.h
index 3a94c73..44375d9 100644
--- a/include/usgscsm/Utilities.h
+++ b/include/usgscsm/Utilities.h
@@ -23,10 +23,27 @@ void computeDistortedFocalPlaneCoordinates(
const double& sampleOrigin,
const double& lineOrigin,
const double& sampleSumming,
+ const double& lineSumming,
const double& startingSample,
+ const double& startingLine,
const double iTransS[],
const double iTransL[],
- std::tuple<double, double>& natFocalPlane);
+ double &distortedX,
+ double &distortedY);
+
+void computePixel(
+ const double& distortedX,
+ const double& distortedY,
+ const double& sampleOrigin,
+ const double& lineOrigin,
+ const double& sampleSumming,
+ const double& lineSumming,
+ const double& startingSample,
+ const double& startingLine,
+ const double iTransS[],
+ const double iTransL[],
+ double &line,
+ double &sample);
void calculateRotationMatrixFromQuaternions(
double quaternions[4],
diff --git a/src/UsgsAstroFrameSensorModel.cpp b/src/UsgsAstroFrameSensorModel.cpp
index 1f6cdba..4fdef52 100644
--- a/src/UsgsAstroFrameSensorModel.cpp
+++ b/src/UsgsAstroFrameSensorModel.cpp
@@ -43,12 +43,12 @@ void UsgsAstroFrameSensorModel::reset() {
m_focalLength = 0.0;
m_startingDetectorSample = 0.0;
m_startingDetectorLine = 0.0;
+ m_detectorSampleSumming = 1.0;
+ m_detectorLineSumming = 1.0;
m_targetName = "";
m_ifov = 0;
m_instrumentID = "";
m_focalLengthEpsilon = 0.0;
- m_linePp = 0.0;
- m_samplePp = 0.0;
m_originalHalfLines = 0.0;
m_spacecraftName = "";
m_pixelPitch = 0.0;
@@ -142,8 +142,8 @@ csm::ImageCoord UsgsAstroFrameSensorModel::groundToImage(
// Sensor position
double undistortedx, undistortedy, denom;
denom = m[0][2] * xo + m[1][2] * yo + m[2][2] * zo;
- undistortedx = (f * (m[0][0] * xo + m[1][0] * yo + m[2][0] * zo)/denom) + m_samplePp; //m_samplePp like this assumes mm
- undistortedy = (f * (m[0][1] * xo + m[1][1] * yo + m[2][1] * zo)/denom) + m_linePp;
+ undistortedx = (f * (m[0][0] * xo + m[1][0] * yo + m[2][0] * zo)/denom);
+ undistortedy = (f * (m[0][1] * xo + m[1][1] * yo + m[2][1] * zo)/denom);
// Apply the distortion to the line/sample location and then convert back to line/sample
double distortedX, distortedY;
@@ -153,8 +153,13 @@ csm::ImageCoord UsgsAstroFrameSensorModel::groundToImage(
// Convert distorted mm into line/sample
double sample, line;
- sample = m_iTransS[0] + m_iTransS[1] * distortedX + m_iTransS[2] * distortedY + m_ccdCenter[1];
- line = m_iTransL[0] + m_iTransL[1] * distortedX + m_iTransL[2] * distortedY + m_ccdCenter[0];
+ computePixel(
+ distortedX, distortedY,
+ m_ccdCenter[1], m_ccdCenter[0],
+ m_detectorSampleSumming, m_detectorLineSumming,
+ m_startingDetectorSample, m_startingDetectorLine,
+ &m_iTransS[0], &m_iTransL[0],
+ line, sample);
return csm::ImageCoord(line, sample);
}
@@ -186,7 +191,7 @@ csm::EcefCoord UsgsAstroFrameSensorModel::imageToGround(const csm::ImageCoord &i
double *achievedPrecision,
csm::WarningList *warnings) const {
- MESSAGE_LOG(this->m_logger, "Computeing imageToGround for {}, {}, {}, with desired precision {}",
+ MESSAGE_LOG(this->m_logger, "Computing imageToGround for {}, {}, {}, with desired precision {}",
imagePt.line, imagePt.samp, height, desiredPrecision);
double sample = imagePt.samp;
@@ -199,16 +204,17 @@ csm::EcefCoord UsgsAstroFrameSensorModel::imageToGround(const csm::ImageCoord &i
m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2]);
// Apply the principal point offset, assuming the pp is given in pixels
- double xl, yl, zl, lo, so;
- lo = line - m_linePp;
- so = sample - m_samplePp;
+ double xl, yl, zl;
// Convert from the pixel space into the metric space
- double line_center, sample_center, x_camera, y_camera;
- line_center = m_ccdCenter[0];
- sample_center = m_ccdCenter[1];
- y_camera = m_transY[0] + m_transY[1] * (lo - line_center) + m_transY[2] * (so - sample_center);
- x_camera = m_transX[0] + m_transX[1] * (lo - line_center) + m_transX[2] * (so - sample_center);
+ double x_camera, y_camera;
+ computeDistortedFocalPlaneCoordinates(
+ line, sample,
+ m_ccdCenter[1], m_ccdCenter[0],
+ m_detectorSampleSumming, m_detectorLineSumming,
+ m_startingDetectorSample, m_startingDetectorLine,
+ &m_iTransS[0], &m_iTransL[0],
+ x_camera, y_camera);
// Apply the distortion model (remove distortion)
double undistortedX, undistortedY;
@@ -271,11 +277,14 @@ csm::EcefLocus UsgsAstroFrameSensorModel::imageToRemoteImagingLocus(const csm::I
MESSAGE_LOG(this->m_logger, "Computeing imageToProximateImagingLocus for {}, {}, {}, with desired precision {}",
imagePt.line, imagePt.samp, desiredPrecision);
// Find the line,sample on the focal plane (mm)
- // CSM center = 0.5, MDIS IK center = 1.0
- double row = imagePt.line - m_ccdCenter[0];
- double col = imagePt.samp - m_ccdCenter[1];
- double focalPlaneX = m_transX[0] + m_transX[1] * row + m_transX[2] * col;
- double focalPlaneY = m_transY[0] + m_transY[1] * row + m_transY[2] * col;
+ double focalPlaneX, focalPlaneY;
+ computeDistortedFocalPlaneCoordinates(
+ imagePt.line, imagePt.samp,
+ m_ccdCenter[1], m_ccdCenter[0],
+ m_detectorSampleSumming, m_detectorLineSumming,
+ m_startingDetectorSample, m_startingDetectorLine,
+ &m_iTransS[0], &m_iTransL[0],
+ focalPlaneY, focalPlaneY);
// Distort
double undistortedFocalPlaneX, undistortedFocalPlaneY;
@@ -707,13 +716,13 @@ std::string UsgsAstroFrameSensorModel::getModelState() const {
{"m_sunPosition", {m_sunPosition[0], m_sunPosition[1], m_sunPosition[2]}},
{"m_startingDetectorSample", m_startingDetectorSample},
{"m_startingDetectorLine", m_startingDetectorLine},
+ {"m_detectorSampleSumming", m_detectorSampleSumming},
+ {"m_detectorLineSumming", m_detectorLineSumming},
{"m_targetName", m_targetName},
{"m_ifov", m_ifov},
{"m_instrumentID", m_instrumentID},
{"m_focalLengthEpsilon", m_focalLengthEpsilon},
{"m_ccdCenter", {m_ccdCenter[0], m_ccdCenter[1]}},
- {"m_linePp", m_linePp},
- {"m_samplePp", m_samplePp},
{"m_minElevation", m_minElevation},
{"m_maxElevation", m_maxElevation},
{"m_distortionType", m_distortionType},
@@ -746,6 +755,8 @@ bool UsgsAstroFrameSensorModel::isValidModelState(const std::string& stringState
"m_focalLength",
"m_startingDetectorSample",
"m_startingDetectorLine",
+ "m_detectorSampleSumming",
+ "m_detectorLineSumming",
"m_focalLengthEpsilon",
"m_nLines",
"m_nSamples",
@@ -822,6 +833,8 @@ void UsgsAstroFrameSensorModel::replaceModelState(const std::string& stringState
m_focalLength = state.at("m_focalLength").get<double>();
m_startingDetectorSample = state.at("m_startingDetectorSample").get<double>();
m_startingDetectorLine = state.at("m_startingDetectorLine").get<double>();
+ m_detectorSampleSumming = state.at("m_detectorSampleSumming").get<double>();
+ m_detectorLineSumming = state.at("m_detectorLineSumming").get<double>();
m_focalLengthEpsilon = state.at("m_focalLengthEpsilon").get<double>();
m_nLines = state.at("m_nLines").get<int>();
m_nSamples = state.at("m_nSamples").get<int>();
@@ -852,29 +865,6 @@ void UsgsAstroFrameSensorModel::replaceModelState(const std::string& stringState
m_logger = spdlog::basic_logger_mt(m_logFile, m_logFile);
}
}
-
-
- // Leaving unused params commented out
- // m_targetName = state.at("m_targetName").get<std::string>();
- // m_ifov = state.at("m_ifov").get<double>();
- // m_instrumentID = state.at("m_instrumentID").get<std::string>();
- // m_currentParameterCovariance = state.at("m_currentParameterCovariance").get<std::vector<double>>();
- // m_noAdjustments = state.at("m_noAdjustments").get<std::vector<double>>();
- // m_linePp = state.at("m_linePp").get<double>();
- // m_samplePp = state.at("m_samplePp").get<double>();
- // m_originalHalfLines = state.at("m_originalHalfLines").get<double>();
- // m_spacecraftName = state.at("m_spacecraftName").get<std::string>();
- // m_pixelPitch = state.at("m_pixelPitch").get<double>();
- // m_ephemerisTime = state.at("m_ephemerisTime").get<double>();
- // m_originalHalfSamples = state.at("m_originalHalfSamples").get<double>();
- // m_boresight = state.at("m_boresight").get<std::vector<double>>();
-
- // Cast int vector to csm::param::Type vector by simply copying it
- // std::vector<int> paramType = state.at("m_parameterType").get<std::vector<int>>();
- // m_parameterType = std::vector<csm::param::Type>();
- // for(auto &t : paramType){
- // paramType.push_back(static_cast<csm::param::Type>(t));
- // }
}
catch(std::out_of_range& e) {
throw csm::Error(csm::Error::SENSOR_MODEL_NOT_CONSTRUCTIBLE,
@@ -898,6 +888,8 @@ std::string UsgsAstroFrameSensorModel::constructStateFromIsd(const std::string&
state["m_startingDetectorSample"] = getDetectorStartingSample(isd, parsingWarnings);
state["m_startingDetectorLine"] = getDetectorStartingLine(isd, parsingWarnings);
+ state["m_detectorSampleSumming"] = getSampleSumming(isd, parsingWarnings);
+ state["m_detectorLineSumming"] = getLineSumming(isd, parsingWarnings);
// get focal length
state["m_focalLength"] = getFocalLength(isd, parsingWarnings);
@@ -1243,11 +1235,9 @@ void UsgsAstroFrameSensorModel::losEllipsoidIntersect(
{
MESSAGE_LOG(this->m_logger, "Calculating losEllipsoidIntersect with height: {},\n\
xc: {}, yc: {}, zc: {}\n\
- xl: {}, yl: {}, zl: {}\n\
- x: {}, y: {}, z{}", height,
+ xl: {}, yl: {}, zl: {}", height,
xc, yc, zc,
- xl, yl, zl,
- x, y, z);
+ xl, yl, zl);
// Helper function which computes the intersection of the image ray
// with an expanded ellipsoid. All vectors are in earth-centered-fixed
// coordinate system with origin at the center of the earth.
@@ -1282,6 +1272,9 @@ void UsgsAstroFrameSensorModel::losEllipsoidIntersect(
x = xc + scale * xl;
y = yc + scale * yl;
z = zc + scale * zl;
+
+ MESSAGE_LOG(this->m_logger, "Calculated losEllipsoidIntersect at: {}, {}, {}",
+ x, y, z);
}
diff --git a/src/UsgsAstroLsSensorModel.cpp b/src/UsgsAstroLsSensorModel.cpp
index c2dbdcd..ead2b43 100644
--- a/src/UsgsAstroLsSensorModel.cpp
+++ b/src/UsgsAstroLsSensorModel.cpp
@@ -1627,12 +1627,18 @@ void UsgsAstroLsSensorModel::losToEcf(
double fractionalLine = line - floor(line);
// Compute distorted image coordinates in mm (sample, line on image (pixels) -> focal plane
- std::tuple<double, double> natFocalPlane;
- computeDistortedFocalPlaneCoordinates(fractionalLine, sampleUSGSFull, m_detectorSampleOrigin, m_detectorLineOrigin, m_detectorSampleSumming, m_startingSample, m_iTransS, m_iTransL, natFocalPlane);
+ double distortedFocalPlaneX, distortedFocalPlaneY;
+ computeDistortedFocalPlaneCoordinates(
+ fractionalLine, sampleUSGSFull,
+ m_detectorSampleOrigin, m_detectorLineOrigin,
+ m_detectorSampleSumming, 1.0,
+ m_startingSample, 0.0,
+ m_iTransS, m_iTransL,
+ distortedFocalPlaneX, distortedFocalPlaneY);
// Remove lens distortion
double undistortedFocalPlaneX, undistortedFocalPlaneY;
- removeDistortion(std::get<0>(natFocalPlane), std::get<1>(natFocalPlane),
+ removeDistortion(distortedFocalPlaneX, distortedFocalPlaneY,
undistortedFocalPlaneX, undistortedFocalPlaneY,
m_opticalDistCoeffs,
DistortionType::RADIAL);
diff --git a/src/Utilities.cpp b/src/Utilities.cpp
index 5d5efb3..59f2636 100644
--- a/src/Utilities.cpp
+++ b/src/Utilities.cpp
@@ -62,24 +62,29 @@ void calculateRotationMatrixFromQuaternions(
// in - startingSample - first ccd sample for the image
// in - iTransS[3] - the transformation from focal plane to ccd samples
// in - iTransL[3] - the transformation from focal plane to ccd lines
-// out - natFocalPlane
+// out - distortedX
+// out - distortedY
void computeDistortedFocalPlaneCoordinates(
const double& line,
const double& sample,
const double& sampleOrigin,
const double& lineOrigin,
const double& sampleSumming,
+ const double& lineSumming,
const double& startingSample,
+ const double& startingLine,
const double iTransS[],
const double iTransL[],
- std::tuple<double, double>& natFocalPlane)
+ double &distortedX,
+ double &distortedY)
{
double detSample = sample * sampleSumming + startingSample;
+ double detLine = line * lineSumming + startingLine;
double m11 = iTransL[1];
double m12 = iTransL[2];
double m21 = iTransS[1];
double m22 = iTransS[2];
- double t1 = line - lineOrigin - iTransL[0];
+ double t1 = detLine - lineOrigin - iTransL[0];
double t2 = detSample - sampleOrigin - iTransS[0];
double determinant = m11 * m22 - m12 * m21;
double p11 = m11 / determinant;
@@ -87,8 +92,40 @@ void computeDistortedFocalPlaneCoordinates(
double p21 = -m21 / determinant;
double p22 = m22 / determinant;
- std::get<0>(natFocalPlane) = p11 * t1 + p12 * t2;
- std::get<1>(natFocalPlane) = p21 * t1 + p22 * t2;
+ distortedX = p11 * t1 + p12 * t2;
+ distortedY = p21 * t1 + p22 * t2;
+};
+
+// Compue the image pixel for a distorted focal plane coordinate
+// in - line
+// in - sample
+// in - sampleOrigin - the origin of the ccd coordinate system relative to the top left of the ccd
+// in - lineOrigin - the origin of the ccd coordinate system relative to the top left of the ccd
+// in - sampleSumming
+// in - startingSample - first ccd sample for the image
+// in - iTransS[3] - the transformation from focal plane to ccd samples
+// in - iTransL[3] - the transformation from focal plane to ccd lines
+// out - natFocalPlane
+void computePixel(
+ const double& distortedX,
+ const double& distortedY,
+ const double& sampleOrigin,
+ const double& lineOrigin,
+ const double& sampleSumming,
+ const double& lineSumming,
+ const double& startingSample,
+ const double& startingLine,
+ const double iTransS[],
+ const double iTransL[],
+ double &line,
+ double &sample)
+{
+ double centeredSample = iTransS[0] + iTransS[1] * distortedX + iTransS[2] * distortedY;
+ double centeredLine = iTransL[0] + iTransL[1] * distortedX + iTransL[2] * distortedY;
+ double detSample = centeredSample + sampleOrigin;
+ double detLine = centeredLine + lineOrigin;
+ sample = (detSample - startingSample) / sampleSumming;
+ line = (detLine - startingLine) / lineSumming;
};
// Define imaging ray in image space (In other words, create a look vector in camera space)
diff --git a/tests/FrameCameraTests.cpp b/tests/FrameCameraTests.cpp
index 20ad76d..d2ec2a3 100644
--- a/tests/FrameCameraTests.cpp
+++ b/tests/FrameCameraTests.cpp
@@ -301,3 +301,71 @@ TEST_F(FrameStateTest, SemiMinorAxis10x_SlightlyOffCenter) {
delete sensorModel;
sensorModel = NULL;
}
+
+
+TEST_F(FrameStateTest, SampleSumming) {
+ std::string key = "m_detectorSampleSumming";
+ double newValue = 2.0;
+ UsgsAstroFrameSensorModel* sensorModel = createModifiedStateSensorModel(key, newValue);
+
+ ASSERT_NE(sensorModel, nullptr);
+ csm::ImageCoord imagePt(7.5, 3.75);
+ csm::EcefCoord groundPt = sensorModel->imageToGround(imagePt, 0.0);
+ EXPECT_NEAR(groundPt.x, 10.0, 1e-8);
+ EXPECT_NEAR(groundPt.y, 0, 1e-8);
+ EXPECT_NEAR(groundPt.z, 0, 1e-8);
+
+ delete sensorModel;
+ sensorModel = NULL;
+}
+
+
+TEST_F(FrameStateTest, LineSumming) {
+ std::string key = "m_detectorLineSumming";
+ double newValue = 2.0;
+ UsgsAstroFrameSensorModel* sensorModel = createModifiedStateSensorModel(key, newValue);
+
+ ASSERT_NE(sensorModel, nullptr);
+ csm::ImageCoord imagePt(3.75, 7.5);
+ csm::EcefCoord groundPt = sensorModel->imageToGround(imagePt, 0.0);
+ EXPECT_NEAR(groundPt.x, 10.0, 1e-8);
+ EXPECT_NEAR(groundPt.y, 0, 1e-8);
+ EXPECT_NEAR(groundPt.z, 0, 1e-8);
+
+ delete sensorModel;
+ sensorModel = NULL;
+}
+
+
+TEST_F(FrameStateTest, StartSample) {
+ std::string key = "m_startingDetectorSample";
+ double newValue = 5.0;
+ UsgsAstroFrameSensorModel* sensorModel = createModifiedStateSensorModel(key, newValue);
+
+ ASSERT_NE(sensorModel, nullptr);
+ csm::ImageCoord imagePt(7.5, 2.5);
+ csm::EcefCoord groundPt = sensorModel->imageToGround(imagePt, 0.0);
+ EXPECT_NEAR(groundPt.x, 10.0, 1e-8);
+ EXPECT_NEAR(groundPt.y, 0, 1e-8);
+ EXPECT_NEAR(groundPt.z, 0, 1e-8);
+
+ delete sensorModel;
+ sensorModel = NULL;
+}
+
+
+TEST_F(FrameStateTest, StartLine) {
+ std::string key = "m_startingDetectorLine";
+ double newValue = 5.0;
+ UsgsAstroFrameSensorModel* sensorModel = createModifiedStateSensorModel(key, newValue);
+
+ ASSERT_NE(sensorModel, nullptr);
+ csm::ImageCoord imagePt(2.5, 7.5);
+ csm::EcefCoord groundPt = sensorModel->imageToGround(imagePt, 0.0);
+ EXPECT_NEAR(groundPt.x, 10.0, 1e-8);
+ EXPECT_NEAR(groundPt.y, 0, 1e-8);
+ EXPECT_NEAR(groundPt.z, 0, 1e-8);
+
+ delete sensorModel;
+ sensorModel = NULL;
+}
diff --git a/tests/UtilitiesTests.cpp b/tests/UtilitiesTests.cpp
index 9750c1f..549b9c0 100644
--- a/tests/UtilitiesTests.cpp
+++ b/tests/UtilitiesTests.cpp
@@ -54,10 +54,91 @@ TEST(UtilitiesTests, calculateRotationMatrixFromQuaternions) {
TEST(UtilitiesTests, computeDistortedFocalPlaneCoordinates) {
double iTransS[] = {0.0, 0.0, 10.0};
double iTransL[] = {0.0, 10.0, 0.0};
- std::tuple<double, double> natFocalPlane;
- computeDistortedFocalPlaneCoordinates(0.5, 4, 8, 0.5, 1, 0, iTransS, iTransL, natFocalPlane);
- EXPECT_DOUBLE_EQ(std::get<0> (natFocalPlane), 0);
- EXPECT_DOUBLE_EQ(std::get<1> (natFocalPlane), -0.4);
+ double undistortedFocalPlaneX, undistortedFocalPlaneY;
+ computeDistortedFocalPlaneCoordinates(
+ 0.5, 4.0,
+ 8.0, 0.5,
+ 1.0, 1.0,
+ 0.0, 0.0,
+ iTransS, iTransL,
+ undistortedFocalPlaneX, undistortedFocalPlaneY);
+ EXPECT_DOUBLE_EQ(undistortedFocalPlaneX, 0);
+ EXPECT_DOUBLE_EQ(undistortedFocalPlaneY, -0.4);
+}
+
+TEST(UtilitiesTests, computeDistortedFocalPlaneCoordinatesSumming) {
+ double iTransS[] = {0.0, 0.0, 10.0};
+ double iTransL[] = {0.0, 10.0, 0.0};
+ double undistortedFocalPlaneX, undistortedFocalPlaneY;
+ computeDistortedFocalPlaneCoordinates(
+ 2.0, 4.0,
+ 8.0, 8.0,
+ 2.0, 2.0,
+ 0.0, 0.0,
+ iTransS, iTransL,
+ undistortedFocalPlaneX, undistortedFocalPlaneY);
+ EXPECT_DOUBLE_EQ(undistortedFocalPlaneX, -0.4);
+ EXPECT_DOUBLE_EQ(undistortedFocalPlaneY, 0);
+}
+
+TEST(UtilitiesTests, computeDistortedFocalPlaneCoordinatesStart) {
+ double iTransS[] = {0.0, 0.0, 10.0};
+ double iTransL[] = {0.0, 10.0, 0.0};
+ double undistortedFocalPlaneX, undistortedFocalPlaneY;
+ computeDistortedFocalPlaneCoordinates(
+ 2.0, 4.0,
+ 8.0, 8.0,
+ 1.0, 1.0,
+ 2.0, 1.0,
+ iTransS, iTransL,
+ undistortedFocalPlaneX, undistortedFocalPlaneY);
+ EXPECT_DOUBLE_EQ(undistortedFocalPlaneX, -0.5);
+ EXPECT_DOUBLE_EQ(undistortedFocalPlaneY, -0.2);
+}
+
+TEST(UtilitiesTests, computePixel) {
+ double iTransS[] = {0.0, 0.0, 10.0};
+ double iTransL[] = {0.0, 10.0, 0.0};
+ double line, sample;
+ computePixel(
+ 0.0, -0.4,
+ 8.0, 0.5,
+ 1.0, 1.0,
+ 0.0, 0.0,
+ iTransS, iTransL,
+ line, sample);
+ EXPECT_DOUBLE_EQ(line, 0.5);
+ EXPECT_DOUBLE_EQ(sample, 4.0);
+}
+
+TEST(UtilitiesTests, computePixelSumming) {
+ double iTransS[] = {0.0, 0.0, 10.0};
+ double iTransL[] = {0.0, 10.0, 0.0};
+ double line, sample;
+ computePixel(
+ -0.4, 0.0,
+ 8.0, 8.0,
+ 2.0, 2.0,
+ 0.0, 0.0,
+ iTransS, iTransL,
+ line, sample);
+ EXPECT_DOUBLE_EQ(line, 2.0);
+ EXPECT_DOUBLE_EQ(sample, 4.0);
+}
+
+TEST(UtilitiesTests, computePixelStart) {
+ double iTransS[] = {0.0, 0.0, 10.0};
+ double iTransL[] = {0.0, 10.0, 0.0};
+ double line, sample;
+ computePixel(
+ -0.5, -0.2,
+ 8.0, 8.0,
+ 1.0, 1.0,
+ 2.0, 1.0,
+ iTransS, iTransL,
+ line, sample);
+ EXPECT_DOUBLE_EQ(line, 2.0);
+ EXPECT_DOUBLE_EQ(sample, 4.0);
}
TEST(UtilitiesTests, createCameraLookVector) {
diff --git a/tests/data/simpleFramerISD.json b/tests/data/simpleFramerISD.json
index 9ce2240..b6259b6 100644
--- a/tests/data/simpleFramerISD.json
+++ b/tests/data/simpleFramerISD.json
@@ -51,6 +51,8 @@
},
"starting_detector_line": 0,
"starting_detector_sample": 0,
+ "detector_sample_summing": 1.0,
+ "detector_line_summing": 1.0,
"starting_ephemeris_time": 0,
"sun_position": {
"unit": "m",
--
GitLab