[change] corrected for required versions

PyLoT.py

@@ -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
+from pylot.core.analysis.magnitude import LocalMagnitude, MomentMagnitude, calcsourcespec
 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
+    check_all_pylot, get_bool, get_None, get_pylot_eventfile_with_extension
 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, \
-    SpectrogramTab, SearchFileByExtensionDialog
+    SourceSpecWindow, ChooseWaveFormWindow, 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

pylot/core/util/utils.py

@@ -8,7 +8,6 @@ import platform
 import re
 import subprocess
 import warnings
-from typing import Literal, Tuple, Type
 from functools import lru_cache
 
 import numpy as np
@@ -107,7 +106,7 @@ def gen_Pool(ncores=0):
 
     print('gen_Pool: Generated multiprocessing Pool with {} cores\n'.format(ncores))
 
-    pool = multiprocessing.Pool(ncores, maxtasksperchild=100)
+    pool = multiprocessing.Pool(ncores)
     return pool
 
 
@@ -361,7 +360,7 @@ def get_bool(value):
     >>> get_bool('Stream')
     'Stream'
     """
-    if type(value) is bool:
+    if type(value) == bool:
         return value
     elif value in ['True', 'true']:
         return True
@@ -902,6 +901,19 @@ 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
@@ -922,12 +934,12 @@ def check4gapsAndRemove(data):
     return data
 
 
-def check_for_gaps_and_merge(data):
+def check4gapsAndMerge(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, gaps returned from obspy get_gaps
+    :return: data stream
     :rtype: `~obspy.core.stream.Stream`
     """
     gaps = data.get_gaps()
@@ -938,7 +950,7 @@ def check_for_gaps_and_merge(data):
         for merged_station in merged:
             print(merged_station)
 
-    return data, gaps
+    return data
 
 
 def check4doubled(data):
@@ -1206,7 +1218,6 @@ def identifyPhase(phase):
         return False
 
 
-@lru_cache
 def identifyPhaseID(phase):
     """
     Returns phase id (capital P or S)

requirements.txt

@@ -1,12 +1,9 @@
 # This file may be used to create an environment using:
 # $ conda create --name <env> --file <this file>
 # platform: win-64
-cartopy=0.20.2
+cartopy>=0.20.2
-matplotlib-base=3.3.4
+numpy<2
-numpy=1.22.3
+obspy>=1.3.0
-obspy=1.3.0
+pyqtgraph>=0.12.4
-pyqtgraph=0.12.4
+pyside2>=5.13.2
-pyside2=5.13.2
+scipy>=1.8.0
-python=3.8.12
-qt=5.12.9
-scipy=1.8.0