From 29de94f780bde63c04ced67b42f2a7e29627646b Mon Sep 17 00:00:00 2001 From: Colm Talbot Date: Wed, 24 Jun 2026 11:42:38 -0400 Subject: [PATCH 1/2] MAINT: remove old environment variables --- .github/workflows/unit-tests.yml | 1 - bilby/gw/detector/interferometer.py | 17 ++--------------- test/gw/detector/interferometer_test.py | 11 ----------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 3c2eaba5d..0e7addc42 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -19,7 +19,6 @@ concurrency: env: CONDA_PATH: /opt/conda/ - BILBY_ALLOW_PARAMETERS_AS_STATE: FALSE SETUPTOOLS_SCM_IGNORE_DUBIOUS_OWNER: 1 jobs: diff --git a/bilby/gw/detector/interferometer.py b/bilby/gw/detector/interferometer.py index 9e9c23bdf..b7cd35c14 100644 --- a/bilby/gw/detector/interferometer.py +++ b/bilby/gw/detector/interferometer.py @@ -505,19 +505,6 @@ def inject_signal_from_waveform_polarizations(self, parameters, injection_polari for key in parameters: logger.info(' {} = {}'.format(key, parameters[key])) - @property - def _window_power_correction(self): - """ - This property enables the old (incorrect) PSD correction to be applied - using the :code:`BILBY_INCORRECT_PSD_NORMALIZATION` environment variable. - """ - if string_to_boolean( - os.environ.get("BILBY_INCORRECT_PSD_NORMALIZATION", "FALSE").upper() - ): - return self.strain_data.window_factor - else: - return 1 - @property def amplitude_spectral_density_array(self): """ Returns the amplitude spectral density (ASD) given we know a power spectral density (PSD) @@ -529,7 +516,7 @@ def amplitude_spectral_density_array(self): """ return self.power_spectral_density.get_amplitude_spectral_density_array( frequency_array=self.strain_data.frequency_array - ) * self._window_power_correction**0.5 + ) @property def power_spectral_density_array(self): @@ -544,7 +531,7 @@ def power_spectral_density_array(self): """ return self.power_spectral_density.get_power_spectral_density_array( frequency_array=self.strain_data.frequency_array - ) * self._window_power_correction + ) def unit_vector_along_arm(self, arm): logger.warning("This method has been moved and will be removed in the future." diff --git a/test/gw/detector/interferometer_test.py b/test/gw/detector/interferometer_test.py index cb1666320..e02d12276 100644 --- a/test/gw/detector/interferometer_test.py +++ b/test/gw/detector/interferometer_test.py @@ -385,17 +385,6 @@ def test_psd_not_impacted_by_window_factor(monkeypatch): ) -def test_psd_impacted_by_window_factor_with_environment_variable(monkeypatch): - ifo = bilby.gw.detector.get_empty_interferometer("H1") - ifo.set_strain_data_from_zero_noise(duration=4, sampling_frequency=256) - old_psd = ifo.power_spectral_density_array - factor = 0.1 - env = dict(BILBY_INCORRECT_PSD_NORMALIZATION="TRUE") - monkeypatch.setattr(os, "environ", env) - monkeypatch.setattr(ifo.strain_data, "window_factor", factor) - np.testing.assert_array_equal(old_psd * factor, ifo.power_spectral_density_array) - - class TestInterferometerEquals(unittest.TestCase): def setUp(self): self.name = "name" From 46c2ec80e6723cf9056fc4a4ad7cd198a0a857cf Mon Sep 17 00:00:00 2001 From: Colm Talbot Date: Wed, 24 Jun 2026 11:51:23 -0400 Subject: [PATCH 2/2] FMT: remove unneeded imports --- bilby/gw/detector/interferometer.py | 1 - test/gw/detector/interferometer_test.py | 1 - 2 files changed, 2 deletions(-) diff --git a/bilby/gw/detector/interferometer.py b/bilby/gw/detector/interferometer.py index b7cd35c14..37f4957c7 100644 --- a/bilby/gw/detector/interferometer.py +++ b/bilby/gw/detector/interferometer.py @@ -9,7 +9,6 @@ from ...core import utils from ...core.utils import docstring, logger, PropertyAccessor, safe_file_dump -from ...core.utils.env import string_to_boolean from .. import utils as gwutils from .calibration import Recalibrate from .geometry import InterferometerGeometry diff --git a/test/gw/detector/interferometer_test.py b/test/gw/detector/interferometer_test.py index e02d12276..ed9472053 100644 --- a/test/gw/detector/interferometer_test.py +++ b/test/gw/detector/interferometer_test.py @@ -1,4 +1,3 @@ -import os import unittest from unittest import mock