Commit 72b16f7a authored by acpaquette's avatar acpaquette
Browse files

Two sun positions (#542) 

* Enforced getting two sun positions if instrument is not a framer

* Updated tests

* Updated changelog

* Removed leftover prints

* One more leftover print
parent 10d42f5b

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ release. 


## [Unreleased]



### Changed

- The NaifSpice class now gets two sun positions/velocities when a driver has more than one ephemeris time [#542](https://github.com/DOI-USGS/ale/pull/542)



### Fixed

- MexHrscIsisLabelNaifSpice and MexHrscPds3NaifSpice have had there ephemeris times changed and sampling factor updated. MexHrscIsisLabelNaifSpice has also had it's focal length, and focal plane translation updated to reflect those found in the MexHrscPds3NaifSpice driver [#541](https://github.com/DOI-USGS/ale/pull/541)

- MGS drivers now account for a time bias in the ephemeris data [#538](https://github.com/DOI-USGS/ale/pull/538)

ale/base/data_naif.py

+3 −1
Original line number Diff line number Diff line
@@ -328,7 +328,9 @@ class NaifSpice(): 
        : (sun_positions, sun_velocities)

          a tuple containing a list of sun positions, a list of sun velocities

        """

        times = [self.center_ephemeris_time]

        times = self.ephemeris_time

        if len(times) > 1:

            times = [times[0], times[-1]]

        positions = []

        velocities = []

tests/pytests/data/isds/chandrayaan_mrffr_isd.json

+21 −10
Original line number Diff line number Diff line
@@ -58667,24 +58667,35 @@ 
    "reference_frame": 1

  },

  "sun_position": {

    "spk_table_start_time": 284618274.5028643,

    "spk_table_end_time": 284618274.5028643,

    "spk_table_original_size": 1,

    "spk_table_start_time": 284618195.65060276,

    "spk_table_end_time": 284618353.35512584,

    "spk_table_original_size": 2,

    "ephemeris_times": [

      284618274.5028643

      284618195.65060276,

      284618353.35512584

    ],

    "positions": [

      [

        43780497.0799206,

        -129064945.41639775,

        -55987592.45489679

        43778143.55392012,

        -129065559.6861403,

        -55987861.91428987

      ],

      [

        43782850.60459468,

        -129064331.09970978,

        -55987322.97221426

      ]

    ],

    "velocities": [

      [

        29.84809594419459,

        7.7898174083485205,

        3.41947441993111

        29.84729868663574,

        7.7898328838071755,

        3.4171344179000442

      ],

      [

        29.84725641918031,

        7.791031989531533,

        3.4176990497686783

      ]

    ],

    "reference_frame": 1

tests/pytests/data/isds/chandrayannM3_isd.json

+21 −10
Original line number Diff line number Diff line
@@ -390,24 +390,35 @@ 
    "reference_frame": 1

  },

  "sun_position": {

    "spk_table_start_time": 299622941.73534995,

    "spk_table_end_time": 299622941.73534995,

    "spk_table_original_size": 1,

    "spk_table_start_time": 299622941.60814995,

    "spk_table_end_time": 299622941.86254996,

    "spk_table_original_size": 2,

    "ephemeris_times": [

      299622941.73534995

      299622941.60814995,

      299622941.86254996

    ],

    "positions": [

      [

        -22279396.272817865,

        138086310.683749,

        59901633.861951254

        -22279392.552556925,

        138086311.0772047,

        59901634.029351056

      ],

      [

        -22279399.993010454,

        138086310.29030323,

        59901633.69455383

      ]

    ],

    "velocities": [

      [

        -29.247063986944152,

        -3.0931661850381134,

        -1.3160268288136903

        -29.247063783209654,

        -3.0931654356540093,

        -1.3160264669418211

      ],

      [

        -29.24706420755107,

        -3.0931669393224728,

        -1.3160271856310302

      ]

    ],

    "reference_frame": 1

tests/pytests/data/isds/crism_isd.json

+21 −10
Original line number Diff line number Diff line
@@ -654,24 +654,35 @@ 
    "reference_frame": 1

  },

  "sun_position": {

    "spk_table_start_time": 221051479.28741914,

    "spk_table_end_time": 221051479.28741914,

    "spk_table_original_size": 1,

    "spk_table_start_time": 221051477.42023167,

    "spk_table_end_time": 221051481.15460664,

    "spk_table_original_size": 2,

    "ephemeris_times": [

      221051479.28741914

      221051477.42023167,

      221051481.15460664

    ],

    "positions": [

      [

        93940764.07503387,

        187971285.58029893,

        83678697.57627732

        93940806.93671662,

        187971272.44155774,

        83678690.39204721

      ],

      [

        93940721.21262354,

        187971298.71918067,

        83678704.760984

      ]

    ],

    "velocities": [

      [

        -22.955405861129986,

        7.0366856928262855,

        3.8477487712670118

        -22.95540384928137,

        7.036689712027553,

        3.847750575389713

      ],

      [

        -22.955407872190698,

        7.036681662141811,

        3.84774699181132

      ]

    ],

    "reference_frame": 1