From 8d2a714adad3ce31b096fd528d957f3fb864050a Mon Sep 17 00:00:00 2001 From: Jacob Golomb Date: Wed, 11 Aug 2021 16:56:13 -0700 Subject: [PATCH 1/3] Removed redundant conversion to FrequencySeries in calculating optimal snr --- pycbc/strain/recalibrate.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pycbc/strain/recalibrate.py b/pycbc/strain/recalibrate.py index 304b955db94..649126172e3 100644 --- a/pycbc/strain/recalibrate.py +++ b/pycbc/strain/recalibrate.py @@ -348,8 +348,6 @@ def calibration_optimal_snr(self, strain, psd = None, ht_calib = self.apply_calibration(ht) - ht_calib = FrequencySeries(ht_calib.squeeze(), delta_f = ht.delta_f) - if psd: try: np.testing.assert_almost_equal(ht.delta_f, psd.delta_f) From 37c033197b21c168d95105d207de9eaaf557d976 Mon Sep 17 00:00:00 2001 From: Jacob Golomb Date: Mon, 16 Aug 2021 16:56:01 -0700 Subject: [PATCH 2/3] added a line to set self.n_points to the length of the frequency array --- pycbc/strain/recalibrate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pycbc/strain/recalibrate.py b/pycbc/strain/recalibrate.py index 649126172e3..0c51e687173 100644 --- a/pycbc/strain/recalibrate.py +++ b/pycbc/strain/recalibrate.py @@ -149,7 +149,7 @@ def __init__(self, spline_points=None, params=None, self.spline_index = spline_index self.spline_points = spline_points self.calibration_file = calibration_file - + self.set_spline(params, spline_index) @@ -209,6 +209,7 @@ def set_spline(self, params=None, spline_index=None, **kwargs): """ if params: + self.n_points = len(self.spline_points) self.params.update(**params) self.calibration_amplitude = \ [self.params['amplitude_{}_{}'.format(self.ifo_name, ii)] \ From f0bb683f144f0d9e45efc1738b16241a37e9ba4b Mon Sep 17 00:00:00 2001 From: Jacob Golomb Date: Wed, 18 Aug 2021 16:40:23 -0700 Subject: [PATCH 3/3] Fixed error in slicing frequencies of strain object --- pycbc/strain/recalibrate.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pycbc/strain/recalibrate.py b/pycbc/strain/recalibrate.py index 0c51e687173..bbbd71afed5 100644 --- a/pycbc/strain/recalibrate.py +++ b/pycbc/strain/recalibrate.py @@ -149,7 +149,7 @@ def __init__(self, spline_points=None, params=None, self.spline_index = spline_index self.spline_points = spline_points self.calibration_file = calibration_file - + self.set_spline(params, spline_index) @@ -345,10 +345,10 @@ def calibration_optimal_snr(self, strain, psd = None, kmin, kmax = get_cutoff_indices(low_frequency_cutoff, high_frequency_cutoff, strain.delta_f, N) - ht = strain[kmin:kmax] - - ht_calib = self.apply_calibration(ht) + ht = strain[kmin:kmax] + ht_calib = self.apply_calibration(strain)[kmin:kmax] + if psd: try: np.testing.assert_almost_equal(ht.delta_f, psd.delta_f) @@ -703,4 +703,4 @@ def map_to_adjust(self, strain, **params): kappa_tst_im=calib_args[5], kappa_pu_re=calib_args[6], kappa_pu_im=calib_args[7]) - return strain_adjusted + return strain_adjusted \ No newline at end of file