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

[namefix] rename data file and corresponding function

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2016-09-23 14:28:02 +02:00
parent d0a46eb2bb
commit 65740e6cff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
inputs/gutenberg_richter.data → inputs/richter_scaling.data
View File

4
pylot/core/analysis/magnitude.py
View File

@ -17,9 +17,9 @@ from pylot.core.io.data import Data
from pylot.core.util.dataprocessing import restitute_data, read_metadata from pylot.core.util.dataprocessing import restitute_data, read_metadata
from pylot.core.util.utils import common_range, fit_curve from pylot.core.util.utils import common_range, fit_curve
def gutenberg_richter_relation(delta): def richter_magnitude_scaling(delta):
relation = np.loadtxt(os.path.join(os.path.expanduser('~'), relation = np.loadtxt(os.path.join(os.path.expanduser('~'),
'.pylot', 'gutenberg_richter.data')) '.pylot', 'richter_scaling.data'))
# prepare spline interpolation to calculate return value # prepare spline interpolation to calculate return value
func, params = fit_curve(relation[:,0], relation[:, 1]) func, params = fit_curve(relation[:,0], relation[:, 1])
return func(delta, params) return func(delta, params)