[segyio] 257/376: Interpret delay recording time/t0 as milliseconds

[Jørgen Kvalsvik]

This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to branch debian
in repository segyio.

commit e1f4c7b853e98a7f476a2152d9e10ac4f5dadbef
Author: Jørgen Kvalsvik <jokva at statoil.com>
Date:   Tue Apr 18 13:57:26 2017 +0200

    Interpret delay recording time/t0 as milliseconds
    
    Correctly compute samples by interpreting t0 as milliseconds, not
    microseconds.
---
 mex/SegySpec.m         | 2 +-
 python/segyio/open.py  | 7 +++----
 python/segyio/tools.py | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mex/SegySpec.m b/mex/SegySpec.m
index 25e7b02..039379a 100644
--- a/mex/SegySpec.m
+++ b/mex/SegySpec.m
@@ -33,7 +33,7 @@ classdef SegySpec
 
             obj.sample_format = uint32(SegySampleFormat(spec.sample_format));
             obj.trace_sorting_format = TraceSortingFormat(spec.trace_sorting_format);
-            obj.sample_indexes = ((spec.sample_indexes - t0) / 1000.0) + t0;
+            obj.sample_indexes = spec.sample_indexes / 1000.0;
             obj.crossline_indexes = uint32(spec.crossline_indexes);
             obj.inline_indexes = uint32(spec.inline_indexes);
             obj.offset_count = uint32(spec.offset_count);
diff --git a/python/segyio/open.py b/python/segyio/open.py
index 075b9e7..d726cdb 100644
--- a/python/segyio/open.py
+++ b/python/segyio/open.py
@@ -75,11 +75,10 @@ def open(filename, mode="r", iline = 189,
         f._tracecount = metrics['trace_count']
         f._ext_headers = (f._tr0 - 3600) // 3200  # should probably be from C
 
-        dt = segyio.tools.dt(f, fallback_dt = 4000.0)
+        dt = segyio.tools.dt(f, fallback_dt = 4000.0) / 1000.0
         t0 = f.header[0][segyio.TraceField.DelayRecordingTime]
-        sample_count = metrics['sample_count']
-        f._samples = numpy.array([t0 + i * dt for i in range(sample_count)],
-                                 dtype = numpy.single) / 1000.0
+        samples = metrics['sample_count']
+        f._samples = (numpy.arange(samples, dtype = numpy.single) * dt) + t0
 
     except:
         f.close()
diff --git a/python/segyio/tools.py b/python/segyio/tools.py
index cf63b05..14f36f6 100644
--- a/python/segyio/tools.py
+++ b/python/segyio/tools.py
@@ -3,7 +3,7 @@ import numpy as np
 import itertools as itr
 
 
-def dt(segyfile, fallback_dt=4000):
+def dt(segyfile, fallback_dt=4000.0):
     """
     Find a *dt* value in the SegyFile. If none is found use the provided *fallback_dt* value.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git