[refactor] code cleanup (WIP), open issues #25 and #26

pylot/core/io/phases.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import pdb
 import glob
 import matplotlib.pyplot as plt
 import numpy as np
@@ -393,9 +392,6 @@ def reassess_pilot_event(root_dir, db_dir, event_id, out_dir=None, fn_param=None
     from pylot.core.pick.utils import earllatepicker
     # TODO: change root to datapath
 
-    if fn_param is None:
-        fn_param = defaults.AUTOMATIC_DEFAULTS
-
     default = PylotParameter(fn_param, verbosity)
 
     search_base = os.path.join(root_dir, db_dir, event_id)
@@ -518,7 +514,7 @@ def writephases(arrivals, fformat, filename, parameter=None, eventinfo=None):
         # write header
         fid.write('# EQEVENT: %s Label: EQ%s  Loc:  X 0.00  Y 0.00  Z 10.00  OT 0.00 \n' %
                   (parameter.get('database'), parameter.get('eventID')))
-        arrivals = chooseArrivals(arrivals)
+        arrivals = chooseArrivals(arrivals) # MP MP what is chooseArrivals? It is not defined anywhere
         for key in arrivals:
             # P onsets
             if arrivals[key].has_key('P'):
@@ -594,7 +590,7 @@ def writephases(arrivals, fformat, filename, parameter=None, eventinfo=None):
         # write header
         fid.write('                                                                %s\n' %
                   parameter.get('eventID'))
-        arrivals = chooseArrivals(arrivals)
+        arrivals = chooseArrivals(arrivals) # MP MP what is chooseArrivals? It is not defined anywhere
         for key in arrivals:
             if arrivals[key]['P']['weight'] < 4:
                 stat = key
@@ -671,7 +667,7 @@ def writephases(arrivals, fformat, filename, parameter=None, eventinfo=None):
         fid = open("%s" % filename, 'w')
         # write header
         fid.write('%s, event %s \n' % (parameter.get('database'), parameter.get('eventID')))
-        arrivals = chooseArrivals(arrivals)
+        arrivals = chooseArrivals(arrivals)  # MP MP what is chooseArrivals? It is not defined anywhere
         for key in arrivals:
             # P onsets
             if arrivals[key].has_key('P') and arrivals[key]['P']['mpp'] is not None:
@@ -962,7 +958,7 @@ def writephases(arrivals, fformat, filename, parameter=None, eventinfo=None):
                 erh, erz, eventinfo.magnitudes[0]['mag'],
                 hashID))
         # Prefer Manual Picks over automatic ones if possible
-        arrivals = chooseArrivals(arrivals)
+        arrivals = chooseArrivals(arrivals)  # MP MP what is chooseArrivals? It is not defined anywhere
         # write phase lines
         for key in arrivals:
             if arrivals[key].has_key('P'):

pylot/core/pick/picker.py

@@ -509,7 +509,7 @@ class PragPicker(AutoPicker):
                 self.Pick = pick_l
                 pickflag = 1
             elif flagpick_l > 0 and flagpick_r > 0 and cfpick_l >= cfpick_r:
-                self.Pick = pick_r
+                self.Pick = pick_r # MP MP there is no pick_r defined, commented out after commit of LK on 29.07.2020 (see above)
                 pickflag = 1
             elif flagpick_l == 0 and flagpick_r > 0 and cfpick_l >= cfpick_r:
                 self.Pick = pick_l

pylot/core/util/connection.py

@@ -2,12 +2,13 @@
 # -*- coding: utf-8 -*-
 
 try:
+    # noinspection PyUnresolvedReferences
     from urllib2 import urlopen
 except:
     from urllib.request import urlopen
 
 
-def checkurl(url='https://ariadne.geophysik.ruhr-uni-bochum.de/trac/PyLoT/'):
+def checkurl(url='https://git.geophysik.ruhr-uni-bochum.de/marcel/pylot/'):
     """
     check if URL is available
     :param url: url

pylot/core/util/dataprocessing.py

@@ -351,25 +351,25 @@ def check_time(datetime):
     :type datetime: list
     :return: returns True if Values are in supposed range, returns False otherwise
 
-    >>> check_time([1999, 01, 01, 23, 59, 59, 999000])
+    >>> check_time([1999, 1, 1, 23, 59, 59, 999000])
     True
-    >>> check_time([1999, 01, 01, 23, 59, 60, 999000])
+    >>> check_time([1999, 1, 1, 23, 59, 60, 999000])
     False
-    >>> check_time([1999, 01, 01, 23, 59, 59, 1000000])
+    >>> check_time([1999, 1, 1, 23, 59, 59, 1000000])
     False
-    >>> check_time([1999, 01, 01, 23, 60, 59, 999000])
+    >>> check_time([1999, 1, 1, 23, 60, 59, 999000])
     False
-    >>> check_time([1999, 01, 01, 23, 60, 59, 999000])
+    >>> check_time([1999, 1, 1, 23, 60, 59, 999000])
     False
-    >>> check_time([1999, 01, 01, 24, 59, 59, 999000])
+    >>> check_time([1999, 1, 1, 24, 59, 59, 999000])
     False
-    >>> check_time([1999, 01, 31, 23, 59, 59, 999000])
+    >>> check_time([1999, 1, 31, 23, 59, 59, 999000])
     True
-    >>> check_time([1999, 02, 30, 23, 59, 59, 999000])
+    >>> check_time([1999, 2, 30, 23, 59, 59, 999000])
     False
-    >>> check_time([1999, 02, 29, 23, 59, 59, 999000])
+    >>> check_time([1999, 2, 29, 23, 59, 59, 999000])
     False
-    >>> check_time([2000, 02, 29, 23, 59, 59, 999000])
+    >>> check_time([2000, 2, 29, 23, 59, 59, 999000])
     True
     >>> check_time([2000, 13, 29, 23, 59, 59, 999000])
     False
@@ -444,7 +444,7 @@ def evt_head_check(root_dir, out_dir=None):
     """
     if not out_dir:
         print('WARNING files are going to be overwritten!')
-        inp = str(raw_input('Continue? [y/N]'))
+        inp = str(input('Continue? [y/N]'))
         if not inp == 'y':
             sys.exit()
     filelist = get_file_list(root_dir)