From 0dffe37d3b86217c1685c3d6393928d598412681 Mon Sep 17 00:00:00 2001 From: Sebastianw Wehling-Benatelli Date: Fri, 23 Sep 2016 14:28:02 +0200 Subject: [PATCH] [namefix] rename data file and corresponding function --- inputs/{gutenberg_richter.data => richter_scaling.data} | 0 pylot/core/analysis/magnitude.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename inputs/{gutenberg_richter.data => richter_scaling.data} (100%) diff --git a/inputs/gutenberg_richter.data b/inputs/richter_scaling.data similarity index 100% rename from inputs/gutenberg_richter.data rename to inputs/richter_scaling.data diff --git a/pylot/core/analysis/magnitude.py b/pylot/core/analysis/magnitude.py index 73dd422c..8c3612a0 100644 --- a/pylot/core/analysis/magnitude.py +++ b/pylot/core/analysis/magnitude.py @@ -19,9 +19,9 @@ from scipy import integrate, signal from pylot.core.util.dataprocessing import restitute_data, read_metadata 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('~'), - '.pylot', 'gutenberg_richter.data')) + '.pylot', 'richter_scaling.data')) # prepare spline interpolation to calculate return value func, params = fit_curve(relation[:,0], relation[:, 1]) return func(delta, params)