Merge branch 'main' into RCAL-950_CRDSKeywordsMisc

.pre-commit-config.yaml

@@ -42,7 +42,7 @@ repos:
       args: ["--py38-plus"]
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.7.1'
+  rev: 'v0.7.3'
   hooks:
     - id: ruff
       args: ["--fix"]

changes/402.misc.rst

@@ -0,0 +1,2 @@
+Use multiclass of `np.uint32` and `Enum` rather than a subclass of `IntEnum` for
+the dqflags as suggested by the numpy devs.

changes/415.removal.rst

@@ -0,0 +1 @@
+Remove units from Guidewindow related data models.

changes/425.bugfix.rst

@@ -0,0 +1 @@
+Fix Enum bug in python < 3.11 for the dqflags.

src/roman_datamodels/dqflags.py

@@ -19,7 +19,19 @@
 the formula `2**bit_number` where `bit_number` is the 0-index bit of interest.
 """
 
-from enum import IntEnum, unique
+import sys
+from enum import unique
+
+# Something with pickling of multiclassed enums was changed in 3.11 + allowing
+# us to directly us `np.uint32` as the enum object rather than a python `int`.
+if sys.version_info < (3, 11):
+    from enum import IntEnum
+else:
+    from enum import Enum
+
+    import numpy as np
+
+    class IntEnum(np.uint32, Enum): ...
 
 
 # fmt: off

src/roman_datamodels/maker_utils/_datamodels.py

@@ -1,7 +1,6 @@
 import warnings
 
 import numpy as np
-from astropy import units as u
 from astropy.table import Table
 
 from roman_datamodels import stnode
@@ -399,13 +398,9 @@ def mk_guidewindow(*, shape=(2, 8, 16, 32, 32), filepath=None, **kwargs):
     guidewindow = stnode.Guidewindow()
     guidewindow["meta"] = mk_guidewindow_meta(**kwargs.get("meta", {}))
 
-    guidewindow["pedestal_frames"] = kwargs.get(
-        "pedestal_frames", u.Quantity(np.zeros(shape, dtype=np.uint16), u.DN, dtype=np.uint16)
-    )
-    guidewindow["signal_frames"] = kwargs.get(
-        "signal_frames", u.Quantity(np.zeros(shape, dtype=np.uint16), u.DN, dtype=np.uint16)
-    )
-    guidewindow["amp33"] = kwargs.get("amp33", u.Quantity(np.zeros(shape, dtype=np.uint16), u.DN, dtype=np.uint16))
+    guidewindow["pedestal_frames"] = kwargs.get("pedestal_frames", np.zeros(shape, dtype=np.uint16))
+    guidewindow["signal_frames"] = kwargs.get("signal_frames", np.zeros(shape, dtype=np.uint16))
+    guidewindow["amp33"] = kwargs.get("amp33", np.zeros(shape, dtype=np.uint16))
 
     return save_node(guidewindow, filepath=filepath)
 

tests/test_dqflags.py

@@ -1,5 +1,7 @@
+import sys
 from math import log10
 
+import numpy as np
 import pytest
 
 from roman_datamodels import datamodels as rdm
@@ -30,7 +32,10 @@ def test_pixel_flags(flag):
     assert isinstance(flag, dqflags.pixel)
 
     # Test that the pixel flags are ints
-    assert isinstance(flag, int)
+    if sys.version_info < (3, 11):
+        assert isinstance(flag, int)
+    else:
+        assert isinstance(flag, np.uint32)
 
     # Test that the pixel flags are dict accessible
     assert dqflags.pixel[flag.name] is flag
@@ -78,7 +83,10 @@ def test_group_flags(flag):
     assert isinstance(flag, dqflags.group)
 
     # Test that the group flags are ints
-    assert isinstance(flag, int)
+    if sys.version_info < (3, 11):
+        assert isinstance(flag, int)
+    else:
+        assert isinstance(flag, np.uint32)
 
     # Test that the group flags are dict accessible
     assert dqflags.group[flag.name] is flag

tests/test_models.py

@@ -311,11 +311,8 @@ def test_make_guidewindow():
 
     assert guidewindow.meta.exposure.type == "WFI_IMAGE"
     assert guidewindow.pedestal_frames.dtype == np.uint16
-    assert guidewindow.pedestal_frames.unit == u.DN
     assert guidewindow.signal_frames.dtype == np.uint16
-    assert guidewindow.signal_frames.unit == u.DN
     assert guidewindow.amp33.dtype == np.uint16
-    assert guidewindow.amp33.unit == u.DN
     assert guidewindow.pedestal_frames.shape == (2, 2, 2, 2, 2)
     assert guidewindow.signal_frames.shape == (2, 2, 2, 2, 2)
     assert guidewindow.amp33.shape == (2, 2, 2, 2, 2)