From 18674eb634c47761ee2f4b4e7b0495b306969773 Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Tue, 26 Dec 2023 10:29:26 -0600 Subject: [PATCH 1/2] component validation for WaveX and DMWaveX --- src/pint/models/timing_model.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pint/models/timing_model.py b/src/pint/models/timing_model.py index 3f6c69ecf..66c487a6c 100644 --- a/src/pint/models/timing_model.py +++ b/src/pint/models/timing_model.py @@ -491,15 +491,19 @@ def num_components_of_type(type): from pint.models.dispersion_model import DispersionDMX from pint.models.wave import Wave + from pint.models.wavex import WaveX + from pint.models.dmwavex import DMWaveX from pint.models.noise_model import PLRedNoise, PLDMNoise - if num_components_of_type((DispersionDMX, PLDMNoise)) > 1: + if num_components_of_type((DispersionDMX, PLDMNoise, DMWaveX)) > 1: log.warning( - "DispersionDMX and PLDMNoise are being used together. They are two ways of modelling the same effect." + "DispersionDMX, PLDMNoise, and DMWaveX cannot be used together. " + "They are ways of modelling the same effect." ) - if num_components_of_type((Wave, PLRedNoise)) > 1: + if num_components_of_type((Wave, WaveX, PLRedNoise)) > 1: log.warning( - "Wave and PLRedNoise are being used together. They are two ways of modelling the same effect." + "Wave, WaveX, and PLRedNoise cannot be used together. " + "They are ways of modelling the same effect." ) # def __str__(self): From 179e53e47b65401fdf7252bafb89f6b3b99ad573 Mon Sep 17 00:00:00 2001 From: Abhimanyu Susobhanan Date: Tue, 26 Dec 2023 10:32:16 -0600 Subject: [PATCH 2/2] changelog --- CHANGELOG-unreleased.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-unreleased.md b/CHANGELOG-unreleased.md index ea25592e0..0435a285f 100644 --- a/CHANGELOG-unreleased.md +++ b/CHANGELOG-unreleased.md @@ -23,4 +23,5 @@ the released changes. - Fixed `derived_params` when OMDOT has 0 uncertainty - `model.find_empty_masks` will now also look at DMX and SWX parameters - Fixed `make_fake_toas_fromtim` +- Emit warnings when `WaveX`/`DMWaveX` is used together with other representations of red/DM noise ### Removed