From b81a4fbc6fa67f495af4bba2716b28e7366eb81b Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Fri, 15 Jan 2021 10:30:44 -0500 Subject: [PATCH 1/3] Asn_Lv2NRSLAMPSpectral: Break out the negative cases --- jwst/associations/lib/rules_level2b.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/jwst/associations/lib/rules_level2b.py b/jwst/associations/lib/rules_level2b.py index a81526d4a6..ad0e0dde70 100644 --- a/jwst/associations/lib/rules_level2b.py +++ b/jwst/associations/lib/rules_level2b.py @@ -462,9 +462,19 @@ def __init__(self, *args, **kwargs): Constraint( [ DMSAttrConstraint( - sources=['grating', 'opmode', 'lamp'], - value='mirror|grating-only|nolamp', - force_unique=False + sources=['grating'], + value='mirror', + force_unique=False, + ), + DMSAttrConstraint( + sources=['opmode'], + value='grating-only', + force_unique=False, + ), + DMSAttrConstraint( + sources=['lamp'], + value='nolamp', + force_unique=False, ), ], reduce=Constraint.notany From e07a55a4d77292f4a6f236aa632aaf1ddcd925cc Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Mon, 18 Jan 2021 09:05:13 -0500 Subject: [PATCH 2/3] Update changelog --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index cbe5f5685e..5e233d4c34 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ associations ------------ +- JWSTDMS-410 Asn_Lv2NRSLAMPSpectral: Break out the negative cases [#5635] + - Update MIRI LRS-Fixedslit ALONG-SLIT-NOD backgrounds strategies [#5620] cube_build From 6bcfaea37c0a302a8cf13a58ad20512db27ba4b7 Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Mon, 18 Jan 2021 09:09:37 -0500 Subject: [PATCH 3/3] Update engineering db test for modified data --- jwst/lib/tests/test_engdb_mock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jwst/lib/tests/test_engdb_mock.py b/jwst/lib/tests/test_engdb_mock.py index 1e5a3d8ec4..e5e62f3114 100644 --- a/jwst/lib/tests/test_engdb_mock.py +++ b/jwst/lib/tests/test_engdb_mock.py @@ -158,7 +158,7 @@ def test_mocker_alive(db_cache): 'mnemonic, count', [ (GOOD_MNEMONIC, 1), - ('CAL', 40), + ('CAL', 14), ('', 2100), ] )