Merge branch 'rewrite' of github.com:rob-smallshire/segpy into rewrite

This commit is contained in:
Robert Smallshire
2015-01-28 21:50:15 +01:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -103,7 +103,7 @@ def create_reader(fh, encoding=None, endian='>', progress=None):
return SegYReader3D(fh, textual_reel_header, binary_reel_header, extended_textual_header, trace_offset_catalog,
trace_length_catalog, line_catalog)
return SegYReader(fh, textual_reel_header, binary_reel_header, extended_textual_header, trace_offset_catalog,
return SegYReader(fh, textual_reel_header, binary_reel_header, extended_textual_header, trace_offset_catalog, trace_length_catalog,
endian)
+2 -2
View File
@@ -741,7 +741,7 @@ def write_trace_header(fh, trace_header, trace_header_format, pos=None):
"""
if pos is not None:
fh.seek(pos, os.SEEK_SET)
buf = trace_header_format.pack(trace_header)
buf = trace_header_format.pack(*trace_header)
fh.write(buf)
@@ -877,4 +877,4 @@ if __name__ == '__main__':
sweep_length_ms=10000,
sweep_channel_number=3,
sweep_type='spread')
pp(header, width=200)
pp(header, width=200)