marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Marcel Paffrath 2017-07-10 11:31:04 +02:00
commit bd4da2cc84
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pylot/core/io/data.py
View File

@ -393,13 +393,13 @@ class Data(object):
else: else:
# prevent overwriting original pick information # prevent overwriting original pick information
event_old = self.get_evt_data() event_old = self.get_evt_data()
print(event_old.resource_id, event.resource_id)
if not 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( print("WARNING: Missmatch in event resource id's: {} and {}".format(
event_old.resource_id, event_old.resource_id,
event.resource_id)) event.resource_id))
picks = copy.deepcopy(event_old.picks) else:
event = merge_picks(event, picks) picks = copy.deepcopy(event_old.picks)
event = merge_picks(event, picks)
# apply event information from location # apply event information from location
event_old.update(event) event_old.update(event)

5
pylot/core/io/inputs.py
View File

@ -208,7 +208,10 @@ class PylotParameter(object):
vallist = value.strip().split(' ') vallist = value.strip().split(' ')
val = [] val = []
for val0 in vallist: for val0 in vallist:
val0 = float(val0) try:
val0 = float(val0)
except:
pass
val.append(val0) val.append(val0)
else: else:
val = str(value.strip()) val = str(value.strip())