Merge branch 'master' into taup

2017-07-10 11:30:37 +02:00 · 2017-07-10 11:30:37 +02:00 · 8dcff4a467
commit 8dcff4a467
parent a9334372e8 fedb7c2c0d
2 changed files with 7 additions and 4 deletions
--- a/pylot/core/io/data.py
+++ b/pylot/core/io/data.py
@ -393,11 +393,11 @@ class Data(object):
            else:
                # prevent overwriting original pick information
                event_old = self.get_evt_data()
-                print(event_old.resource_id, event.resource_id)
                if not event_old.resource_id == event.resource_id:
                    print("WARNING: Missmatch in event resource id's: {} and {}".format(
                        event_old.resource_id,
                        event.resource_id))
+                else:
                    picks = copy.deepcopy(event_old.picks)
                    event = merge_picks(event, picks)
                # apply event information from location
--- a/pylot/core/io/inputs.py
+++ b/pylot/core/io/inputs.py
@ -208,7 +208,10 @@ class PylotParameter(object):
                        vallist = value.strip().split(' ')
                        val = []
                        for val0 in vallist:
+                            try:
                                val0 = float(val0)
+                            except:
+                                pass
                            val.append(val0)
                    else:
                        val = str(value.strip())