Fix mixin ordering for datamodels

spacetelescope · Jul 12, 2023 · 19ebd6c · 19ebd6c
1 parent 5960d77
commit 19ebd6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/roman_datamodels/datamodels/_factory.py b/src/roman_datamodels/datamodels/_factory.py
@@ -40,7 +40,7 @@ def datamodel_factory(node_type, datamodel_name):
  A DataModel object class
  """
  if hasattr(_mixins, mixin := f"{datamodel_name}Mixin"):
- class_type = (DataModel, getattr(_mixins, mixin))
+ class_type = (getattr(_mixins, mixin), DataModel)
  else:
  class_type = (DataModel,)
 

diff --git a/tests/test_models.py b/tests/test_models.py
@@ -387,8 +387,8 @@ def test_make_linearity():
  assert linearity_model.validate() is None
 
 
-def test_linearity_mixin():
- linearity = utils.mk_linearity(shape=(2, 8, 8))
+def test_linearity_ref_mixin():
+ linearity = utils.mk_datamodel(datamodels.LinearityRefModel, shape=(2, 8, 8))
  assert linearity.get_primary_array_name() == "coeffs"
 
 
@@ -404,8 +404,8 @@ def test_make_inverse_linearity():
  assert inverselinearity_model.validate() is None
 
 
-def test_inverse_linearity_mixin():
- inverse_linearity = utils.mk_inverse_linearity(shape=(2, 8, 8))
+def test_inverse_linearity_ref_mixin():
+ inverse_linearity = utils.mk_datamodel(datamodels.InverseLinearityRefModel, shape=(2, 8, 8))
  assert inverse_linearity.get_primary_array_name() == "coeffs"
 
 
@@ -421,7 +421,7 @@ def test_make_mask():
 
 
 def test_mask_ref_mixin():
- mask = utils.mk_mask(shape=(8, 8))
+ mask = utils.mk_datamodel(datamodels.MaskRefModel, shape=(8, 8))
  assert mask.get_primary_array_name() == "dq"