diff --git a/sohstationviewer/model/reftek/from_rt2ms/packet.py b/sohstationviewer/model/reftek/from_rt2ms/packet.py index b712edf23b11538006dda9bfb366e0140a5f7880..0badca2af67c6f7058927e74f1a0ab036ca92176 100644 --- a/sohstationviewer/model/reftek/from_rt2ms/packet.py +++ b/sohstationviewer/model/reftek/from_rt2ms/packet.py @@ -18,7 +18,7 @@ from obspy.io.reftek.util import (_decode_ascii, _16_tuple_ascii, _16_tuple_int, _16_tuple_float) -from sohstationviewer.model.reftek.from_rt2ms.soh_packet import Packet +from sohstationviewer.model.reftek.from_rt2ms.soh_packet import SOHPacket class Reftek130UnpackPacketError(ValueError): @@ -109,9 +109,9 @@ class EHPacket(obspy_rt130_packet.EHPacket): # info.append("\n stream name = " + self.stream_name) # info.append("\n sample rate = " + str(self.sampling_rate)) # info.append("\n trigger type = " + self.trigger_type) - trigger_time = Packet.time_tag(UTCDateTime(ns=self.trigger_time)) + trigger_time = SOHPacket.time_tag(UTCDateTime(ns=self.trigger_time)) # info.append("\n trigger time = " + trigger_time) - first_sample_time = Packet.time_tag(UTCDateTime(ns=self.first_sample_time)) # noqa: E501 + first_sample_time = SOHPacket.time_tag(UTCDateTime(ns=self.first_sample_time)) # noqa: E501 # info.append("\n first sample = " + first_sample_time) # if self.last_sample_time: # info.append("\n last sample = " + Packet.time_tag(UTCDateTime(ns=self.last_sample_time))) # noqa: E501 diff --git a/sohstationviewer/model/reftek/from_rt2ms/soh_packet.py b/sohstationviewer/model/reftek/from_rt2ms/soh_packet.py index ff54fe1539c53d352b8efa036bc66ed0f6c7eb0b..7740e2ad57962392a9a77de3034b35050ffd8ffb 100644 --- a/sohstationviewer/model/reftek/from_rt2ms/soh_packet.py +++ b/sohstationviewer/model/reftek/from_rt2ms/soh_packet.py @@ -268,7 +268,7 @@ FD_INFO = { "_coeff": (984, None)} -class Packet(obspy_rt130_packet.Packet): +class SOHPacket(obspy_rt130_packet.Packet): """Class used to define shared tools for the SOH packets""" _headers = ('experiment_number', 'unit_id', 'byte_count', @@ -321,7 +321,7 @@ class Packet(obspy_rt130_packet.Packet): # self.packet_sequence) # noqa: E501 -class SHPacket(Packet): +class SHPacket(SOHPacket): """Class used to parse and generate string representation for SH packets""" def __init__(self, data): @@ -352,7 +352,7 @@ class SHPacket(Packet): return info -class SCPacket(Packet): +class SCPacket(SOHPacket): """Class used to parse and generate string representation for SC packets""" def __init__(self, data): @@ -461,7 +461,7 @@ class SCPacket(Packet): return infos -class OMPacket(Packet): +class OMPacket(SOHPacket): """Class used to parse and generate string representation for OM packets""" def __init__(self, data): @@ -503,7 +503,7 @@ class OMPacket(Packet): return info -class DSPacket(Packet): +class DSPacket(SOHPacket): """Class used to parse and generate string representation for DS packets""" def __init__(self, data): @@ -624,7 +624,7 @@ class DSPacket(Packet): return infos -class ADPacket(Packet): +class ADPacket(SOHPacket): """Class used to parse and generate string representation for AD packets""" def __init__(self, data): @@ -664,7 +664,7 @@ class ADPacket(Packet): return info -class CDPacket(Packet): +class CDPacket(SOHPacket): """Class used to parse and generate string representation for CD packets""" def __init__(self, data): @@ -790,7 +790,7 @@ class CDPacket(Packet): return info -class FDPacket(Packet): +class FDPacket(SOHPacket): """Class used to parse and generate string representation for FD packets""" def __init__(self, data): diff --git a/sohstationviewer/model/reftek/reftek.py b/sohstationviewer/model/reftek/reftek.py index 9d0dc8cacf4a95fb6b3b6bb2c22ed3b4809d2258..b708eb5c7978ee5758c3225a118cda33bac89c8e 100755 --- a/sohstationviewer/model/reftek/reftek.py +++ b/sohstationviewer/model/reftek/reftek.py @@ -177,7 +177,7 @@ class RT130(DataTypeModel): cur_key = (d['unit_id'].decode(), f"{d['experiment_number']}") self.populate_cur_key_for_all_data(cur_key) - logs = soh_packet.Packet.from_data(d).__str__() + logs = soh_packet.SOHPacket.from_data(d).__str__() if 'SOH' not in self.log_data[cur_key]: self.log_data[cur_key]['SOH'] = [] self.log_data[cur_key]['SOH'].append((d['time'], logs))