PyLoT.py

@@ -3687,13 +3687,10 @@ class MainWindow(QMainWindow):
         if not self.okToContinue():
             return
         if not fnm:
-            settings = QSettings()
+            dlg = QFileDialog(parent=self)
-            dir = settings.value('current_project_path')
-            dlg = QFileDialog(parent=self, directory=dir)
             fnm = dlg.getOpenFileName(self, 'Open project file...', filter='Pylot project (*.plp)')[0]
             if not fnm:
                 return
-            settings.setValue('current_project_path', os.path.split(fnm)[0])
         if not os.path.exists(fnm):
             QMessageBox.warning(self, 'Could not open file',
                                 'Could not open project file {}. File does not exist.'.format(fnm))

pylot/core/pick/autopick.py

@@ -20,7 +20,7 @@ from pylot.core.pick.charfuns import CharacteristicFunction
 from pylot.core.pick.charfuns import HOScf, AICcf, ARZcf, ARHcf, AR3Ccf
 from pylot.core.pick.picker import AICPicker, PragPicker
 from pylot.core.pick.utils import checksignallength, checkZ4S, earllatepicker, \
-    getSNR, fmpicker, checkPonsets, wadaticheck, get_quality_class, PickingFailedException, MissingTraceException
+    getSNR, fmpicker, checkPonsets, wadaticheck, get_quality_class
 from pylot.core.util.utils import getPatternLine, gen_Pool, \
     get_bool, identifyPhaseID, get_None, correct_iplot
 
@@ -232,6 +232,20 @@ class PickingContainer:
         self.Sflag = 0
 
 
+class MissingTraceException(ValueError):
+    """
+    Used to indicate missing traces in a obspy.core.stream.Stream object
+    """
+    pass
+
+
+class PickingFailedException(Exception):
+    """
+    Raised when picking fails due to missing values etc.
+    """
+    pass
+
+
 class AutopickStation(object):
 
     def __init__(self, wfstream, pickparam, verbose, iplot=0, fig_dict=None, metadata=None, origin=None):

pylot/core/pick/charfuns.py

@@ -20,8 +20,6 @@ import numpy as np
 from scipy import signal
 from obspy.core import Stream
 
-from pylot.core.pick.utils import PickingFailedException
-
 
 class CharacteristicFunction(object):
     """
@@ -295,7 +293,7 @@ class HOScf(CharacteristicFunction):
             if j < 4:
                 LTA[j] = 0
                 STA[j] = 0
-            elif j <= ista and self.getOrder() == 2:
+            elif j <= ista:
                 lta = (y[j] + lta * (j - 1)) / j
                 if self.getOrder() == 2:
                     sta = (y[j] + sta * (j - 1)) / j
@@ -490,9 +488,6 @@ class ARHcf(CharacteristicFunction):
         print('Calculating AR-prediction error from both horizontal traces ...')
 
         xnp = self.getDataArray(self.getCut())
-        if len(xnp[0]) == 0:
-            raise PickingFailedException('calcCF: Found empty data trace for cut times. Return')
-
         n0 = np.isnan(xnp[0].data)
         if len(n0) > 1:
             xnp[0].data[n0] = 0

pylot/core/pick/picker.py

@@ -178,9 +178,7 @@ class AICPicker(AutoPicker):
         aic = tap * self.cf + max(abs(self.cf))
         # smooth AIC-CF
         ismooth = int(round(self.Tsmooth / self.dt))
-        # MP MP better start with original data than zeros if array shall be smoothed, created artificial value before
+        aicsmooth = np.zeros(len(aic))
-        # when starting with i in range(1...) loop below and subtracting offset afterwards
-        aicsmooth = np.copy(aic)
         if len(aic) < ismooth:
             print('AICPicker: Tsmooth larger than CF!')
             return
@@ -190,7 +188,7 @@ class AICPicker(AutoPicker):
                     ii1 = i - ismooth
                     aicsmooth[i] = aicsmooth[i - 1] + (aic[i] - aic[ii1]) / ismooth
                 else:
-                    aicsmooth[i] = np.mean(aic[0: i]) # MP MP created np.nan for i=1
+                    aicsmooth[i] = np.mean(aic[1: i])
         # remove offset in AIC function
         offset = abs(min(aic) - min(aicsmooth))
         aicsmooth = aicsmooth - offset
@@ -199,7 +197,7 @@ class AICPicker(AutoPicker):
         # minimum in AIC function 
         icfmax = np.argmax(cf)
 
-        # TODO: If this shall be kept, maybe add thresh_factor to pylot parameters
+        # MP MP testing threshold
         thresh_hit = False
         thresh_factor = 0.7
         thresh = thresh_factor * cf[icfmax]
@@ -211,6 +209,7 @@ class AICPicker(AutoPicker):
                 if sample <= cf[index - 1]:
                     icfmax = index - 1
                     break
+        # MP MP ---
 
         # find minimum in AIC-CF front of maximum of HOS/AR-CF
         lpickwindow = int(round(self.PickWindow / self.dt))

pylot/core/pick/utils.py

@@ -890,8 +890,6 @@ def checksignallength(X, pick, minsiglength, pickparams, iplot=0, fig=None, line
                 input()
             except SyntaxError:
                 pass
-            except EOFError:
-                pass
             plt.close(fig)
 
     return returnflag
@@ -1518,17 +1516,3 @@ if __name__ == '__main__':
     import doctest
 
     doctest.testmod()
-
-
-class PickingFailedException(Exception):
-    """
-    Raised when picking fails due to missing values etc.
-    """
-    pass
-
-
-class MissingTraceException(ValueError):
-    """
-    Used to indicate missing traces in a obspy.core.stream.Stream object
-    """
-    pass

pylot/core/util/widgets.py

@@ -1602,9 +1602,9 @@ class SearchFileByExtensionDialog(QtWidgets.QDialog):
 
         self.tableWidget = QtWidgets.QTableWidget()
         tableWidget = self.tableWidget
-        tableWidget.setColumnCount(3)
+        tableWidget.setColumnCount(2)
         tableWidget.setRowCount(len(self.events))
-        tableWidget.setHorizontalHeaderLabels(('Event ID', 'Filename', 'Last modified'))
+        tableWidget.setHorizontalHeaderLabels(('Filename', 'Last modified'))
         tableWidget.setEditTriggers(tableWidget.NoEditTriggers)
         tableWidget.setSortingEnabled(True)
         header = tableWidget.horizontalHeader()
@@ -1628,7 +1628,6 @@ class SearchFileByExtensionDialog(QtWidgets.QDialog):
         self.tableWidget.clearContents()
         for index, event in enumerate(self.events):
             filename = get_pylot_eventfile_with_extension(event, fext)
-            self.tableWidget.setItem(index, 0, QtWidgets.QTableWidgetItem(f'{event.pylot_id}'))
             if filename:
                 self.filepaths.append(filename)
                 ts = int(os.path.getmtime(filename))
@@ -1636,8 +1635,8 @@ class SearchFileByExtensionDialog(QtWidgets.QDialog):
                 # create QTableWidgetItems of filepath and last modification time
                 fname_item = QtWidgets.QTableWidgetItem(f'{filename}')
                 ts_item = QtWidgets.QTableWidgetItem(f'{datetime.datetime.fromtimestamp(ts)}')
-                self.tableWidget.setItem(index, 1, fname_item)
+                self.tableWidget.setItem(index, 0, fname_item)
-                self.tableWidget.setItem(index, 2, ts_item)
+                self.tableWidget.setItem(index, 1, ts_item)
 
         # TODO: Idea -> only refresh if table contents changed. Use selection to load only a subset of files
         if len(self.filepaths) > 0: