From 6bf3811da04fde4f0ce4b94b7f819865e8d2a11f Mon Sep 17 00:00:00 2001 From: Maximilian Gruber <maximilian.gruber@ptb.de> Date: Mon, 29 Apr 2024 15:10:57 +0200 Subject: [PATCH] rewrite lambda functions --- app/cocal_methods.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/app/cocal_methods.py b/app/cocal_methods.py index c0fe483..755c671 100644 --- a/app/cocal_methods.py +++ b/app/cocal_methods.py @@ -757,28 +757,29 @@ class CocalMethods: mask_ri = np.r_[mask, mask] # function to draw samples for Monte Carlo - draw_samples = lambda size: real_imag_2_complex( - np.random.normal( - self.ref_spectrum_ri[mask_ri], - self.ref_spectrum_unc_ri[mask_ri], - size=(size, self.ref_spectrum_ri[mask_ri].size), + def draw_samples(size): + return real_imag_2_complex( + np.random.normal( + self.ref_spectrum_ri[mask_ri], + self.ref_spectrum_unc_ri[mask_ri], + size=(size, self.ref_spectrum_ri[mask_ri].size), + ) ) - ) # function to evaluate samples in Monte Carlo w_empirical_exp = ( - np.exp( - -1j * 2 * np.pi * self.ref_frequency[mask] / frame_rate - ), - ) - evaluate = lambda sample: self.fit_filter( - sample, - H_dut=self.dut_spectrum[mask], - theta0=theta0, - Nb=Nb, - w_empirical_exp=w_empirical_exp, + np.exp(-1j * 2 * np.pi * self.ref_frequency[mask] / frame_rate), ) + def evaluate(sample): + return self.fit_filter( + sample, + H_dut=self.dut_spectrum[mask], + theta0=theta0, + Nb=Nb, + w_empirical_exp=w_empirical_exp, + ) + umc_kwargs = { "draw_samples": draw_samples, "evaluate": evaluate, -- GitLab