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

shots no longer None if they are removed, but flag = 0

Browse Source
This commit is contained in:
Marcel Paffrath 2015-10-07 14:51:20 +02:00
parent 09f0cd3e71
commit c71e28ecb7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pylot/core/active/activeSeismoPick.py
View File

@ -127,7 +127,7 @@ class Survey(object):
shot.removePick(traceID) shot.removePick(traceID)
# -- TEST: set and check SNR before adding to distance bin ############################ # -- TEST: set and check SNR before adding to distance bin ############################
if shot.getPick(traceID) is not None: if shot.getFlag(traceID) is not 0:
shot.setEarllatepick(traceID) shot.setEarllatepick(traceID)
tpicksum += (datetime.now() - tstartpick); tpick = tpicksum/count tpicksum += (datetime.now() - tstartpick); tpick = tpicksum/count
@ -194,7 +194,7 @@ class Survey(object):
for traceID in shot.getTraceIDlist(): for traceID in shot.getTraceIDlist():
snrlist.append(shot.getSNR(traceID)[0]) snrlist.append(shot.getSNR(traceID)[0])
dist.append(shot.getDistance(traceID)) dist.append(shot.getDistance(traceID))
if shot.getPick(traceID) is not None: if shot.getFlag(traceID) is not 0:
pickedTraces += 1 pickedTraces += 1
info_dict[shot.getShotnumber()] = {'numtraces': numtraces, info_dict[shot.getShotnumber()] = {'numtraces': numtraces,
'picked traces': [pickedTraces, 'picked traces': [pickedTraces,
@ -235,7 +235,7 @@ class Survey(object):
traceIDlist.sort() traceIDlist.sort()
ttfile.writelines(str(self.countPickedTraces(shot)) + '\n') ttfile.writelines(str(self.countPickedTraces(shot)) + '\n')
for traceID in traceIDlist: for traceID in traceIDlist:
if shot.getPick(traceID) is not None: if shot.getFlag(traceID) is not 0:
pick = shot.getPick(traceID) * fmtomo_factor pick = shot.getPick(traceID) * fmtomo_factor
delta = shot.getPickError(traceID) * fmtomo_factor delta = shot.getPickError(traceID) * fmtomo_factor
(x, y, z) = shot.getRecLoc(traceID) (x, y, z) = shot.getRecLoc(traceID)
@ -252,7 +252,7 @@ class Survey(object):
def countPickedTraces(self, shot): def countPickedTraces(self, shot):
count = 0 count = 0
for traceID in shot.getTraceIDlist(): for traceID in shot.getTraceIDlist():
if shot.getPick(traceID) is not None: if shot.getFlag(traceID) is not 0:
count += 1 count += 1
return count return count
@ -271,7 +271,7 @@ class Survey(object):
for shot in self.data.values(): for shot in self.data.values():
for traceID in shot.getTraceIDlist(): for traceID in shot.getTraceIDlist():
if plotDeleted == False: if plotDeleted == False:
if shot.getPick(traceID) is not None: if shot.getFlag(traceID) is not 0:
dist.append(shot.getDistance(traceID)) dist.append(shot.getDistance(traceID))
pick.append(shot.getPick(traceID)) pick.append(shot.getPick(traceID))
snrloglist.append(math.log10(shot.getSNR(traceID)[0])) snrloglist.append(math.log10(shot.getSNR(traceID)[0]))