Merge branch 'develop' into style_options
This commit is contained in:
commit
e310e1b6a6
@ -1546,7 +1546,7 @@ class MainWindow(QMainWindow):
|
||||
check4gaps(wfdat)
|
||||
check4doubled(wfdat)
|
||||
# check for stations with rotated components
|
||||
wfdat = check4rotated(wfdat, self.metadata)
|
||||
wfdat = check4rotated(wfdat, self.metadata, verbosity=0)
|
||||
# trim station components to same start value
|
||||
trim_station_components(wfdat, trim_start=True, trim_end=False)
|
||||
self._stime = full_range(self.get_data().getWFData())[0]
|
||||
|
@ -652,8 +652,10 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None):
|
||||
print("wadatacheck: Skipped %d S pick(s)" % ibad)
|
||||
else:
|
||||
print("###############################################")
|
||||
print("wadatacheck: Not enough checked S-P times available!")
|
||||
print("wadaticheck: Not enough checked S-P times available!")
|
||||
print("Skip Wadati check!")
|
||||
wfitflag = 1
|
||||
wdfit2 = None
|
||||
|
||||
checkedonsets = pickdic
|
||||
|
||||
|
@ -689,7 +689,7 @@ def get_stations(data):
|
||||
return stations
|
||||
|
||||
|
||||
def check4rotated(data, metadata=None):
|
||||
def check4rotated(data, metadata=None, verbosity=1):
|
||||
|
||||
def rotate_components(wfstream, metadata=None):
|
||||
"""rotates components if orientation code is numeric.
|
||||
@ -698,13 +698,15 @@ def check4rotated(data, metadata=None):
|
||||
# indexing fails if metadata is None
|
||||
metadata[0]
|
||||
except:
|
||||
msg = 'Warning: could not rotate traces since no metadata was given\nset Inventory file!'
|
||||
print(msg)
|
||||
if verbosity:
|
||||
msg = 'Warning: could not rotate traces since no metadata was given\nset Inventory file!'
|
||||
print(msg)
|
||||
return wfstream
|
||||
if metadata[0] is None:
|
||||
# sometimes metadata is (None, (None,))
|
||||
msg = 'Warning: could not rotate traces since no metadata was given\nCheck inventory directory!'
|
||||
print(msg)
|
||||
if verbosity:
|
||||
msg = 'Warning: could not rotate traces since no metadata was given\nCheck inventory directory!'
|
||||
print(msg)
|
||||
return wfstream
|
||||
else:
|
||||
parser = metadata[1]
|
||||
|
@ -1195,6 +1195,7 @@ class PickDlg(QDialog):
|
||||
|
||||
# init pick delete (with right click)
|
||||
self.connect_pick_delete()
|
||||
self.setWindowTitle('Pickwindow on station: {}'.format(self.getStation()))
|
||||
|
||||
def setupUi(self):
|
||||
menuBar = QtGui.QMenuBar(self)
|
||||
@ -2492,7 +2493,7 @@ class TuneAutopicker(QWidget):
|
||||
# trim station components to same start value
|
||||
trim_station_components(wfdat, trim_start=True, trim_end=False)
|
||||
# rotate misaligned stations to ZNE
|
||||
wfdat = check4rotated(wfdat, self.parent().metadata)
|
||||
wfdat = check4rotated(wfdat, self.parent().metadata, verbosity=0)
|
||||
self.stationBox.clear()
|
||||
stations = []
|
||||
for trace in self.data.getWFData():
|
||||
|
Loading…
Reference in New Issue
Block a user