From 042a537b170da61af0cdf65c51df55ab918fff60 Mon Sep 17 00:00:00 2001 From: ldam <ldam@passcal.nmt.edu> Date: Mon, 28 Aug 2023 13:36:41 -0600 Subject: [PATCH] flake8 --- .../general_data/general_record_helper.py | 1 - sohstationviewer/model/mseed_data/mseed.py | 1 + .../model/mseed_data/mseed_helper.py | 5 +-- sohstationviewer/model/reftek_data/reftek.py | 35 ++----------------- .../model/reftek_data/reftek_reader/core.py | 5 ++- .../model/reftek_data/reftek_reader/packet.py | 3 +- .../reftek_data/reftek_reader/packets.py | 3 +- 7 files changed, 10 insertions(+), 43 deletions(-) diff --git a/sohstationviewer/model/general_data/general_record_helper.py b/sohstationviewer/model/general_data/general_record_helper.py index 5d1e0603f..c1f9289d4 100644 --- a/sohstationviewer/model/general_data/general_record_helper.py +++ b/sohstationviewer/model/general_data/general_record_helper.py @@ -24,4 +24,3 @@ class Unpacker: else: format = self.byte_order_char + format return struct.unpack(format, buffer) - diff --git a/sohstationviewer/model/mseed_data/mseed.py b/sohstationviewer/model/mseed_data/mseed.py index c04810830..bcc61e33a 100644 --- a/sohstationviewer/model/mseed_data/mseed.py +++ b/sohstationviewer/model/mseed_data/mseed.py @@ -20,6 +20,7 @@ from sohstationviewer.model.mseed_data.record_reader_helper import \ MSeedReadError from sohstationviewer.model.mseed_data.mseed_reader import MSeedReader + class MSeed(GeneralData): """ read and process mseed file into object with properties can be used to diff --git a/sohstationviewer/model/mseed_data/mseed_helper.py b/sohstationviewer/model/mseed_data/mseed_helper.py index 0b604b55d..2d5b1eb30 100644 --- a/sohstationviewer/model/mseed_data/mseed_helper.py +++ b/sohstationviewer/model/mseed_data/mseed_helper.py @@ -1,7 +1,4 @@ -# Functions that change from handling_data's functions -import os -from pathlib import Path -from typing import Union, List, Dict +from typing import List, Dict def retrieve_nets_from_data_dict(data_dict: Dict, diff --git a/sohstationviewer/model/reftek_data/reftek.py b/sohstationviewer/model/reftek_data/reftek.py index 02c2cd5d9..c89fc63de 100755 --- a/sohstationviewer/model/reftek_data/reftek.py +++ b/sohstationviewer/model/reftek_data/reftek.py @@ -3,7 +3,7 @@ RT130 object to hold and process RefTek data """ import os from pathlib import Path -from typing import Union, List, Tuple, Dict +from typing import Union, List, Tuple, Dict import traceback import numpy as np from obspy.core import Stream @@ -25,7 +25,7 @@ from sohstationviewer.model.reftek_data.log_info import LogInfo class RT130(GeneralData): """ - read and process reftek_data file into object with properties can be used to + read and process reftek file into object with properties can be used to plot SOH data, mass position data, waveform data and gaps """ def __init__(self, *args, **kwarg): @@ -109,7 +109,6 @@ class RT130(GeneralData): # this happens when there is text or ascii only in the data self.data_time[key] = [self.read_start, self.read_end] - def read_folder(self, folder: str) -> None: """ Loop all files in dir/list_of_rt130_paths to read for soh data, @@ -183,36 +182,6 @@ class RT130(GeneralData): self.track_info(f'Select Key {selected_key}', LogType.INFO) return selected_key - def select_key(self) -> Tuple[str, str]: - """ - :return selected_key: - (device's serial number, experiment_number) - the selected keys from available key of stream header. - + If there is only one key, return it. - + If there is more than one, show all keys, let user choose one to - return. - """ - self.keys = sorted(list(set( - list(self.soh_data.keys()) + - list(self.mass_pos_data.keys()) + - list(self.waveform_data.keys())))) - keys = self.keys - if len(keys) == 0: - msg = 'No required data found for the data set.' - raise ProcessingDataError(msg) - - selected_key = keys[0] - if len(keys) > 1: - msg = ("There are more than one keys in the given data.\n" - "Please select one to display") - self.pause_signal.emit(msg, keys) - self.pause() - selected_key = keys[self.pause_response] - - self.track_info(f'Select Key {selected_key}', LogType.INFO) - return selected_key - - def read_reftek_130(self, path2file: Path) -> bool: """ From the given file: diff --git a/sohstationviewer/model/reftek_data/reftek_reader/core.py b/sohstationviewer/model/reftek_data/reftek_reader/core.py index 9b5b9d241..220d38f3f 100644 --- a/sohstationviewer/model/reftek_data/reftek_reader/core.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/core.py @@ -25,9 +25,8 @@ from obspy.io.reftek.packet import PACKET_FINAL_DTYPE from sohstationviewer.model.general_data.general_record_helper import Unpacker from sohstationviewer.model.reftek_data.reftek_reader.packet import EHPacket -from sohstationviewer.model.reftek_data.reftek_reader.reftek_reader_helper import ( - read_rt130_file, convert_packet_to_obspy_format, -) +from sohstationviewer.model.reftek_data.reftek_reader.reftek_reader_helper \ + import (read_rt130_file, convert_packet_to_obspy_format) class DiscontinuousTrace(Trace): diff --git a/sohstationviewer/model/reftek_data/reftek_reader/packet.py b/sohstationviewer/model/reftek_data/reftek_reader/packet.py index d30400cd6..d7bd0c52a 100644 --- a/sohstationviewer/model/reftek_data/reftek_reader/packet.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/packet.py @@ -19,7 +19,8 @@ from obspy.io.reftek.util import ( _decode_ascii, _parse_long_time, _16_tuple_ascii, _16_tuple_float, _16_tuple_int, ) -from sohstationviewer.model.reftek_data.reftek_reader.soh_packet import SOHPacket +from sohstationviewer.model.reftek_data.reftek_reader.soh_packet import ( + SOHPacket) class Reftek130UnpackPacketError(ValueError): diff --git a/sohstationviewer/model/reftek_data/reftek_reader/packets.py b/sohstationviewer/model/reftek_data/reftek_reader/packets.py index 90607bbdb..dddd4e68a 100644 --- a/sohstationviewer/model/reftek_data/reftek_reader/packets.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/packets.py @@ -1,6 +1,7 @@ import dataclasses -from sohstationviewer.model.reftek_data.reftek_reader.header import PacketHeader +from sohstationviewer.model.reftek_data.reftek_reader.header import ( + PacketHeader) @dataclasses.dataclass -- GitLab