From 6ee73a7eb8bf2c42e4ed0427a9503c4298cd66b3 Mon Sep 17 00:00:00 2001
From: kienle <kienle@passcal.nmt.edu>
Date: Wed, 9 Aug 2023 09:57:04 -0600
Subject: [PATCH] Fix imports
---
.../model/reftek/from_rt2ms/core.py | 17 +++++------------
.../model/reftek/from_rt2ms/packet.py | 6 +-----
sohstationviewer/model/reftek/reftek.py | 3 +--
.../model/reftek/rt130_experiment/dt_packet.py | 4 +---
.../reftek/rt130_experiment/eh_et_packet.py | 3 +--
.../model/reftek/rt130_experiment/header.py | 3 +--
.../reftek/rt130_experiment/reftek_helper.py | 9 +++------
.../reftek/rt130_experiment/soh_packets.py | 3 +--
8 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/sohstationviewer/model/reftek/from_rt2ms/core.py b/sohstationviewer/model/reftek/from_rt2ms/core.py
index 8cdcdf584..658f191a8 100644
--- a/sohstationviewer/model/reftek/from_rt2ms/core.py
+++ b/sohstationviewer/model/reftek/from_rt2ms/core.py
@@ -12,7 +12,6 @@ Maeva Pourpoint IRIS/PASSCAL
import copy
import os
-import sys
import obspy.io.reftek.core as obspy_rt130_core
import warnings
@@ -22,22 +21,18 @@ import numpy as np
from obspy import Trace, Stream, UTCDateTime
from obspy.core.util.obspy_types import ObsPyException
from obspy.io.reftek.packet import PACKET_FINAL_DTYPE
-from obspy.io.reftek.util import _decode_ascii, _parse_long_time
from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker
-from sohstationviewer.model.reftek.from_rt2ms.packet import \
- (
- eh_et_payload_last_field_start, eh_et_payload_last_field_size, EHPacket,
-)
-from sohstationviewer.model.reftek.rt130_experiment.reftek_helper import \
- (
+from sohstationviewer.model.reftek.from_rt2ms.packet import EHPacket
+
+from sohstationviewer.model.reftek.rt130_experiment.reftek_helper import (
read_rt130_file, convert_packet_to_obspy_format,
)
class DiscontinuousTrace(Trace):
def __init__(self, *args, times, **kwargs):
- super().__init__(**kwargs)
+ super().__init__(*args, **kwargs)
self.times = times
@@ -210,7 +205,5 @@ for root, subdirs, files in os.walk(data_path):
if file_name.startswith('.'):
continue
file_path = os.path.join(root, file_name)
- print(file_path)
a = (Reftek130.from_file(file_path)._data)
- print(EHPacket(a[0]))
- sys.exit()
+ # sys.exit()
diff --git a/sohstationviewer/model/reftek/from_rt2ms/packet.py b/sohstationviewer/model/reftek/from_rt2ms/packet.py
index 0badca2af..313bf788c 100644
--- a/sohstationviewer/model/reftek/from_rt2ms/packet.py
+++ b/sohstationviewer/model/reftek/from_rt2ms/packet.py
@@ -13,11 +13,7 @@ Maeva Pourpoint IRIS/PASSCAL
import obspy.io.reftek.packet as obspy_rt130_packet
from obspy import UTCDateTime
-from obspy.io.reftek.util import (_decode_ascii,
- _parse_long_time,
- _16_tuple_ascii,
- _16_tuple_int,
- _16_tuple_float)
+from obspy.io.reftek.util import (_decode_ascii, _parse_long_time)
from sohstationviewer.model.reftek.from_rt2ms.soh_packet import SOHPacket
diff --git a/sohstationviewer/model/reftek/reftek.py b/sohstationviewer/model/reftek/reftek.py
index 76c2e5e39..fbe084dae 100755
--- a/sohstationviewer/model/reftek/reftek.py
+++ b/sohstationviewer/model/reftek/reftek.py
@@ -7,9 +7,8 @@ from typing import Tuple, List, Union
import traceback
import numpy as np
-from sohstationviewer.model.reftek.from_rt2ms.core import Reftek130
from sohstationviewer.model.reftek.from_rt2ms import (
- core, soh_packet, packet)
+ 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/rt130_experiment/dt_packet.py b/sohstationviewer/model/reftek/rt130_experiment/dt_packet.py
index 1a791c546..6b576c5df 100644
--- a/sohstationviewer/model/reftek/rt130_experiment/dt_packet.py
+++ b/sohstationviewer/model/reftek/rt130_experiment/dt_packet.py
@@ -1,8 +1,6 @@
import dataclasses
-from dataclasses import dataclass
-from sohstationviewer.model.mseed_data.record_reader_helper import \
- Unpacker
+from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker
from sohstationviewer.model.reftek.rt130_experiment.header import PacketHeader
diff --git a/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py b/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py
index 7324eee71..b2e9917a5 100644
--- a/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py
+++ b/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py
@@ -1,7 +1,6 @@
import dataclasses
-from sohstationviewer.model.mseed_data.record_reader_helper import \
- Unpacker
+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.header import PacketHeader
diff --git a/sohstationviewer/model/reftek/rt130_experiment/header.py b/sohstationviewer/model/reftek/rt130_experiment/header.py
index f0c26d9d0..d09e86bf9 100644
--- a/sohstationviewer/model/reftek/rt130_experiment/header.py
+++ b/sohstationviewer/model/reftek/rt130_experiment/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.mseed_data.record_reader_helper import Unpacker
from sohstationviewer.model.reftek.rt130_experiment import reftek_helper
diff --git a/sohstationviewer/model/reftek/rt130_experiment/reftek_helper.py b/sohstationviewer/model/reftek/rt130_experiment/reftek_helper.py
index 2803fe09a..b3566dd51 100644
--- a/sohstationviewer/model/reftek/rt130_experiment/reftek_helper.py
+++ b/sohstationviewer/model/reftek/rt130_experiment/reftek_helper.py
@@ -7,18 +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.rt130_experiment.dt_packet import (
read_dt_packet, DTPacket,
)
-from sohstationviewer.model.reftek.rt130_experiment.eh_et_packet import \
- (
+from sohstationviewer.model.reftek.rt130_experiment.eh_et_packet import (
read_eh_et_packet, EHETPacket,
)
from sohstationviewer.model.reftek.rt130_experiment.header import \
get_rt130_packet_header
-from sohstationviewer.model.reftek.rt130_experiment.soh_packets import \
- (
+from sohstationviewer.model.reftek.rt130_experiment.soh_packets import (
read_soh_packet, SOHPacket,
)
diff --git a/sohstationviewer/model/reftek/rt130_experiment/soh_packets.py b/sohstationviewer/model/reftek/rt130_experiment/soh_packets.py
index 0731ba95b..55cfd0088 100644
--- a/sohstationviewer/model/reftek/rt130_experiment/soh_packets.py
+++ b/sohstationviewer/model/reftek/rt130_experiment/soh_packets.py
@@ -2,8 +2,7 @@ import dataclasses
from obspy.io.reftek.util import bcd
-from sohstationviewer.model.mseed_data.record_reader_helper import \
- Unpacker
+from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker
from sohstationviewer.model.reftek.rt130_experiment.header import PacketHeader
import numpy
--
GitLab