Skip to content
Snippets Groups Projects
Commit 09ad155f authored by Erin (Josh) Rigler's avatar Erin (Josh) Rigler
Browse files

Pass unit tests again

The first attempt to fix TimeseriesUtility.pad_and_trim_trace() broke
a unit test. I'm not sure I agree with what the unit test defined as
passing, but I do understand the logic. This now satisfies the logic
of the unit test(s), while still fixing the floating point precision
problem to the default resolution of UTCDateTime objects (that is,
1e-6 or microseconds)
parent 3703dda2
No related branches found
No related tags found
No related merge requests found
......@@ -514,7 +514,7 @@ def pad_and_trim_trace(trace, starttime, endtime):
trace.stats.starttime = trace_starttime
elif trace_starttime > starttime:
# pad to starttime
cnt = round((trace_starttime - starttime) / trace_delta)
cnt = int(round((trace_starttime - starttime) / trace_delta, 6))
if cnt > 0:
trace.data = numpy.concatenate(
[numpy.full(cnt, numpy.nan, dtype=numpy.float64), trace.data]
......@@ -528,7 +528,7 @@ def pad_and_trim_trace(trace, starttime, endtime):
trace.stats.npts = len(trace.data)
elif trace_endtime < endtime:
# pad to endtime
cnt = round((endtime - trace_endtime) / trace.stats.delta)
cnt = int(round((endtime - trace_endtime) / trace.stats.delta, 6))
if cnt > 0:
trace.data = numpy.concatenate(
[trace.data, numpy.full(cnt, numpy.nan, dtype=numpy.float64)]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment