From f94301a9511b906ade648eeb09c67b72302be0b9 Mon Sep 17 00:00:00 2001 From: wassname Date: Wed, 2 Dec 2015 15:52:58 +0800 Subject: [PATCH] If valid 2d and 3d, use 3d instead of neither --- segpy/reader.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/segpy/reader.py b/segpy/reader.py index 62db921..3ec42cf 100644 --- a/segpy/reader.py +++ b/segpy/reader.py @@ -219,15 +219,18 @@ def _make_reader(fh, encoding, trace_header_format, endian, progress): bps = bytes_per_sample(binary_reel_header, revision) trace_offset_catalog, trace_length_catalog, cdp_catalog, line_catalog = catalog_traces(fh, bps, trace_header_format, endian, progress) - if cdp_catalog is not None and line_catalog is None: - return SegYReader2D(fh, textual_reel_header, binary_reel_header, extended_textual_header, trace_offset_catalog, - trace_length_catalog, cdp_catalog, trace_header_format, encoding, endian) - if cdp_catalog is None and line_catalog is not None: + + if line_catalog is not None: return SegYReader3D(fh, textual_reel_header, binary_reel_header, extended_textual_header, trace_offset_catalog, trace_length_catalog, line_catalog, trace_header_format, encoding, endian) + if cdp_catalog is not None: + return SegYReader2D(fh, textual_reel_header, binary_reel_header, extended_textual_header, trace_offset_catalog, + trace_length_catalog, cdp_catalog, trace_header_format, encoding, endian) + return SegYReader(fh, textual_reel_header, binary_reel_header, extended_textual_header, trace_offset_catalog, trace_length_catalog, trace_header_format, encoding, endian) + class SegYReader(object): """A basic SEG Y reader.