Unverified Commit e891c679 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Lro Wac fix (#595) 

* Set LRO WAC ephemeris times equal to the ISIS times

* Initial addition for lro wac load test

Further edits to the lro wac ephemeris times

Update lro wac load test

Refined sliced kernels to be much smaller

* Moved frame number fix from type sensorinto concrete driver

* added changelog entry

* Updated lro test

* Fixed other lro wac tests
parent 025cea7e

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ release. 
- Apollo Metric drivers, tests, and data [#533](https://github.com/DOI-USGS/ale/pull/533)

- Rosetta Virtis drivers, tests, and data [#520](https://github.com/DOI-USGS/ale/pull/520)



### Changed

- Changed how push frame sensor drivers compute the `ephemeris_time` property [#595](https://github.com/DOI-USGS/ale/pull/595)



### Fixed



- Fixed landed sensors to correctly project locally [#590](https://github.com/DOI-USGS/ale/pull/590)

ale/base/type_sensor.py

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ class PushFrame(): 
          ephemeris times split based on image lines

        """



        return np.arange(self.ephemeris_start_time + (.5 * self.exposure_duration), self.ephemeris_stop_time + self.interframe_delay, self.interframe_delay)

        return np.arange(self.ephemeris_start_time, self.ephemeris_stop_time, self.interframe_delay)





    @property
@@ -162,7 +162,7 @@ class PushFrame(): 
        : double

          Center ephemeris time for an image

        """

        return self.ephemeris_start_time + (self.interframe_delay) * (self.num_frames - 1) + self.exposure_duration

        return self.ephemeris_start_time + (self.interframe_delay * self.num_frames)

ale/drivers/lro_drivers.py

+3 −4
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ class LroLrocWacIsisLabelNaifSpiceDriver(PushFrame, IsisLabel, NaifSpice, Radial 


    @property

    def sensor_model_version(self):

        return 2

        return 3





    @property
@@ -1111,8 +1111,7 @@ class LroLrocWacIsisLabelNaifSpiceDriver(PushFrame, IsisLabel, NaifSpice, Radial 
          ephemeris start time of the image

        """

        if not hasattr(self, '_ephemeris_start_time'):

            sclock = self.label['IsisCube']['Instrument']['SpacecraftClockStartCount']

            self._ephemeris_start_time = spice.scs2e(self.spacecraft_id, sclock)

            self._ephemeris_start_time = super().ephemeris_start_time + (.5 * self.exposure_duration)

        return self._ephemeris_start_time
@@ -1192,7 +1191,7 @@ class LroLrocWacIsisLabelNaifSpiceDriver(PushFrame, IsisLabel, NaifSpice, Radial 
        : int

          Number of frames in the image

        """

        return self.image_lines // (self.framelet_height // self.sampling_factor)

        return (self.image_lines // (self.framelet_height // self.sampling_factor)) + 1





    @property

tests/pytests/data/isds/lrolrocwac_isd.json

+6695 −1152

File changed.

Preview size limit exceeded, changes collapsed.

tests/pytests/data/wac0000a1c4.uv.even/lro_clkcor_2021363_v00.tsc

0 → 100755
+26064 −0

File added.

Preview size limit exceeded, changes collapsed.