From 15f323075e37f2d2c87d9af8f1c04490a5bd136d Mon Sep 17 00:00:00 2001 From: asteinbe Date: Wed, 14 Jan 2026 18:30:35 +0100 Subject: [PATCH] Switiching numpy float import to built-in float imports --- beam_stack.py | 4 ++-- fk_parstack.py | 17 +++++++++-------- obspy_fk_analyse_polar.py | 8 ++++---- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/beam_stack.py b/beam_stack.py index 76d95e1..8e6fa15 100644 --- a/beam_stack.py +++ b/beam_stack.py @@ -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', @@ -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] diff --git a/fk_parstack.py b/fk_parstack.py index 2cc2815..2f06201 100644 --- a/fk_parstack.py +++ b/fk_parstack.py @@ -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 ' @@ -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 ' @@ -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) @@ -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) @@ -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( @@ -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) diff --git a/obspy_fk_analyse_polar.py b/obspy_fk_analyse_polar.py index 6eb684c..c43c06d 100644 --- a/obspy_fk_analyse_polar.py +++ b/obspy_fk_analyse_polar.py @@ -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( @@ -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']