diff --git a/sohstationviewer/model/reftek/reftek_data/__init__.py b/sohstationviewer/model/reftek/reftek_reader/__init__.py similarity index 100% rename from sohstationviewer/model/reftek/reftek_data/__init__.py rename to sohstationviewer/model/reftek/reftek_reader/__init__.py diff --git a/sohstationviewer/model/reftek/reftek_data/core.py b/sohstationviewer/model/reftek/reftek_reader/core.py similarity index 98% rename from sohstationviewer/model/reftek/reftek_data/core.py rename to sohstationviewer/model/reftek/reftek_reader/core.py index 42b82dd9c0266e20dcd3ec00d849d4dfcb6783e9..a0ad2b10e470d2705bb0bd83d6b575b8b6491ae6 100644 --- a/sohstationviewer/model/reftek/reftek_data/core.py +++ b/sohstationviewer/model/reftek/reftek_reader/core.py @@ -23,9 +23,9 @@ from obspy.core.util.obspy_types import ObsPyException from obspy.io.reftek.packet import PACKET_FINAL_DTYPE from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_data.packet import EHPacket +from sohstationviewer.model.reftek.reftek_reader.packet import EHPacket -from sohstationviewer.model.reftek.reftek_data.reftek_helper import ( +from sohstationviewer.model.reftek.reftek_reader.reftek_helper import ( read_rt130_file, convert_packet_to_obspy_format, ) diff --git a/sohstationviewer/model/reftek/reftek_data/header.py b/sohstationviewer/model/reftek/reftek_reader/header.py similarity index 100% rename from sohstationviewer/model/reftek/reftek_data/header.py rename to sohstationviewer/model/reftek/reftek_reader/header.py diff --git a/sohstationviewer/model/reftek/reftek_data/packet.py b/sohstationviewer/model/reftek/reftek_reader/packet.py similarity index 98% rename from sohstationviewer/model/reftek/reftek_data/packet.py rename to sohstationviewer/model/reftek/reftek_reader/packet.py index 75d2ec27095a90fe26d1c081b4a219aeae1a2bf5..56a579c360ead8edcfd8cb361fcd8b2b6101330c 100644 --- a/sohstationviewer/model/reftek/reftek_data/packet.py +++ b/sohstationviewer/model/reftek/reftek_reader/packet.py @@ -19,7 +19,7 @@ from obspy.io.reftek.util import ( _decode_ascii, _parse_long_time, _16_tuple_ascii, _16_tuple_float, _16_tuple_int, ) -from sohstationviewer.model.reftek.reftek_data.soh_packet import SOHPacket +from sohstationviewer.model.reftek.reftek_reader.soh_packet import SOHPacket class Reftek130UnpackPacketError(ValueError): diff --git a/sohstationviewer/model/reftek/reftek_data/packet_readers.py b/sohstationviewer/model/reftek/reftek_reader/packet_readers.py similarity index 97% rename from sohstationviewer/model/reftek/reftek_data/packet_readers.py rename to sohstationviewer/model/reftek/reftek_reader/packet_readers.py index 4df12515647a3d13a65547ad332ad3f7cb7fb248..ccec5b3cc08b3c8644c54bf8e241dae019bf60b5 100644 --- a/sohstationviewer/model/reftek/reftek_data/packet_readers.py +++ b/sohstationviewer/model/reftek/reftek_reader/packet_readers.py @@ -4,9 +4,9 @@ import numpy from obspy.io.reftek.util import bcd from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_data.packet import \ +from sohstationviewer.model.reftek.reftek_reader.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.reftek_data.packets import ( +from sohstationviewer.model.reftek.reftek_reader.packets import ( DTExtendedHeader, EHETExtendedHeader, SOHExtendedHeader, ) diff --git a/sohstationviewer/model/reftek/reftek_data/packets.py b/sohstationviewer/model/reftek/reftek_reader/packets.py similarity index 96% rename from sohstationviewer/model/reftek/reftek_data/packets.py rename to sohstationviewer/model/reftek/reftek_reader/packets.py index 5272ecb35f6f88bd641b370bccef0f04055d6cb9..8418632cadf6f2e749bd2a6aa4a7ce42d1bf360d 100644 --- a/sohstationviewer/model/reftek/reftek_data/packets.py +++ b/sohstationviewer/model/reftek/reftek_reader/packets.py @@ -1,6 +1,6 @@ import dataclasses -from sohstationviewer.model.reftek.reftek_data.header import PacketHeader +from sohstationviewer.model.reftek.reftek_reader.header import PacketHeader @dataclasses.dataclass diff --git a/sohstationviewer/model/reftek/reftek_data/reftek_helper.py b/sohstationviewer/model/reftek/reftek_reader/reftek_helper.py similarity index 95% rename from sohstationviewer/model/reftek/reftek_data/reftek_helper.py rename to sohstationviewer/model/reftek/reftek_reader/reftek_helper.py index e7b1ed24f706081f6655f67d9e428648ec4dad81..cb1a894c6cc1a54accc7cc2a72f2b10ae9661867 100644 --- a/sohstationviewer/model/reftek/reftek_data/reftek_helper.py +++ b/sohstationviewer/model/reftek/reftek_reader/reftek_helper.py @@ -5,15 +5,15 @@ import numpy import numpy as np from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_data.packet import \ +from sohstationviewer.model.reftek.reftek_reader.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.reftek_data.packet_readers import ( +from sohstationviewer.model.reftek.reftek_reader.packet_readers import ( read_dt_packet, read_eh_et_packet, read_soh_packet, ) -from sohstationviewer.model.reftek.reftek_data.packets import ( +from sohstationviewer.model.reftek.reftek_reader.packets import ( DTPacket, EHETPacket, SOHPacket, ) -from sohstationviewer.model.reftek.reftek_data.header import \ +from sohstationviewer.model.reftek.reftek_reader.header import \ get_rt130_packet_header diff --git a/sohstationviewer/model/reftek/reftek_data/soh_packet.py b/sohstationviewer/model/reftek/reftek_reader/soh_packet.py similarity index 100% rename from sohstationviewer/model/reftek/reftek_data/soh_packet.py rename to sohstationviewer/model/reftek/reftek_reader/soh_packet.py diff --git a/tests/test_model/test_reftek/test_core.py b/tests/test_model/test_reftek/test_core.py index ff05396c02a3cbf743f8a96b57dd2b5cd705f24e..27bd475b3072787a825f0253cd0421c7a4a1691f 100644 --- a/tests/test_model/test_reftek/test_core.py +++ b/tests/test_model/test_reftek/test_core.py @@ -6,11 +6,11 @@ import numpy import obspy.core from numpy.testing import assert_array_equal -from sohstationviewer.model.reftek.reftek_data.core import ( +from sohstationviewer.model.reftek.reftek_reader.core import ( DiscontinuousTrace, Reftek130, ) -from sohstationviewer.model.reftek.reftek_data.header import NotRT130FileError +from sohstationviewer.model.reftek.reftek_reader.header import NotRT130FileError class TestDiscontinuousTrace(unittest.TestCase): diff --git a/tests/test_model/test_reftek/test_header.py b/tests/test_model/test_reftek/test_header.py index 0058679bd536a1b7febbf2165c02b096f8624feb..7af53aa0eb2214d3ac54921ba8c8431de2e1788a 100644 --- a/tests/test_model/test_reftek/test_header.py +++ b/tests/test_model/test_reftek/test_header.py @@ -1,6 +1,6 @@ import unittest -from sohstationviewer.model.reftek.reftek_data.header import ( +from sohstationviewer.model.reftek.reftek_reader.header import ( parse_rt130_time, get_rt130_packet_header, NotRT130FileError, ) diff --git a/tests/test_model/test_reftek/test_packet_readers.py b/tests/test_model/test_reftek/test_packet_readers.py index 686ac4528873c88c8e01f9320b6a8860bd106bc5..73253f81b29126d1870f81eb184c5607414aa3b0 100644 --- a/tests/test_model/test_reftek/test_packet_readers.py +++ b/tests/test_model/test_reftek/test_packet_readers.py @@ -2,13 +2,13 @@ import unittest from unittest.mock import patch from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_data.packet import \ +from sohstationviewer.model.reftek.reftek_reader.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.reftek_data.packet_readers import ( +from sohstationviewer.model.reftek.reftek_reader.packet_readers import ( decode_uncompressed, decode_compressed, read_dt_packet, read_eh_et_packet, read_soh_packet, ) -from sohstationviewer.model.reftek.reftek_data.packets import SOHExtendedHeader +from sohstationviewer.model.reftek.reftek_reader.packets import SOHExtendedHeader unpacker = Unpacker('>') @@ -99,11 +99,11 @@ class TestReadDTPacket(unittest.TestCase): self.data = b' ' * 1000 uncompressed_patcher = patch( - 'sohstationviewer.model.reftek.reftek_data.packet_readers.' + 'sohstationviewer.model.reftek.reftek_reader.packet_readers.' 'decode_uncompressed' ) compressed_patcher = patch( - 'sohstationviewer.model.reftek.reftek_data.packet_readers.' + 'sohstationviewer.model.reftek.reftek_reader.packet_readers.' 'decode_compressed' ) self.mock_uncompressed = uncompressed_patcher.start() diff --git a/tests/test_model/test_reftek/test_reftek_helper.py b/tests/test_model/test_reftek/test_reftek_helper.py index f4410699448e5b6a14ca48656dbbfbc80c5b8201..11a2647c387b5e55d111fc1d78e01b8ab5d8a5fd 100644 --- a/tests/test_model/test_reftek/test_reftek_helper.py +++ b/tests/test_model/test_reftek/test_reftek_helper.py @@ -6,15 +6,15 @@ from unittest.mock import patch from obspy.io.reftek.packet import PACKET_FINAL_DTYPE from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_data.header import NotRT130FileError -from sohstationviewer.model.reftek.reftek_data.packet_readers import ( +from sohstationviewer.model.reftek.reftek_reader.header import NotRT130FileError +from sohstationviewer.model.reftek.reftek_reader.packet_readers import ( read_eh_et_packet, read_dt_packet, read_soh_packet, ) -from sohstationviewer.model.reftek.reftek_data.packets import ( +from sohstationviewer.model.reftek.reftek_reader.packets import ( SOHPacket, EHETPacket, DTPacket, ) -from sohstationviewer.model.reftek.reftek_data.reftek_helper import ( +from sohstationviewer.model.reftek.reftek_reader.reftek_helper import ( read_rt130_file, convert_packet_to_obspy_format, ) @@ -29,7 +29,7 @@ class TestReadRT130File(unittest.TestCase): ) eh_et_patcher = patch( - 'sohstationviewer.model.reftek.reftek_data.reftek_helper.' + 'sohstationviewer.model.reftek.reftek_reader.reftek_helper.' 'read_eh_et_packet', wraps=read_eh_et_packet ) @@ -37,7 +37,7 @@ class TestReadRT130File(unittest.TestCase): self.addCleanup(eh_et_patcher.stop) dt_patcher = patch( - 'sohstationviewer.model.reftek.reftek_data.reftek_helper.' + 'sohstationviewer.model.reftek.reftek_reader.reftek_helper.' 'read_dt_packet', wraps=read_dt_packet ) @@ -45,7 +45,7 @@ class TestReadRT130File(unittest.TestCase): self.addCleanup(dt_patcher.stop) soh_patcher = patch( - 'sohstationviewer.model.reftek.reftek_data.reftek_helper.' + 'sohstationviewer.model.reftek.reftek_reader.reftek_helper.' 'read_soh_packet', wraps=read_soh_packet )