From a82c1d39c6a54f1f72edba04c59371d655c361f6 Mon Sep 17 00:00:00 2001
From: Sebastian Wehling-Benatelli <sebastian.wehling@rub.de>
Date: Tue, 3 May 2016 09:35:31 +0200
Subject: [PATCH] [fix] fixing obvious problems in advance

---
 pylot/core/io/data.py                | 17 ++++++++---------
 pylot/core/io/phases.py              | 12 +++++++-----
 pylot/core/pick/utils.py             |  4 ----
 scripts/pylot-reasses-pilot-event.py |  1 -
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/pylot/core/io/data.py b/pylot/core/io/data.py
index faa07cb8..01c36d4f 100644
--- a/pylot/core/io/data.py
+++ b/pylot/core/io/data.py
@@ -411,19 +411,18 @@ class Data(object):
             :raise OverwriteError: raises an OverwriteError if the picks list is
              not empty. The GUI will then ask for a decision.
             """
-            firstonset = None
+
+            #firstonset = find_firstonset(picks)
             if self.getEvtData().picks:
                 raise OverwriteError('Actual picks would be overwritten!')
-            picks, firstonset = picks_from_dict(picks)
+            picks = picks_from_dict(picks)
             self.getEvtData().picks = picks
+            # if 'smi:local' in self.getID() and firstonset:
+            #     fonset_str = firstonset.strftime('%Y_%m_%d_%H_%M_%S')
+            #     ID = ResourceIdentifier('event/' + fonset_str)
+            #     ID.convertIDToQuakeMLURI(authority_id=authority_id)
+            #     self.getEvtData().resource_id = ID
 
-            if 'smi:local' in self.getID() and firstonset:
-                fonset_str = firstonset.strftime('%Y_%m_%d_%H_%M_%S')
-                ID = ResourceIdentifier('event/' + fonset_str)
-                ID.convertIDToQuakeMLURI(authority_id=authority_id)
-                self.getEvtData().resource_id = ID
-            else:
-                print('No picks to apply!')
 
         def applyArrivals(arrivals):
             """
diff --git a/pylot/core/io/phases.py b/pylot/core/io/phases.py
index f3c6c96a..50d4f228 100644
--- a/pylot/core/io/phases.py
+++ b/pylot/core/io/phases.py
@@ -230,7 +230,7 @@ def picks_to_dict(evt):
     return picks
 
 def picks_from_dict(picks):
-    firstonset = None
+    picks_list = list()
     for station, onsets in picks.items():
         print('Reading picks on station %s' % station)
         for label, phase in onsets.items():
@@ -262,9 +262,9 @@ def picks_from_dict(picks):
                 else:
                     pick.polarity = 'undecidable'
             except KeyError as e:
-                print('No polarity information found for %s' % phase)
-            if firstonset is None or firstonset > onset:
-                firstonset = onset
+                print(e.message, 'No polarity information found for %s' % phase)
+            picks_list.append(pick)
+    return picks_list
 
 
 def reassess_pilot_event(root_dir, event_id):
@@ -303,7 +303,9 @@ def reassess_pilot_event(root_dir, event_id):
     evt = ope.Event(resource_id=event_id)
     evt.picks = picks_from_dict(picks_dict)
     # write phase information to file
-    evt.write('{0}.xml'.format(event_id), format='QUAKEML')
+    fnout_prefix = os.path.join(root_dir, event_id, '{0}.'.format(event_id))
+    evt.write(fnout_prefix + 'xml', format='QUAKEML')
+    evt.write(fnout_prefix + 'cnv', format='VELEST')
 
 
 def writephases(arrivals, fformat, filename):
diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py
index b8cf358d..6e7fe2f5 100644
--- a/pylot/core/pick/utils.py
+++ b/pylot/core/pick/utils.py
@@ -938,10 +938,6 @@ def checkZ4S(X, pick, zfac, checkwin, iplot):
     return returnflag
 
 
-def reassess_pilot_event():
-    pass
-
-
 if __name__ == '__main__':
     import doctest
 
diff --git a/scripts/pylot-reasses-pilot-event.py b/scripts/pylot-reasses-pilot-event.py
index 074f5218..f48a08f2 100644
--- a/scripts/pylot-reasses-pilot-event.py
+++ b/scripts/pylot-reasses-pilot-event.py
@@ -3,7 +3,6 @@
 
 import argparse
 
-from pylot.core.pick.utils import reassess_pilot_event
 from pylot.core.util.version import get_git_version as _getVersionString
 from pylot.core.io.phases import reassess_pilot_event