Skip to content

Switiching numpy float import to built-in float imports #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
braunfuss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switiching numpy float import to built-in float imports #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions beam_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def setup(self):
self.add_parameter(Param('Center lon', 'lon_c', 180., -180., 180.,
high_is_none=True))
self.add_parameter(Param('Back azimuth', 'bazi', 0., 0., 360.))
self.add_parameter(Param('slowness', 'slow', 0.1, 0., 1.))
self.add_parameter(Param('slowness', 'slow', 0.1, 0., 400.))
self.add_parameter(Choice('slowness unit', 'unit', 's/km',['s/km',
's/deg']))
self.add_parameter(Choice('Treat different dt by', 'diff_dt_treat',
Expand Down Expand Up @@ -141,7 +141,7 @@ def call(self):
lats = num.array([s.lat for s in stations])
lons = num.array([s.lon for s in stations])
ns, es = ortho.latlon_to_ne_numpy(lat0, lon0, lats, lons)
theta = num.float(self.bazi*num.pi/180.)
theta = float(self.bazi*num.pi/180.)
R = num.array([[num.cos(theta), -num.sin(theta)],
[num.sin(theta), num.cos(theta)]])
distances = R.dot(num.vstack((es, ns)))[1]
Expand Down
17 changes: 9 additions & 8 deletions fk_parstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def lowpass_array(ydata_array, deltat, order, corner, demean=True, axis=1):

(b, a) = trace._get_cached_filter_coefs(
order, [corner*2.0*deltat], btype='low')
data = ydata_array.astype(num.float64)
data = ydata_array.astype(float)
if len(a) != order+1 or len(b) != order+1:
logger.warn(
'Erroneous filter coefficients returned by '
Expand All @@ -141,7 +141,7 @@ def highpass_array(ydata_array, deltat, order, corner, demean=True, axis=1):
'''
(b, a) = trace._get_cached_filter_coefs(
order, [corner*2.0*deltat], btype='high')
data = ydata_array.astype(num.float64)
data = ydata_array.astype(float)
if len(a) != order+1 or len(b) != order+1:
logger.warn(
'Erroneous filter coefficients returned by '
Expand Down Expand Up @@ -272,7 +272,7 @@ def call(self):
if len(deltats) > 1:
self.fail('sampling rates differ in dataset')
else:
deltat_cf = deltats[0]
deltat_cf = list(deltats)[0]

tinc_use = self.get_tinc_use(precision=deltat_cf)

Expand Down Expand Up @@ -354,7 +354,7 @@ def trace_selector(x):
tr.highpass(4, viewer.highpass, demean=True)
else:
tr.ydata = num.asarray(
tr.ydata, dtype=num.float) - num.mean(tr.ydata)
tr.ydata, dtype=float) - num.mean(tr.ydata)
if viewer.lowpass:
tr.lowpass(4, viewer.lowpass)

Expand All @@ -372,7 +372,7 @@ def trace_selector(x):
ydata = fftconvolve(arrays[itr], taper, mode='same')
else:
ydata = arrays[itr]
_arrays.append(num.asarray(ydata, dtype=num.float64))
_arrays.append(num.asarray(ydata, dtype=float))
arrays = _arrays

offsets = num.array(
Expand Down Expand Up @@ -406,13 +406,14 @@ def trace_selector(x):
max_powers = num.max(frames, axis=0)

# power maxima in blocks
i_max_blocked = search_max_block(
n_maxsearch=int(npad*self.search_factor), data=max_powers)
#i_max_blocked = search_max_block(
# n_maxsearch=int(npad*self.search_factor), data=max_powers)

max_powers += (num.min(max_powers)*-1)
max_powers /= num.max(max_powers)
max_powers *= max_powers
weights = max_powers[i_max_blocked]
#i_max_blocked[:] = i_max_blocked[:].astype(int)
#weights = max_powers[i_max_blocked]
block_max_times = times[i_max_blocked]

_argmax = num.argmax(frames, axis=0)
Expand Down
8 changes: 4 additions & 4 deletions obspy_fk_analyse_polar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class FK(Snuffling):

def setup(self):
self.set_name('FK Analysis')
self.add_parameter(Param('Slowness range[+-]', 'smax', 0.2, 0., 1.))
self.add_parameter(Param('Slowness range[+-]', 'smax', 0.2, 0., 400.))
self.add_parameter(Param(
'Number of slowness divisions', 'divisor', 20, 10, 50))
self.add_parameter(Param(
Expand Down Expand Up @@ -195,15 +195,15 @@ def call(self):

# circle through backazimuth
for i, row in enumerate(hist):
ax.bar(left=(pi / 2 - (i + 1) * dw) * num.ones(N),
ax.bar((pi / 2 - (i + 1) * dw) * num.ones(N),
height=dh * num.ones(N), width=dw,
bottom=dh * num.arange(N), color=cmap(row / hist.max()))
bottom=dh * num.arange(N), color=cmap(row / 13.192642724394759))

ax.set_xticks([pi / 2, 0, 3. / 2 * pi, pi])
ax.set_xticklabels(['N', 'E', 'S', 'W'])
ax.set_ylim(0., self.smax)
ColorbarBase(cax, cmap=cmap,
norm=Normalize(vmin=hist.min(), vmax=hist.max()))
norm=Normalize(vmin=hist.min(), vmax=13.192642724394759))

fig2 = self.pylab(get='figure')
labels = ['rel.power', 'abs.power', 'baz', 'slow']
Expand Down