From 7a3e01588ac80ba7132bad8b5667dc7b82723ddc Mon Sep 17 00:00:00 2001
From: kienle <kienle@passcal.nmt.edu>
Date: Fri, 25 Aug 2023 10:52:35 -0600
Subject: [PATCH] flake8
---
sohstationviewer/model/reftek/reftek_data/core.py | 4 ++--
.../model/reftek/reftek_data/dt_packet.py | 2 +-
.../model/reftek/reftek_data/eh_et_packet.py | 2 --
sohstationviewer/model/reftek/reftek_data/header.py | 2 +-
sohstationviewer/model/reftek/reftek_data/packet.py | 13 ++++++++-----
.../model/reftek/reftek_data/soh_packets.py | 4 +++-
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/sohstationviewer/model/reftek/reftek_data/core.py b/sohstationviewer/model/reftek/reftek_data/core.py
index a2d24a8c5..0bb0078c1 100644
--- a/sohstationviewer/model/reftek/reftek_data/core.py
+++ b/sohstationviewer/model/reftek/reftek_data/core.py
@@ -13,7 +13,6 @@ Maeva Pourpoint IRIS/PASSCAL
"""
import copy
-import os
from pathlib import Path
from typing import Optional, Union
@@ -200,7 +199,8 @@ class Reftek130(obspy_rt130_core.Reftek130):
# does not change its value), we do not have to care
# about the actual encoding type of the stored packets.
sample_data = np.asarray(packets_['payload'][:, :4])
- sample_data = sample_data.view(np.dtype('>i4')).squeeze(axis=-1)
+ sample_data = sample_data.view(np.dtype('>i4'))
+ sample_data = sample_data.squeeze(axis=-1)
npts = sample_data.size
tr = DiscontinuousTrace(
data=sample_data, header=copy.deepcopy(header),
diff --git a/sohstationviewer/model/reftek/reftek_data/dt_packet.py b/sohstationviewer/model/reftek/reftek_data/dt_packet.py
index d1e7b440a..fd8b98776 100644
--- a/sohstationviewer/model/reftek/reftek_data/dt_packet.py
+++ b/sohstationviewer/model/reftek/reftek_data/dt_packet.py
@@ -1,5 +1,5 @@
import dataclasses
-from typing import Tuple, Any
+from typing import Any
from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker
from sohstationviewer.model.reftek.reftek_data.header import PacketHeader
diff --git a/sohstationviewer/model/reftek/reftek_data/eh_et_packet.py b/sohstationviewer/model/reftek/reftek_data/eh_et_packet.py
index cf4b4c108..6f550e48a 100644
--- a/sohstationviewer/model/reftek/reftek_data/eh_et_packet.py
+++ b/sohstationviewer/model/reftek/reftek_data/eh_et_packet.py
@@ -59,5 +59,3 @@ def read_eh_et_packet(packet: bytes, unpacker: Unpacker
# grab at least data.
payload = packet[24:eh_et_payload_end_in_packet]
return extended_header, payload
-
-
diff --git a/sohstationviewer/model/reftek/reftek_data/header.py b/sohstationviewer/model/reftek/reftek_data/header.py
index a63685b1f..71db638e8 100644
--- a/sohstationviewer/model/reftek/reftek_data/header.py
+++ b/sohstationviewer/model/reftek/reftek_data/header.py
@@ -66,7 +66,7 @@ def get_rt130_packet_header(rt130_packet: bytes) -> PacketHeader:
# use str.decode() than the unpacker.
packet_type = rt130_packet[:2].decode('ASCII')
except UnicodeError:
- print(f'Cannot decode packet type.')
+ print('Cannot decode packet type.')
print('The given file does not appear to be a valid RT130 file.')
raise reftek_helper.RT130ParseError
valid_packet_types = ['AD', 'CD', 'DS', 'DT', 'EH', 'ET', 'OM', 'SH', 'SC',
diff --git a/sohstationviewer/model/reftek/reftek_data/packet.py b/sohstationviewer/model/reftek/reftek_data/packet.py
index ec1e3f4e7..1eebe5405 100644
--- a/sohstationviewer/model/reftek/reftek_data/packet.py
+++ b/sohstationviewer/model/reftek/reftek_data/packet.py
@@ -9,8 +9,6 @@ Suggested updates to obspy.io.reftek.packet:
Maeva Pourpoint IRIS/PASSCAL
"""
-from typing import List
-
import numpy
import obspy.io.reftek.packet as obspy_rt130_packet
@@ -31,7 +29,9 @@ eh_et_payload_last_field_size = 16
# The payload start is based on the start of the payload, so we have to add 24
# to compensate for the size of the header and extended header.
-eh_et_payload_end_in_packet = eh_et_payload_last_field_start + eh_et_payload_last_field_size + 24
+eh_et_payload_end_in_packet = (
+ eh_et_payload_last_field_start + eh_et_payload_last_field_size + 24
+)
# name, offset, length (bytes) and converter routine for EH/ET packet payload
# Trimmed to only include the parts used elsewhere for the sake of better
@@ -41,7 +41,9 @@ EH_PAYLOAD = {
"station_name": (36, 4, _decode_ascii),
"sampling_rate": (64, 4, float),
"trigger_time": (72, 16, _parse_long_time),
- "first_sample_time": (eh_et_payload_last_field_start, eh_et_payload_last_field_size, _parse_long_time),
+ "first_sample_time": (
+ eh_et_payload_last_field_start, eh_et_payload_last_field_size,
+ _parse_long_time),
}
obspy_rt130_packet.EH_PAYLOAD = {
@@ -133,7 +135,8 @@ class EHPacket(obspy_rt130_packet.EHPacket):
"""
info = []
trigger_time = SOHPacket.time_tag(UTCDateTime(ns=self.trigger_time))
- first_sample_time = SOHPacket.time_tag(UTCDateTime(ns=self.first_sample_time)) # noqa: E501
+ first_sample_time = SOHPacket.time_tag(
+ UTCDateTime(ns=self.first_sample_time)) # noqa: E501
packet_tagline2 = ("\nDAS: {:s} EV: {:04d} DS: {:d} FST = {:s} TT = "
"{:s} NS: {:d} SPS: {:.1f} ETO: 0"
.format(self.unit_id.decode(),
diff --git a/sohstationviewer/model/reftek/reftek_data/soh_packets.py b/sohstationviewer/model/reftek/reftek_data/soh_packets.py
index 2badb6fa0..e5a62b275 100644
--- a/sohstationviewer/model/reftek/reftek_data/soh_packets.py
+++ b/sohstationviewer/model/reftek/reftek_data/soh_packets.py
@@ -63,7 +63,9 @@ def read_soh_packet(packet: bytes, unpacker: Unpacker
event_number = bcd_16bit_int(numpy.frombuffer(packet[16:18], numpy.uint8))
data_stream_number = bcd(numpy.frombuffer(packet[18:19], numpy.uint8))
channel_number = bcd(numpy.frombuffer(packet[19:20], numpy.uint8))
- number_of_samples = bcd_16bit_int(numpy.frombuffer(packet[20:22], numpy.uint8))
+ number_of_samples = bcd_16bit_int(
+ numpy.frombuffer(packet[20:22], numpy.uint8)
+ )
flags = unpacker.unpack('B', packet[22:23])[0]
data_format = packet[23:24].hex().upper()
--
GitLab