From 9a42b0f17b6fa97cebaf5d5653994019b1a1ed32 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 20 Feb 2025 14:52:25 +0000 Subject: [PATCH 1/3] Moved --ignore-inconsistent from mutually exclusive group Signed-off-by: Daniel Williams --- cli_bilby/bilby_result.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cli_bilby/bilby_result.py b/cli_bilby/bilby_result.py index 8ef763083..48d546747 100644 --- a/cli_bilby/bilby_result.py +++ b/cli_bilby/bilby_result.py @@ -75,6 +75,11 @@ def setup_command_line_args(): action="store_true", help="If true, strip back the result to only the posterior", ) + parser.add_argument( + "--ignore-inconsistent", + action="store_true", + help="If true, ignore inconsistency errors in the merge process, but print a warning", + ) action_parser = parser.add_mutually_exclusive_group(required=True) action_parser.add_argument( @@ -89,11 +94,7 @@ def setup_command_line_args(): action="store_true", help="Merge the set of runs, output saved using the outdir and label", ) - action_parser.add_argument( - "--ignore-inconsistent", - action="store_true", - help="If true, ignore inconsistency errors in the merge process, but print a warning", - ) + action_parser.add_argument( "-b", "--bayes", action="store_true", help="Print all Bayes factors." ) From 43b3db79c3c6d97c2f2104784484fdef3ee68bc1 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 5 Apr 2025 09:14:59 +0200 Subject: [PATCH 2/3] Change GEO600 to G1 so that bilby can understand GEO frames. --- bilby/gw/detector/detectors/GEO600.interferometer | 2 +- test/gw/detector/interferometer_test.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bilby/gw/detector/detectors/GEO600.interferometer b/bilby/gw/detector/detectors/GEO600.interferometer index addde6d1c..6efe8e854 100644 --- a/bilby/gw/detector/detectors/GEO600.interferometer +++ b/bilby/gw/detector/detectors/GEO600.interferometer @@ -1,7 +1,7 @@ # GEO600 at the sensitivity during initial LIGO S6. # arXiv:gr-qc/0008066 Table 1 # http://www.geo600.org/1032083/GEO600_Sensitivity_Curves -name = 'GEO600' +name = 'G1' power_spectral_density = PowerSpectralDensity(asd_file='GEO600_S6e_asd.txt') minimum_frequency = 40 maximum_frequency = 2048 diff --git a/test/gw/detector/interferometer_test.py b/test/gw/detector/interferometer_test.py index 08a8f6a87..c02dd3222 100644 --- a/test/gw/detector/interferometer_test.py +++ b/test/gw/detector/interferometer_test.py @@ -513,8 +513,8 @@ def test_eq_false_different_ifo_strain_data(self): class TestInterferometerAntennaPatternAgainstLAL(unittest.TestCase): def setUp(self): self.name = "name" - self.ifo_names = ['H1', 'L1', 'V1', 'K1', 'GEO600', 'ET'] - self.lal_prefixes = {'H1': 'H1', 'L1': 'L1', 'V1': 'V1', 'K1': 'K1', 'GEO600': 'G1', 'ET': 'E1'} + self.ifo_names = ['H1', 'L1', 'V1', 'K1', 'G1', 'ET'] + self.lal_prefixes = {'H1': 'H1', 'L1': 'L1', 'V1': 'V1', 'K1': 'K1', 'G1': 'G1', 'ET': 'E1'} self.polarizations = ['plus', 'cross', 'breathing', 'longitudinal', 'x', 'y'] self.ifos = bilby.gw.detector.InterferometerList(self.ifo_names) self.gpstime = 1305303144 From e2f8ab3c68cd8797605013d3270e909b033955b6 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 5 Apr 2025 09:19:19 +0200 Subject: [PATCH 3/3] Move the ifo file. --- .../detectors/{GEO600.interferometer => G1.interferometer} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bilby/gw/detector/detectors/{GEO600.interferometer => G1.interferometer} (100%) diff --git a/bilby/gw/detector/detectors/GEO600.interferometer b/bilby/gw/detector/detectors/G1.interferometer similarity index 100% rename from bilby/gw/detector/detectors/GEO600.interferometer rename to bilby/gw/detector/detectors/G1.interferometer