diff --git a/batdetect2/compat/params.py b/batdetect2/compat/params.py index ffd8500..0cf9b19 100644 --- a/batdetect2/compat/params.py +++ b/batdetect2/compat/params.py @@ -3,7 +3,7 @@ from batdetect2.preprocess import ( AudioConfig, FrequencyConfig, LogScaleConfig, - PcenScaleConfig, + PcenConfig, PreprocessingConfig, ResampleConfig, Scales, @@ -24,7 +24,7 @@ from batdetect2.train.preprocess import ( def get_spectrogram_scale(scale: str) -> Scales: if scale == "pcen": - return PcenScaleConfig() + return PcenConfig() if scale == "log": return LogScaleConfig() return AmplitudeScaleConfig() @@ -52,12 +52,12 @@ def get_preprocessing_config(params: dict) -> PreprocessingConfig: max_freq=params["max_freq"], ), scale=get_spectrogram_scale(params["spec_scale"]), - denoise=params["denoise_spec_avg"], + spectral_mean_substraction=params["denoise_spec_avg"], size=SpecSizeConfig( height=params["spec_height"], resize_factor=params["resize_factor"], ), - max_scale=params["max_scale_spec"], + peak_normalize=params["max_scale_spec"], ), ) diff --git a/tests/test_migration/test_preprocessing.py b/tests/test_migration/test_preprocessing.py index 8480215..394ad01 100644 --- a/tests/test_migration/test_preprocessing.py +++ b/tests/test_migration/test_preprocessing.py @@ -83,7 +83,7 @@ def test_spectrogram_generation_hasnt_changed( if spec_scale == "log": scale = preprocess.LogScaleConfig() elif spec_scale == "pcen": - scale = preprocess.PcenScaleConfig() + scale = preprocess.PcenConfig() else: scale = preprocess.AmplitudeScaleConfig() @@ -97,9 +97,9 @@ def test_spectrogram_generation_hasnt_changed( max_freq=max_freq, ), scale=scale, - denoise=denoise_spec_avg, + spectral_mean_substraction=denoise_spec_avg, size=None, - max_scale=max_scale_spec, + peak_normalize=max_scale_spec, ) recording = data.Recording.from_file(