Add required Timescale argument #10
Conversation
|
This commit seems to have also been made directly to master in 8149c40 |
| @@ -387,7 +387,7 @@ def getOutputId(self, expRefList, calibId): | |||
| outputId.update(calibId) | |||
| return outputId | |||
|
|
|||
| def getMjd(self, dataId): | |||
| def getMjd(self, dataId, timeSystem=dafBase.DateTime.MJD): | |||
There was a problem hiding this comment.
This should be a time scale (DateTime.UTC for the old behavior), not a time system. The default value is incorrect in this context (though it may do something because Python treats enums as small ints) and the variable name is misleading.
| @@ -396,7 +396,7 @@ def getMjd(self, dataId): | |||
| elif not dateObs.endswith("Z"): | |||
| dateObs += "Z" | |||
|
|
|||
| return dafBase.DateTime(dateObs).get(dafBase.DateTime.MJD) | |||
| return dafBase.DateTime(dateObs, timeSystem).get(dafBase.DateTime.MJD) | |||
There was a problem hiding this comment.
The time scale for get defaults to TAI. Thus with the old behavior the ISO string would be treated as UTC, but the returned MJD would be TAI, introducing a 30-ish second offset. But that is not documented as the desired behavior. Please either document it or fix it by providing the time system argument to get so the method is self-consistent (UTC in, UTC out, or TAI in, TAI out).
N.b. was rebased to use C++ name, but vestiges may be visible on master due to user error.
RobertLuptonTheGood
force-pushed
the
tickets/DM-7742
branch
from
fe0b903
to
051736e
Compare
| @@ -387,7 +387,7 @@ def getOutputId(self, expRefList, calibId): | |||
| outputId.update(calibId) | |||
| return outputId | |||
|
|
|||
| def getMjd(self, dataId): | |||
| def getMjd(self, dataId, timescale=dafBase.DateTime.MJD): | |||
There was a problem hiding this comment.
@RobertLuptonTheGood this is still wrong. MJD is a DateSystem. The timescale you want is DateTime.UTC.
| @@ -387,7 +387,7 @@ def getOutputId(self, expRefList, calibId): | |||
| outputId.update(calibId) | |||
| return outputId | |||
|
|
|||
| def getMjd(self, dataId): | |||
| def getMjd(self, dataId, timescale=dafBase.DateTime.MJD): | |||
| """Determine the Modified Julian Date (MJD) from a data identifier""" | |||
There was a problem hiding this comment.
You might want to indicate that this is returning the MJD TAI.
No description provided.