BUG: squash some bugs

Author: ColmTalbot

bilby/gw/detector/interferometer.py

@@ -664,8 +664,7 @@ def whiten_frequency_series(self, frequency_series : np.array) -> np.array:
             return np.nan_to_num(frequency_series / (
                 self.amplitude_spectral_density_array
                 * np.sqrt(self.duration / 4)
-                * self.frequency_mask
-            ))
+            )) * self.frequency_mask
         else:
             return self.whiten_and_crop(frequency_series=frequency_series)
 
@@ -715,7 +714,7 @@ def whiten_and_crop(self, frequency_series : np.array) -> np.array:
         cropped_time_series = time_series[self.time_mask]
         cropped_white, _ = nfft(cropped_time_series, self.sampling_frequency)
 
-        return cropped_white * (4 / (self.duration - 2 * self.cropped_duration))**0.5
+        return cropped_white * (4 / self.cropped_duration)**0.5
 
     def get_whitened_time_series_from_whitened_frequency_series(
         self,

bilby/gw/likelihood/base.py

@@ -301,30 +301,32 @@ def calculate_snrs(self, waveform_polarizations, interferometer, return_array=Tr
                 (self.number_of_response_curves, 1)
             ).T
 
-            d_inner_h_integrand *= self.calibration_draws[interferometer.name].T
+            d_inner_h_integrand[interferometer.frequency_mask] *= self.calibration_draws[interferometer.name].T
 
-            d_inner_h_array = np.fft.fft(d_inner_h_integrand[0:-1], axis=0).T
+            d_inner_h_array = np.fft.fft(d_inner_h_integrand[:-1], axis=0).T
 
             optimal_snr_squared_integrand = np.abs(whitened_signal)**2
             optimal_snr_squared_array = np.dot(
-                optimal_snr_squared_integrand,
+                optimal_snr_squared_integrand[interferometer.frequency_mask],
                 self.calibration_abs_draws[interferometer.name].T
             )
 
         elif self.time_marginalization and not self.calibration_marginalization:
-            d_inner_h_array = np.fft.fft(
+            d_inner_h_integrand = (
                 whitened_signal
                 * interferometer.whitened_frequency_domain_strain.conjugate()
             )
+            d_inner_h_array = np.fft.fft(d_inner_h_integrand[:-1])
 
         elif self.calibration_marginalization and ('recalib_index' not in parameters):
             d_inner_h_integrand = (
                 interferometer.whitened_frequency_domain_strain.conjugate() * whitened_signal
-            )
+            )[interferometer.frequency_mask]
             d_inner_h_array = np.dot(d_inner_h_integrand, self.calibration_draws[interferometer.name].T)
 
             optimal_snr_squared_integrand = np.abs(whitened_signal)**2
             optimal_snr_squared_array = np.dot(
+                optimal_snr_squared_integrand[interferometer.frequency_mask],
                 self.calibration_abs_draws[interferometer.name].T
             )