diff --git a/sohstationviewer/model/handling_data_reftek.py b/sohstationviewer/model/handling_data_reftek.py index 33016a02a1c241a9e222a73312059f6232534f16..8524de7c6398b08f69cc78c9f3666dbbd4881414 100644 --- a/sohstationviewer/model/handling_data_reftek.py +++ b/sohstationviewer/model/handling_data_reftek.py @@ -3,7 +3,7 @@ from typing import Tuple, List, Dict from obspy.core import Stream from obspy import UTCDateTime -from sohstationviewer.model.reftek.from_rt2ms import core +from sohstationviewer.model.reftek.reftek_data import core from sohstationviewer.model.handling_data import read_mseed_trace diff --git a/sohstationviewer/model/reftek/reftek.py b/sohstationviewer/model/reftek/reftek.py index 48913bca00f501f345dee4d60ba9db9581f8741a..69e549594b431fdb2bdaec3021d0a5979b14ec2c 100755 --- a/sohstationviewer/model/reftek/reftek.py +++ b/sohstationviewer/model/reftek/reftek.py @@ -7,7 +7,7 @@ from typing import Tuple, List, Union import traceback import numpy as np -from sohstationviewer.model.reftek.from_rt2ms import core, soh_packet +from sohstationviewer.model.reftek.reftek_data import core, soh_packet from sohstationviewer.model.reftek.log_info import LogInfo from sohstationviewer.model.data_type_model import ( DataTypeModel, ThreadStopped, ProcessingDataError) diff --git a/sohstationviewer/model/reftek/from_rt2ms/__init__.py b/sohstationviewer/model/reftek/reftek_data/__init__.py similarity index 100% rename from sohstationviewer/model/reftek/from_rt2ms/__init__.py rename to sohstationviewer/model/reftek/reftek_data/__init__.py diff --git a/sohstationviewer/model/reftek/from_rt2ms/core.py b/sohstationviewer/model/reftek/reftek_data/core.py similarity index 98% rename from sohstationviewer/model/reftek/from_rt2ms/core.py rename to sohstationviewer/model/reftek/reftek_data/core.py index aed69845d2f599eb51c230c4c76d8a0b8db856a3..b4b35704f7c2a6da843a89cfa7c66dca00731c0d 100644 --- a/sohstationviewer/model/reftek/from_rt2ms/core.py +++ b/sohstationviewer/model/reftek/reftek_data/core.py @@ -25,9 +25,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.from_rt2ms.packet import EHPacket +from sohstationviewer.model.reftek.reftek_data.packet import EHPacket -from sohstationviewer.model.reftek.rt130_experiment.reftek_helper import ( +from sohstationviewer.model.reftek.reftek_data.reftek_helper import ( read_rt130_file, convert_packet_to_obspy_format, ) diff --git a/sohstationviewer/model/reftek/rt130_experiment/dt_packet.py b/sohstationviewer/model/reftek/reftek_data/dt_packet.py similarity index 97% rename from sohstationviewer/model/reftek/rt130_experiment/dt_packet.py rename to sohstationviewer/model/reftek/reftek_data/dt_packet.py index b72ce54e6e520a438371972ead82a542578febc1..6792246594f101b09e659712d2f602766a3365d4 100644 --- a/sohstationviewer/model/reftek/rt130_experiment/dt_packet.py +++ b/sohstationviewer/model/reftek/reftek_data/dt_packet.py @@ -1,7 +1,7 @@ import dataclasses from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.rt130_experiment.header import PacketHeader +from sohstationviewer.model.reftek.reftek_data.header import PacketHeader def decode_uncompressed(packet: bytes, data_format: str, unpacker: Unpacker): diff --git a/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py b/sohstationviewer/model/reftek/reftek_data/eh_et_packet.py similarity index 93% rename from sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py rename to sohstationviewer/model/reftek/reftek_data/eh_et_packet.py index b9faee4c056b07acf842a00af8fd75d4b4f17e70..366ba2f7b4d64ea6d430ad3f8a87940184270121 100644 --- a/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py +++ b/sohstationviewer/model/reftek/reftek_data/eh_et_packet.py @@ -1,9 +1,9 @@ import dataclasses from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.from_rt2ms.packet import \ +from sohstationviewer.model.reftek.reftek_data.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.rt130_experiment.header import PacketHeader +from sohstationviewer.model.reftek.reftek_data.header import PacketHeader def read_eh_et_packet(packet: bytes, unpacker: Unpacker): diff --git a/sohstationviewer/model/reftek/rt130_experiment/header.py b/sohstationviewer/model/reftek/reftek_data/header.py similarity index 95% rename from sohstationviewer/model/reftek/rt130_experiment/header.py rename to sohstationviewer/model/reftek/reftek_data/header.py index 97bb3aab27787ea69e28224317421a767d90d297..0779a3ecacaa34e16120d095187187448263d8d8 100644 --- a/sohstationviewer/model/reftek/rt130_experiment/header.py +++ b/sohstationviewer/model/reftek/reftek_data/header.py @@ -2,8 +2,7 @@ import dataclasses from obspy import UTCDateTime -from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.rt130_experiment import reftek_helper +from sohstationviewer.model.reftek.reftek_data import reftek_helper @dataclasses.dataclass diff --git a/sohstationviewer/model/reftek/from_rt2ms/packet.py b/sohstationviewer/model/reftek/reftek_data/packet.py similarity index 99% rename from sohstationviewer/model/reftek/from_rt2ms/packet.py rename to sohstationviewer/model/reftek/reftek_data/packet.py index f9533d2b5bbb9ab011261e0278136ebb1f1f863f..a4b5cd84e0905f63c5c62cc1d30eee74bc3bcbee 100644 --- a/sohstationviewer/model/reftek/from_rt2ms/packet.py +++ b/sohstationviewer/model/reftek/reftek_data/packet.py @@ -17,7 +17,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.from_rt2ms.soh_packet import SOHPacket +from sohstationviewer.model.reftek.reftek_data.soh_packet import SOHPacket class Reftek130UnpackPacketError(ValueError): diff --git a/sohstationviewer/model/reftek/rt130_experiment/reftek_helper.py b/sohstationviewer/model/reftek/reftek_data/reftek_helper.py similarity index 95% rename from sohstationviewer/model/reftek/rt130_experiment/reftek_helper.py rename to sohstationviewer/model/reftek/reftek_data/reftek_helper.py index 8b5379f2b94806a2bb5257e11431c9f7a0a9fd0f..3af091e35967754044345e59b9ccebf41304ea6e 100644 --- a/sohstationviewer/model/reftek/rt130_experiment/reftek_helper.py +++ b/sohstationviewer/model/reftek/reftek_data/reftek_helper.py @@ -7,15 +7,15 @@ import numpy as np from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker from sohstationviewer.model.reftek.from_rt2ms.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.rt130_experiment.dt_packet import ( +from sohstationviewer.model.reftek.reftek_data.dt_packet import ( read_dt_packet, DTPacket, ) -from sohstationviewer.model.reftek.rt130_experiment.eh_et_packet import ( +from sohstationviewer.model.reftek.reftek_data.eh_et_packet import ( read_eh_et_packet, EHETPacket, ) -from sohstationviewer.model.reftek.rt130_experiment.header import \ +from sohstationviewer.model.reftek.reftek_data.header import \ get_rt130_packet_header -from sohstationviewer.model.reftek.rt130_experiment.soh_packets import ( +from sohstationviewer.model.reftek.reftek_data.soh_packets import ( read_soh_packet, SOHPacket, ) diff --git a/sohstationviewer/model/reftek/from_rt2ms/soh_packet.py b/sohstationviewer/model/reftek/reftek_data/soh_packet.py similarity index 100% rename from sohstationviewer/model/reftek/from_rt2ms/soh_packet.py rename to sohstationviewer/model/reftek/reftek_data/soh_packet.py diff --git a/sohstationviewer/model/reftek/rt130_experiment/soh_packets.py b/sohstationviewer/model/reftek/reftek_data/soh_packets.py similarity index 96% rename from sohstationviewer/model/reftek/rt130_experiment/soh_packets.py rename to sohstationviewer/model/reftek/reftek_data/soh_packets.py index 90facbda84adb0480537fd4ed7d0cf68e86acd94..e1445dd6b6bbe2c790ea07f39ec5f1a77ecee3ac 100644 --- a/sohstationviewer/model/reftek/rt130_experiment/soh_packets.py +++ b/sohstationviewer/model/reftek/reftek_data/soh_packets.py @@ -3,7 +3,7 @@ import dataclasses from obspy.io.reftek.util import bcd from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.rt130_experiment.header import PacketHeader +from sohstationviewer.model.reftek.reftek_data.header import PacketHeader import numpy diff --git a/sohstationviewer/model/reftek/rt130_experiment/__init__.py b/sohstationviewer/model/reftek/rt130_experiment/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000