diff --git a/orekit-conda-recipe/CHANGES.txt b/orekit-conda-recipe/CHANGES.txt index f9a916fbffe3356493774288e42b8a27fbedfeab..6422a326d099e8940cac0b2a88beccea1e64a0c1 100644 --- a/orekit-conda-recipe/CHANGES.txt +++ b/orekit-conda-recipe/CHANGES.txt @@ -1,5 +1,8 @@ Changelog python orekit package +2016-11-13 Version 8.0 Build 1 +- Corrected the datetime to absolute conversions, microseconds was incorrectly converted + 2016-07-03 Version 8.0 Build 0 - Updated to orekit 8.0 version with fixes as of 3rd July - Changed from apache common maths3 to hipparhcus diff --git a/orekit-conda-recipe/meta.yaml b/orekit-conda-recipe/meta.yaml index 106d5893920d21674f4bd11bdc9f6b185d849aca..a7dae071fc3d85a1fd37fe21324d0d2c73e13f66 100644 --- a/orekit-conda-recipe/meta.yaml +++ b/orekit-conda-recipe/meta.yaml @@ -6,7 +6,7 @@ build: # If this is a new build for the same version, increment the build # number. If you do not include this key, it defaults to 0. - number: 0 + number: 1 # Builds: # 1 - orekit 7.1dev0 version from git 2015-10-05 # 2 - orekit 7.1dev0 version from git 2015-12-17 diff --git a/orekit-conda-recipe/pyhelpers.py b/orekit-conda-recipe/pyhelpers.py index ab39a817ccc34eec048d8ea76ba9c1fd4ec5c806..0e2064d430fc7d1cf8336182d804fe29ff613e8e 100644 --- a/orekit-conda-recipe/pyhelpers.py +++ b/orekit-conda-recipe/pyhelpers.py @@ -67,7 +67,26 @@ def absolutedate_to_datetime(orekit_absolutedate): or_time.getHour(), or_time.getMinute(), int(math.floor(seconds)), - int(1000.0 * (seconds - math.floor(seconds)))) + int(1000000.0 * (seconds - math.floor(seconds)))) + +def datetime_to_absolutedate(dt_date): + ''' Converts between orekit.AbsoluteDate objects + and python datetime objects (utc) + + Args: + dt_date (datetime): python datetime object to convert + + Returns: + AbsoluteDate: time in orekit format''' + + utc = TimeScalesFactory.getUTC() + return AbsoluteDate(dt_date.year, + dt_date.month, + dt_date.day, + dt_date.hour, + dt_date.minute, + dt_date.second + dt_date.microsecond / 1000000., + utc) def to_elevationmask(az, el):