提交 69080684 编辑于 作者: Mijian Xu's avatar Mijian Xu 😷
浏览文件

fix components names

上级 87bab509
......@@ -104,17 +104,17 @@ class eq(object):
return bazs[seispy.geo.extrema(ampt, opt='min')[0]] - bazi
def fix_channel_name(self):
if self.st.select(channel='??1') and hasattr(self.st.select(channel='*1')[0].stats.sac, 'cmpaz'):
if self.st.select(channel='??1') and self.st.select(channel='??Z') and hasattr(self.st.select(channel='*1')[0].stats.sac, 'cmpaz'):
if self.st.select(channel='*1')[0].stats.sac.cmpaz == 0:
self.st.select(channel='*1')[0].stats.channel = self.st.select(channel='*1')[0].stats.channel[:-1] + 'N'
self.st.select(channel='*2')[0].stats.channel = self.st.select(channel='*2')[0].stats.channel[:-1] + 'E'
elif self.st.select(channel='*1')[0].stats.sac.cmpaz != 0:
rotateZNE(self.st)
self.st.sort(['channel'])
elif self.st.select(channel='1'):
self.st.select(channel='1')[0].stats.channel = 'Z'
self.st.select(channel='2')[0].stats.channel = 'N'
self.st.select(channel='3')[0].stats.channel = 'E'
elif self.st.select(channel='*1'):
self.st.select(channel='*1')[0].stats.channel = 'Z'
self.st.select(channel='*2')[0].stats.channel = 'N'
self.st.select(channel='*3')[0].stats.channel = 'E'
self.st.sort(['channel'])
else:
pass
......
......@@ -207,7 +207,7 @@ class RF(object):
self.logger.RFlog.error('{0}'.format(e))
raise e
def search_eq(self, local=False, server=None):
def search_eq(self, local=False, server=None, catalog='GCMT'):
if not local:
try:
if server is None:
......@@ -216,7 +216,7 @@ class RF(object):
self.eq_lst = wsfetch(server, starttime=self.para.date_begin, endtime=self.para.date_end,
latitude=self.stainfo.stla, longitude=self.stainfo.stlo,
minmagnitude=self.para.magmin, maxmagnitude=self.para.magmax,
minradius=self.para.dismin, maxradius=self.para.dismax)
minradius=self.para.dismin, maxradius=self.para.dismax, catalog=catalog)
except Exception as e:
raise ConnectionError(e)
else:
......
......@@ -2,7 +2,7 @@
from setuptools import find_packages, setup
packages = find_packages()
VERSION = "1.1.10"
VERSION = "1.1.11"
setup(name='seispy',
version=VERSION,
author='Mijian Xu',
......
支持 Markdown
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册