From fedb7c2c0ddb25ad2f8d7e61b24428e04d4559eb Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Fri, 7 Jul 2017 13:15:20 +0200 Subject: [PATCH] [hotfix refs #220] Missmatching ressource_id's only produced warning on exporting picks, but did not prevent event mixing --- pylot/core/io/data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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)