diff --git a/pylot/core/io/data.py b/pylot/core/io/data.py index 0bb22951..9b8ced19 100644 --- a/pylot/core/io/data.py +++ b/pylot/core/io/data.py @@ -393,13 +393,13 @@ 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)) - picks = copy.deepcopy(event_old.picks) - event = merge_picks(event, picks) + else: + picks = copy.deepcopy(event_old.picks) + event = merge_picks(event, picks) # apply event information from location event_old.update(event) diff --git a/pylot/core/io/inputs.py b/pylot/core/io/inputs.py index 9aa9b5d2..9b23612d 100644 --- 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: - val0 = float(val0) + try: + val0 = float(val0) + except: + pass val.append(val0) else: val = str(value.strip())