diff --git a/improver/calibration/dz_rescaling.py b/improver/calibration/dz_rescaling.py index b62b4fa07d..d006dfaed7 100644 --- a/improver/calibration/dz_rescaling.py +++ b/improver/calibration/dz_rescaling.py @@ -19,7 +19,7 @@ from improver.calibration.utilities import filter_non_matching_cubes from improver.constants import SECONDS_IN_HOUR from improver.metadata.constants.time_types import TIME_COORDS -from improver.spotdata.utilities import neighbour_finding_method_name +from improver.spotdata.utilities import get_neighbour_finding_method_name class EstimateDzRescaling(PostProcessingPlugin): @@ -74,7 +74,7 @@ def __init__( # Please see numpy.polynomial.polynomial.Polynomial.fit for further information. self.polyfit_deg = 1 - self.neighbour_selection_method = neighbour_finding_method_name( + self.neighbour_selection_method = get_neighbour_finding_method_name( land_constraint=land_constraint, minimum_dz=similar_altitude ) self.site_id_coord = site_id_coord diff --git a/improver/cli/apply_height_adjustment.py b/improver/cli/apply_height_adjustment.py index 77eba59a66..f5ec1141c6 100644 --- a/improver/cli/apply_height_adjustment.py +++ b/improver/cli/apply_height_adjustment.py @@ -52,9 +52,9 @@ def process( height """ from improver.spotdata.height_adjustment import SpotHeightAdjustment - from improver.spotdata.utilities import neighbour_finding_method_name + from improver.spotdata.utilities import get_neighbour_finding_method_name - neighbour_selection_method = neighbour_finding_method_name( + neighbour_selection_method = get_neighbour_finding_method_name( land_constraint=land_constraint, minimum_dz=similar_altitude ) diff --git a/improver/spotdata/neighbour_finding.py b/improver/spotdata/neighbour_finding.py index 85ec9d273a..1f345a912e 100644 --- a/improver/spotdata/neighbour_finding.py +++ b/improver/spotdata/neighbour_finding.py @@ -20,7 +20,7 @@ from improver.spotdata.build_spotdata_cube import build_spotdata_cube from improver.utilities.cube_manipulation import enforce_coordinate_ordering -from .utilities import neighbour_finding_method_name +from .utilities import get_neighbour_finding_method_name class NeighbourSelection(BasePlugin): @@ -596,7 +596,7 @@ def process( ) # Construct a name to describe the neighbour finding method employed - method_name = neighbour_finding_method_name( + method_name = get_neighbour_finding_method_name( self.land_constraint, self.minimum_dz ) diff --git a/improver/spotdata/spot_manipulation.py b/improver/spotdata/spot_manipulation.py index dc357fe081..2eeb14c73f 100644 --- a/improver/spotdata/spot_manipulation.py +++ b/improver/spotdata/spot_manipulation.py @@ -51,7 +51,7 @@ from .apply_lapse_rate import SpotLapseRateAdjust from .spot_extraction import SpotExtraction -from .utilities import neighbour_finding_method_name +from .utilities import get_neighbour_finding_method_name class SpotManipulation(BasePlugin): @@ -141,7 +141,7 @@ def __init__( Triggers equal-weighting blending of the realization coord if required. Use this if a threshold coord is also present on the input cube. """ - self.neighbour_selection_method = neighbour_finding_method_name( + self.neighbour_selection_method = get_neighbour_finding_method_name( land_constraint, similar_altitude ) self.apply_lapse_rate_correction = apply_lapse_rate_correction diff --git a/improver/spotdata/utilities.py b/improver/spotdata/utilities.py index 23e8cc58da..426de5783e 100644 --- a/improver/spotdata/utilities.py +++ b/improver/spotdata/utilities.py @@ -32,7 +32,7 @@ """Spot data utilities.""" -def neighbour_finding_method_name(land_constraint: bool, minimum_dz: bool) -> str: +def get_neighbour_finding_method_name(land_constraint: bool, minimum_dz: bool) -> str: """ Create a name to describe the neighbour method based on the constraints provided. diff --git a/improver_tests/spotdata/test_utilities.py b/improver_tests/spotdata/test_utilities.py index 6c898dd4b5..357250ec7a 100644 --- a/improver_tests/spotdata/test_utilities.py +++ b/improver_tests/spotdata/test_utilities.py @@ -33,7 +33,7 @@ import pytest -from improver.spotdata.utilities import neighbour_finding_method_name +from improver.spotdata.utilities import get_neighbour_finding_method_name @pytest.mark.parametrize( @@ -45,9 +45,9 @@ (False, True, "nearest_minimum_dz"), ), ) -def test_neighbour_finding_method_name(land_constraint, minimum_dz, expected): +def test_get_neighbour_finding_method_name(land_constraint, minimum_dz, expected): """Test the function for generating the name that describes the neighbour finding method.""" - result = neighbour_finding_method_name(land_constraint, minimum_dz) + result = get_neighbour_finding_method_name(land_constraint, minimum_dz) assert result == expected