Merge branch 'main' into DeprecateCalculateCable

Author: BrianMichell

src/mdio/commands/segy.py

@@ -259,14 +259,6 @@ def segy_import(  # noqa: PLR0913
         --chunk-size 8,2,256,512
         --grid-overrides '{"ChannelWrap": True, "ChannelsPerCable": 800}'
 
-        \b
-        If we do have cable numbers in the headers, but channels are still sequential (aka.
-        unwrapped), we can still ingest it like this.
-        --header-locations 9,213,13
-        --header-names shot,cable,chan
-        --header-types int32,int16,int32
-        --chunk-size 8,2,256,512
-        --grid-overrides '{"ChannelWrap":True, "ChannelsPerCable": 800}'
         \b
         No grid overrides are necessary for shot gathers with channel numbers and wrapped channels.
 

src/mdio/segy/geometry.py

@@ -371,9 +371,6 @@ class DuplicateIndex(GridOverrideCommand):
 
     def validate(self, index_headers: HeaderArray, grid_overrides: dict[str, bool | int]) -> None:
         """Validate if this transform should run on the type of data."""
-        if "ChannelWrap" in grid_overrides:
-            raise GridOverrideIncompatibleError(self.name, "ChannelWrap")
-
         if self.required_keys is not None:
             self.check_required_keys(index_headers)
         self.check_required_params(grid_overrides)
@@ -431,9 +428,6 @@ class AutoChannelWrap(GridOverrideCommand):
 
     def validate(self, index_headers: HeaderArray, grid_overrides: dict[str, bool | int]) -> None:
         """Validate if this transform should run on the type of data."""
-        if "ChannelWrap" in grid_overrides:
-            raise GridOverrideIncompatibleError(self.name, "ChannelWrap")
-
         self.check_required_keys(index_headers)
         self.check_required_params(grid_overrides)
 
@@ -463,30 +457,6 @@ def transform(
         return index_headers
 
 
-class ChannelWrap(GridOverrideCommand):
-    """Wrap channels to start from one at cable boundaries."""
-
-    required_keys = {"shot_point", "cable", "channel"}
-    required_parameters = {"ChannelsPerCable"}
-
-    def validate(self, index_headers: HeaderArray, grid_overrides: dict[str, bool | int]) -> None:
-        """Validate if this transform should run on the type of data."""
-        if "AutoChannelWrap" in grid_overrides:
-            raise GridOverrideIncompatibleError(self.name, "AutoCableChannel")
-
-        self.check_required_keys(index_headers)
-        self.check_required_params(grid_overrides)
-
-    def transform(self, index_headers: HeaderArray, grid_overrides: dict[str, bool | int]) -> NDArray:
-        """Perform the grid transform."""
-        self.validate(index_headers, grid_overrides)
-
-        channels_per_cable = grid_overrides["ChannelsPerCable"]
-        index_headers["channel"] = (index_headers["channel"] - 1) % channels_per_cable + 1
-
-        return index_headers
-
-
 class AutoShotWrap(GridOverrideCommand):
     """Automatically determine ShotGun acquisition type."""
 
@@ -540,7 +510,6 @@ def __init__(self) -> None:
         self.commands = {
             "AutoChannelWrap": AutoChannelWrap(),
             "AutoShotWrap": AutoShotWrap(),
-            "ChannelWrap": ChannelWrap(),
             "NonBinned": NonBinned(),
             "HasDuplicates": DuplicateIndex(),
         }

tests/unit/test_segy_grid_overrides.py

@@ -153,9 +153,6 @@ def test_missing_param(self, mock_streamer_headers: dict[str, npt.NDArray]) -> N
         chunksize = None
         overrider = GridOverrider()
 
-        with pytest.raises(GridOverrideMissingParameterError):
-            overrider.run(mock_streamer_headers, index_names, {"ChannelWrap": True}, chunksize)
-
     def test_incompatible_overrides(
         self,
         mock_streamer_headers: dict[str, npt.NDArray],
@@ -165,10 +162,6 @@ def test_incompatible_overrides(
         chunksize = None
         overrider = GridOverrider()
 
-        grid_overrides = {"ChannelWrap": True, "AutoChannelWrap": True}
-        with pytest.raises(GridOverrideIncompatibleError):
-            overrider.run(mock_streamer_headers, index_names, grid_overrides, chunksize)
-
     def test_unknown_override(
         self,
         mock_streamer_headers: dict[str, npt.NDArray],