From 87f10e3e6d8dab0929f29be1877d4c8650d47580 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 11 Nov 2024 16:10:09 -0500 Subject: [PATCH 1/3] Update rdm to reflect changes from requiring keywords in rad --- src/roman_datamodels/maker_utils/_common_meta.py | 2 +- src/roman_datamodels/maker_utils/_fps_common_meta.py | 1 + src/roman_datamodels/maker_utils/_tvac_common_meta.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/roman_datamodels/maker_utils/_common_meta.py b/src/roman_datamodels/maker_utils/_common_meta.py index 81161bfe..9314a815 100644 --- a/src/roman_datamodels/maker_utils/_common_meta.py +++ b/src/roman_datamodels/maker_utils/_common_meta.py @@ -394,7 +394,7 @@ def mk_ref_file(**kwargs): ref_file["inverse_linearity"] = kwargs.get("inverse_linearity", "N/A") ref_file["photom"] = kwargs.get("photom", "N/A") ref_file["area"] = kwargs.get("area", "N/A") - ref_file["crds"] = kwargs.get("crds", {"sw_version": "12.3.1", "context_used": "roman_0815.pmap"}) + ref_file["crds"] = kwargs.get("crds", {"version": "12.3.1", "context": "roman_0815.pmap"}) return ref_file diff --git a/src/roman_datamodels/maker_utils/_fps_common_meta.py b/src/roman_datamodels/maker_utils/_fps_common_meta.py index 135c26d6..905c04fe 100644 --- a/src/roman_datamodels/maker_utils/_fps_common_meta.py +++ b/src/roman_datamodels/maker_utils/_fps_common_meta.py @@ -141,6 +141,7 @@ def mk_fps_ref_file(**kwargs): ref_file["readnoise"] = kwargs.get("readnoise", "N/A") ref_file["saturation"] = kwargs.get("saturation", "N/A") ref_file["photom"] = kwargs.get("photom", "N/A") + ref_file["area"] = kwargs.get("area", "N/A") ref_file["crds"] = kwargs.get("crds", {"sw_version": "12.3.1", "context_used": "roman_0815.pmap"}) return ref_file diff --git a/src/roman_datamodels/maker_utils/_tvac_common_meta.py b/src/roman_datamodels/maker_utils/_tvac_common_meta.py index 9febba78..a8135b3f 100644 --- a/src/roman_datamodels/maker_utils/_tvac_common_meta.py +++ b/src/roman_datamodels/maker_utils/_tvac_common_meta.py @@ -141,6 +141,7 @@ def mk_tvac_ref_file(**kwargs): ref_file["readnoise"] = kwargs.get("readnoise", "N/A") ref_file["saturation"] = kwargs.get("saturation", "N/A") ref_file["photom"] = kwargs.get("photom", "N/A") + ref_file["area"] = kwargs.get("area", "N/A") ref_file["crds"] = kwargs.get("crds", {"sw_version": "12.3.1", "context_used": "roman_0815.pmap"}) return ref_file From 750c13c9a7359fe34eafd67eec08e56d20a791ed Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 11 Nov 2024 16:12:42 -0500 Subject: [PATCH 2/3] Update changes --- changes/421.bugfix.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changes/421.bugfix.rst diff --git a/changes/421.bugfix.rst b/changes/421.bugfix.rst new file mode 100644 index 00000000..e6e0f0ff --- /dev/null +++ b/changes/421.bugfix.rst @@ -0,0 +1,2 @@ +Update RDM maker utils to include the keywords required by a bugfix to RAD that +forces the ``archive_catalog`` and ``sdf`` keywords to be required. From 127c653121c607806de487223f19c033769dba7f Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 11 Nov 2024 17:40:25 -0500 Subject: [PATCH 3/3] TMP point at rad version --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e5051f3d..d992ddde 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,8 @@ dependencies = [ "numpy >=1.22", "astropy >=5.3.0", # "rad >= 0.21.0", - "rad @ git+https://github.com/spacetelescope/rad.git", + # "rad @ git+https://github.com/spacetelescope/rad.git", + "rad @ git+https://github.com/WilliamJamieson/rad.git@bugfix/schema_info_required", "asdf-standard >=1.1.0", ] dynamic = ["version"]