Skip to content

Commit

Permalink
revert module seismic back to segy for rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
tasansal committed Sep 3, 2024
1 parent f38296c commit 79b2ff7
Show file tree
Hide file tree
Showing 25 changed files with 58 additions and 58 deletions.
12 changes: 6 additions & 6 deletions src/mdio/converters/mdio.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
from tqdm.dask import TqdmCallback

from mdio import MDIOReader
from mdio.seismic.blocked_io import to_segy
from mdio.seismic.byte_utils import ByteOrder
from mdio.seismic.byte_utils import Dtype
from mdio.seismic.creation import concat_files
from mdio.seismic.creation import mdio_spec_to_segy
from mdio.seismic.utilities import segy_export_rechunker
from mdio.segy.blocked_io import to_segy
from mdio.segy.byte_utils import ByteOrder
from mdio.segy.byte_utils import Dtype
from mdio.segy.creation import concat_files
from mdio.segy.creation import mdio_spec_to_segy
from mdio.segy.utilities import segy_export_rechunker


try:
Expand Down
12 changes: 6 additions & 6 deletions src/mdio/converters/segy.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
from mdio.converters.exceptions import GridTraceSparsityError
from mdio.core import Grid
from mdio.core.utils_write import write_attribute
from mdio.seismic import blocked_io
from mdio.seismic.byte_utils import Dtype
from mdio.seismic.helpers_segy import create_zarr_hierarchy
from mdio.seismic.parsers import parse_binary_header
from mdio.seismic.parsers import parse_text_header
from mdio.seismic.utilities import get_grid_plan
from mdio.segy import blocked_io
from mdio.segy.byte_utils import Dtype
from mdio.segy.helpers_segy import create_zarr_hierarchy
from mdio.segy.parsers import parse_binary_header
from mdio.segy.parsers import parse_text_header
from mdio.segy.utilities import get_grid_plan


if TYPE_CHECKING:
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""SEG-Y Rev 0 standard and its definitions."""

from mdio.seismic.byte_utils import ByteOrder
from mdio.seismic.byte_utils import Dtype
from mdio.seismic.byte_utils import OrderedType
from mdio.seismic.headers import Header
from mdio.seismic.headers import HeaderGroup
from mdio.segy.byte_utils import ByteOrder
from mdio.segy.byte_utils import Dtype
from mdio.segy.byte_utils import OrderedType
from mdio.segy.headers import Header
from mdio.segy.headers import HeaderGroup


# ruff: noqa: E501
Expand Down
6 changes: 3 additions & 3 deletions src/mdio/seismic/_workers.py → src/mdio/segy/_workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import segyio

from mdio.constants import UINT32_MAX
from mdio.seismic.byte_utils import ByteOrder
from mdio.seismic.byte_utils import Dtype
from mdio.seismic.ibm_float import ibm2ieee
from mdio.segy.byte_utils import ByteOrder
from mdio.segy.byte_utils import Dtype
from mdio.segy.ibm_float import ibm2ieee


if TYPE_CHECKING:
Expand Down
10 changes: 5 additions & 5 deletions src/mdio/seismic/blocked_io.py → src/mdio/segy/blocked_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
from zarr import Group

from mdio.core.indexing import ChunkIterator
from mdio.seismic._workers import trace_worker
from mdio.seismic.creation import concat_files
from mdio.seismic.creation import write_to_segy_stack
from mdio.segy._workers import trace_worker
from mdio.segy.creation import concat_files
from mdio.segy.creation import write_to_segy_stack


if TYPE_CHECKING:
Expand All @@ -30,8 +30,8 @@
from numpy.typing import NDArray

from mdio.core import Grid
from mdio.seismic.byte_utils import ByteOrder
from mdio.seismic.byte_utils import Dtype
from mdio.segy.byte_utils import ByteOrder
from mdio.segy.byte_utils import Dtype


try:
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions src/mdio/seismic/creation.py → src/mdio/segy/creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
from tqdm.auto import tqdm

from mdio.api.accessor import MDIOReader
from mdio.seismic._standards_common import SegyFloatFormat
from mdio.seismic.byte_utils import ByteOrder
from mdio.seismic.byte_utils import Dtype
from mdio.seismic.byte_utils import get_byteorder
from mdio.seismic.ibm_float import ieee2ibm
from mdio.segy._standards_common import SegyFloatFormat
from mdio.segy.byte_utils import ByteOrder
from mdio.segy.byte_utils import Dtype
from mdio.segy.byte_utils import get_byteorder
from mdio.segy.ibm_float import ieee2ibm


if TYPE_CHECKING:
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions src/mdio/seismic/geometry.py → src/mdio/segy/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
import numpy as np
import numpy.typing as npt

from mdio.seismic.exceptions import GridOverrideIncompatibleError
from mdio.seismic.exceptions import GridOverrideKeysError
from mdio.seismic.exceptions import GridOverrideMissingParameterError
from mdio.seismic.exceptions import GridOverrideUnknownError
from mdio.segy.exceptions import GridOverrideIncompatibleError
from mdio.segy.exceptions import GridOverrideKeysError
from mdio.segy.exceptions import GridOverrideMissingParameterError
from mdio.segy.exceptions import GridOverrideUnknownError


if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion src/mdio/seismic/headers.py → src/mdio/segy/headers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import numpy as np

from mdio.seismic.byte_utils import OrderedType
from mdio.segy.byte_utils import OrderedType


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import numpy as np

from mdio.seismic.ebcdic import ASCII_TO_EBCDIC
from mdio.seismic.ebcdic import EBCDIC_TO_ASCII
from mdio.segy.ebcdic import ASCII_TO_EBCDIC
from mdio.segy.ebcdic import EBCDIC_TO_ASCII


if TYPE_CHECKING:
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/mdio/seismic/parsers.py → src/mdio/segy/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
from tqdm.auto import tqdm

from mdio.core.dimension import Dimension
from mdio.seismic._workers import header_scan_worker
from mdio.segy._workers import header_scan_worker


if TYPE_CHECKING:
from collections.abc import Sequence

from numpy.typing import NDArray

from mdio.seismic.byte_utils import Dtype
from mdio.segy.byte_utils import Dtype


NUM_CORES = cpu_count(logical=False)
Expand Down
8 changes: 4 additions & 4 deletions src/mdio/seismic/utilities.py → src/mdio/segy/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from dask.array.core import auto_chunks

from mdio.core.dimension import Dimension
from mdio.seismic.geometry import GridOverrider
from mdio.seismic.parsers import parse_sample_axis
from mdio.seismic.parsers import parse_trace_headers
from mdio.segy.geometry import GridOverrider
from mdio.segy.parsers import parse_sample_axis
from mdio.segy.parsers import parse_trace_headers


if TYPE_CHECKING:
Expand All @@ -19,7 +19,7 @@
from numpy.typing import DTypeLike
from numpy.typing import NDArray

from mdio.seismic.byte_utils import Dtype
from mdio.segy.byte_utils import Dtype


def get_grid_plan( # noqa: PLR0913
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import pytest
import segyio

from mdio.seismic.geometry import StreamerShotGeometryType
from mdio.segy.geometry import StreamerShotGeometryType


if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_segy_import_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from mdio import mdio_to_segy
from mdio.converters import segy_to_mdio
from mdio.core import Dimension
from mdio.seismic.geometry import StreamerShotGeometryType
from mdio.segy.geometry import StreamerShotGeometryType


if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from mdio.core import Dimension
from mdio.core import Grid
from mdio.core.utils_write import write_attribute
from mdio.seismic.helpers_segy import create_zarr_hierarchy
from mdio.segy.helpers_segy import create_zarr_hierarchy


if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_accessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from mdio.core.exceptions import MDIOAlreadyExistsError
from mdio.core.exceptions import MDIONotFoundError
from mdio.exceptions import ShapeError
from mdio.seismic.helpers_segy import create_zarr_hierarchy
from mdio.segy.helpers_segy import create_zarr_hierarchy


if TYPE_CHECKING:
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/test_ibm_ieee.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import numpy as np
import pytest

from mdio.seismic.ibm_float import byteswap_uint32
from mdio.seismic.ibm_float import ibm2ieee
from mdio.seismic.ibm_float import ieee2ibm
from mdio.segy.ibm_float import byteswap_uint32
from mdio.segy.ibm_float import ibm2ieee
from mdio.segy.ibm_float import ieee2ibm


@pytest.mark.parametrize(
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_segy_grid_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
from numpy.testing import assert_array_equal

from mdio.core import Dimension
from mdio.seismic.exceptions import GridOverrideIncompatibleError
from mdio.seismic.exceptions import GridOverrideMissingParameterError
from mdio.seismic.exceptions import GridOverrideUnknownError
from mdio.seismic.geometry import GridOverrider
from mdio.segy.exceptions import GridOverrideIncompatibleError
from mdio.segy.exceptions import GridOverrideMissingParameterError
from mdio.segy.exceptions import GridOverrideUnknownError
from mdio.segy.geometry import GridOverrider


SHOTS = arange(100, 104, dtype="int32")
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_text_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

import pytest

from mdio.seismic.headers_text import ascii_to_ebcdic
from mdio.seismic.headers_text import ebcdic_to_ascii
from mdio.seismic.headers_text import unwrap_string
from mdio.seismic.headers_text import wrap_strings
from mdio.segy.headers_text import ascii_to_ebcdic
from mdio.segy.headers_text import ebcdic_to_ascii
from mdio.segy.headers_text import unwrap_string
from mdio.segy.headers_text import wrap_strings


@pytest.mark.parametrize(
Expand Down

0 comments on commit 79b2ff7

Please sign in to comment.