34 Commits
Author SHA1 Message Date
sebastianw 9cc301e2c6 refactor: remove unused methods 2024-08-18 14:00:00 +02:00
sebastianw 65b456b8ab refactor: restructure data objects 2024-07-27 13:58:06 +02:00
sebastianw 0709fb04a5 refactor: restructure data objects 2024-07-23 15:17:00 +02:00
sebastianw 2515715193 bugfix: corrected for ValueError 2024-07-23 13:42:45 +02:00
sebastianw a2add3034a refactor: rewrite plotWFData to reduce complexity 2024-07-20 10:40:05 +02:00
sebastianw 090bfb47d1 refactor: move Project definition to individual file 2024-07-20 10:30:18 +02:00
sebastianw 72f021cdc1 refactor: remove unused code; rewrite too complex functions 2024-07-20 10:23:40 +02:00
sebastianw e5c7404bb6 refactor: remove unnecessary additional declaration 2024-07-17 14:07:05 +02:00
sebastianw 1a148a8a72 suggestion: add new dataclasses; remove unused code 2024-07-17 14:06:13 +02:00
sebastianw 8623cc3dd3 refactor: removed unused code 2024-07-17 14:05:04 +02:00
sebastianw cb457fc7ec refactor: rename writephases; add write hash to write_phases 2024-07-17 13:29:10 +02:00
sebastianw eb077e4bd6 refactor: remove unused code; restructure writephases 2024-07-16 14:49:32 +02:00
sebastianw 2b01e8207e change: add docu and test case 2024-07-16 12:08:00 +02:00
marcel 6cce05b035 Merge branch 'feature/dae' into develop
# Conflicts:
#	pylot/core/io/data.py
#	pylot/core/util/widgets.py
2024-06-12 16:19:21 +02:00
marcel 7326f061e5 [minor] inform if station coordinates were not found in metadata 2024-06-12 16:11:53 +02:00
marcel 1a18401fe3 [bugfix] added missing Parameter object in call for picksdict_from_picks 2024-06-12 13:44:02 +02:00
marcel ec930dbc12 [minor] removed unneeded imports 2024-06-07 15:56:05 +02:00
marcel b991f771af [bugfix] removing redundancy and wrong bullsh.. try-except code 2024-06-07 15:04:16 +02:00
marcel 2c3b1876ab [minor] switch default cmap for array_map to 'viridis' 2024-06-07 14:34:27 +02:00
marcel 0acd23d4d0 [update] further improved Pickfile selection dialog, now providing methods "overwrite" or "merge" 2024-06-07 14:32:57 +02:00
marcel f349c8bc7e [update] improve pickfile selection, give the ability to select only specific files 2024-06-07 13:09:34 +02:00
marcel 6688ef845d [bugfix] re-implement ability of get_bool to return unidentifiable input 2024-06-07 13:08:51 +02:00
marcel 5b18e9ab71 [merge] merge branch 'improve-util-utils' of pull request #35 into develop 2024-06-07 10:29:39 +02:00
marcel 65dbaad446 [update] adding possibility to display other waveform data (e.g. denoised/synthetic) together with genuine data for comparison 2024-03-22 17:12:04 +01:00
marcel 5b97d51517 [minor] mpl.figure.canvas.draw -> draw_idle 2024-03-22 17:12:04 +01:00
sebastianw b3fdbc811e Merge branch 'develop' into improve-util-utils 2023-06-23 09:37:54 +02:00
sebastianw 9fce4998d3 bugfix: remove unused functions; correct for wrong formatting (PEP) 2023-04-23 22:05:11 +02:00
sebastianw c468bfbe84 feat: add type hints and tests for plot utils 2023-04-23 21:37:20 +02:00
sebastianw 4861d33e9a bugfix: add tests to key_for_set_value 2023-04-16 09:58:51 +02:00
sebastianw f5f4635c3d bugfix: rename is_iterable and add doc tests 2023-04-16 09:50:42 +02:00
sebastianw b12d92eebb bugfix: refactor get_owner and get_hash; add tests 2023-04-12 21:22:58 +02:00
sebastianw e9da81376e bugfix: add new tests and refactor get_none 2023-04-12 20:32:44 +02:00
sebastianw e68fc849f0 bugfix: correct erroneous and add new doctests 2023-04-10 19:14:23 +02:00
sebastianw efb117177c bugfix: update check4rotate 2023-04-10 18:35:58 +02:00
3 changed files with 19 additions and 27 deletions
+3 -3
View File
@@ -59,7 +59,7 @@ except ImportError:
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.figure import Figure
from pylot.core.analysis.magnitude import LocalMagnitude, MomentMagnitude, calcsourcespec
from pylot.core.analysis.magnitude import LocalMagnitude, MomentMagnitude
from pylot.core.io.data import Data
from pylot.core.io.inputs import FilterOptions, PylotParameter
from autoPyLoT import autoPyLoT
@@ -76,12 +76,12 @@ from pylot.core.util.utils import fnConstructor, get_login, \
full_range, readFilterInformation, pick_color_plt, \
pick_linestyle_plt, identifyPhaseID, excludeQualityClasses, \
transform_colors_mpl, transform_colors_mpl_str, getAutoFilteroptions, check_all_obspy, \
check_all_pylot, get_bool, get_None, get_pylot_eventfile_with_extension
check_all_pylot, get_bool, get_none
from pylot.core.util.gui import make_pen
from pylot.core.util.widgets import FilterOptionsDialog, PylotCanvas, WaveformWidgetPG, PropertiesDlg, HelpForm, createAction, PickDlg, \
ComparisonWidget, TuneAutopicker, PylotParaBox, AutoPickDlg, CanvasWidget, AutoPickWidget, \
CompareEventsWidget, ProgressBarWidget, AddMetadataWidget, SingleTextLineDialog, LogWidget, PickQualitiesFromXml, \
SourceSpecWindow, ChooseWaveFormWindow, SpectrogramTab, SearchFileByExtensionDialog
SpectrogramTab, SearchFileByExtensionDialog
from pylot.core.util.array_map import Array_map
from pylot.core.util.structure import DATASTRUCTURE
from pylot.core.util.thread import Thread, Worker
+7 -18
View File
@@ -8,6 +8,7 @@ import platform
import re
import subprocess
import warnings
from typing import Literal, Tuple, Type
from functools import lru_cache
import numpy as np
@@ -106,7 +107,7 @@ def gen_Pool(ncores=0):
print('gen_Pool: Generated multiprocessing Pool with {} cores\n'.format(ncores))
pool = multiprocessing.Pool(ncores)
pool = multiprocessing.Pool(ncores, maxtasksperchild=100)
return pool
@@ -360,7 +361,7 @@ def get_bool(value):
>>> get_bool('Stream')
'Stream'
"""
if type(value) == bool:
if type(value) is bool:
return value
elif value in ['True', 'true']:
return True
@@ -901,19 +902,6 @@ def trim_station_components(data, trim_start=True, trim_end=True):
return data
def merge_stream(stream):
gaps = stream.get_gaps()
if gaps:
# list of merged stations (seed_ids)
merged = ['{}.{}.{}.{}'.format(*gap[:4]) for gap in gaps]
stream.merge(method=1)
print('Merged the following stations because of gaps:')
for merged_station in merged:
print(merged_station)
return stream, gaps
def check4gapsAndRemove(data):
"""
check for gaps in Stream and remove them
@@ -934,12 +922,12 @@ def check4gapsAndRemove(data):
return data
def check4gapsAndMerge(data):
def check_for_gaps_and_merge(data):
"""
check for gaps in Stream and merge if gaps are found
:param data: stream of seismic data
:type data: `~obspy.core.stream.Stream`
:return: data stream
:return: data stream, gaps returned from obspy get_gaps
:rtype: `~obspy.core.stream.Stream`
"""
gaps = data.get_gaps()
@@ -950,7 +938,7 @@ def check4gapsAndMerge(data):
for merged_station in merged:
print(merged_station)
return data
return data, gaps
def check4doubled(data):
@@ -1218,6 +1206,7 @@ def identifyPhase(phase):
return False
@lru_cache
def identifyPhaseID(phase):
"""
Returns phase id (capital P or S)
+9 -6
View File
@@ -1,9 +1,12 @@
# This file may be used to create an environment using:
# $ conda create --name <env> --file <this file>
# platform: win-64
cartopy>=0.20.2
numpy<2
obspy>=1.3.0
pyqtgraph>=0.12.4
pyside2>=5.13.2
scipy>=1.8.0
cartopy=0.20.2
matplotlib-base=3.3.4
numpy=1.22.3
obspy=1.3.0
pyqtgraph=0.12.4
pyside2=5.13.2
python=3.8.12
qt=5.12.9
scipy=1.8.0