From 2dd1f5ca2e0416f4d6103e136bf867076812c3fb Mon Sep 17 00:00:00 2001 From: Leo Singer Date: Sat, 22 Jul 2017 09:28:49 -0600 Subject: [PATCH] Introduce custom exception class Original: 136222252030abe406e3ec00f907eeb1f6ed043f --- .../python/lalinference/io/events/detector_disabled.py | 10 +++++++--- lalinference/test/test_io_events.py | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lalinference/python/lalinference/io/events/detector_disabled.py b/lalinference/python/lalinference/io/events/detector_disabled.py index e2eec20afd..b3a87fd577 100644 --- a/lalinference/python/lalinference/io/events/detector_disabled.py +++ b/lalinference/python/lalinference/io/events/detector_disabled.py @@ -19,7 +19,11 @@ Modify events by artificially disabling specified detectors. """ from .base import * -__all__ = ('DetectorDisabledEventSource',) +__all__ = ('DetectorDisabledEventSource', 'DetectorDisabledError') + + +class DetectorDisabledError(ValueError): + pass class DetectorDisabledEventSource(EventSource): @@ -51,13 +55,13 @@ class DetectorDisabledEvent(Event): if self.source.raises: detectors = {s.detector for s in self.base_event.singles} if not detectors & disabled_detectors: - raise ValueError( + raise DetectorDisabledError( 'Disabling detectors {{{}}} would have no effect on this ' 'event with detectors {{{}}}'.format( ' '.join(disabled_detectors), ' '.join(detectors))) if not detectors - disabled_detectors: - raise ValueError( + raise DetectorDisabledError( 'Disabling detectors {{{}}} would exclude all data for ' 'this event with detectors {{{}}}'.format( ' '.join(disabled_detectors), diff --git a/lalinference/test/test_io_events.py b/lalinference/test/test_io_events.py index b74a4e3193..c48deaa880 100644 --- a/lalinference/test/test_io_events.py +++ b/lalinference/test/test_io_events.py @@ -158,7 +158,7 @@ def test_detector_disabled(): for event in nonraising_source.values(): event.singles for event in raising_source.values(): - with raises(ValueError, expected_message): + with raises(events.DetectorDisabledError, expected_message): event.singles # Now test that exceptions are raised when they are called for. @@ -171,7 +171,7 @@ def test_detector_disabled(): for event in nonraising_source.values(): event.singles for event in raising_source.values(): - with raises(ValueError, expected_message): + with raises(events.DetectorDisabledError, expected_message): event.singles def test_hdf(tmpdir): -- GitLab