Skip to content
Snippets Groups Projects
Unverified Commit 09df8d20 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Msl Focal2Pixel Fix (#492)

* Fixed value order for focal2pixel_samples vector

* Updated driver test
parent 0a26b8fa
No related branches found
No related tags found
No related merge requests found
......@@ -105,7 +105,7 @@ class MslMastcamPds3NaifSpiceDriver(Cahvor, Framer, Pds3Label, NaifSpice, NoDist
: list<double>
focal plane to detector samples
"""
return [1/self.pixel_size, 0, 0]
return [0, 0, 1/self.pixel_size]
@property
def sensor_model_version(self):
......
......@@ -43,6 +43,6 @@ class test_mastcam_pds_naif(unittest.TestCase):
def test_focal2pixel_samples(self):
with patch('ale.drivers.msl_drivers.spice.bods2c', new_callable=PropertyMock, return_value=-76220) as bods2c, \
patch('ale.drivers.msl_drivers.spice.gdpool', new_callable=PropertyMock, return_value=[100]) as gdpool:
np.testing.assert_allclose(self.driver.focal2pixel_samples, [137.96844341513602, 0, 0])
np.testing.assert_allclose(self.driver.focal2pixel_samples, [0, 0, 137.96844341513602])
bods2c.assert_called_with('MSL_MASTCAM_RIGHT')
gdpool.assert_called_with('INS-76220_FOCAL_LENGTH', 0, 1)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment