From c7e74fd74c6088aa9d00e362c1291342b917ccde Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Fri, 2 May 2025 18:58:23 -0400 Subject: [PATCH 1/5] Initial commit. --- pyproject.toml | 5 +++-- src/roman_datamodels/maker_utils/_common_meta.py | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 319f6a70..6c25c3f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,9 @@ dependencies = [ "gwcs >=0.19.0", "numpy >=1.24", "astropy >=5.3.0", - # "rad >=0.23.1", - "rad @ git+https://github.com/spacetelescope/rad.git", + # "rad >=0.24.0", + # "rad @ git+https://github.com/spacetelescope/rad.git", + "rad @ git+https://github.com/PaulHuwe/rad.git@RAD-211-212_L1GWFixes", "asdf-standard >=1.1.0", "pyarrow >= 10.0.1", ] diff --git a/src/roman_datamodels/maker_utils/_common_meta.py b/src/roman_datamodels/maker_utils/_common_meta.py index 9d102cd2..b60d527e 100644 --- a/src/roman_datamodels/maker_utils/_common_meta.py +++ b/src/roman_datamodels/maker_utils/_common_meta.py @@ -547,9 +547,8 @@ def mk_l1_face_guidewindow_meta(mode="WSM", **kwargs): metadata) """ - meta = {} + meta = mk_basic_meta(**kwargs) - meta["model_type"] = kwargs.get("model_type", NOSTR) meta["optical_element"] = kwargs.get("optical_element", "F158") meta["fgs_modes_used"] = kwargs.get("fgs_modes_used", ["NOT_CONFIGURED"]) meta["ma_table_ids_used"] = kwargs.get("ma_table_ids_used", [NOSTR]) @@ -653,8 +652,8 @@ def mk_l1_detector_guidewindow_meta(mode="WSM", **kwargs): dict (defined by the l1_detector_guidewindow-1.0.0 schema with additional guidewindow metadata) """ - meta = {} - meta["model_type"] = kwargs.get("model_type", NOSTR) + meta = mk_basic_meta(**kwargs) + meta["fgs_modes_used"] = kwargs.get("fgs_modes_used", ["NOT_CONFIGURED"]) meta["acq_ma_table_id"] = kwargs.get("acq_ma_table_id", NOSTR) meta["acq_gw_cycles_per_sci_read"] = kwargs.get("acq_gw_cycles_per_sci_read", NONUM) From 80f984fa4410b14780a3245f36493ab229b24e36 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 6 May 2025 10:50:48 -0400 Subject: [PATCH 2/5] Added changelog. --- changes/509.feature.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/509.feature.rst diff --git a/changes/509.feature.rst b/changes/509.feature.rst new file mode 100644 index 00000000..badf1303 --- /dev/null +++ b/changes/509.feature.rst @@ -0,0 +1 @@ +Adds basic keyword group to both L1 Guidewindow datamodels From 43e64f985d0c903c629780aa48030390bf3a2cf8 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Thu, 8 May 2025 14:49:50 -0400 Subject: [PATCH 3/5] Updated ASDF version. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6c25c3f9..18be521c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ classifiers = [ "Programming Language :: Python :: 3", ] dependencies = [ - "asdf >=3.3.0", + "asdf >=4.1.0", "lz4 >= 4.3.0", "asdf-astropy >=0.5.0", "gwcs >=0.19.0", From 7a1b3fc01a87821c3d8b041fcf3672003602ab6a Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Thu, 8 May 2025 14:50:28 -0400 Subject: [PATCH 4/5] Repointed RAD dependency. --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 18be521c..8ac0ae09 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,8 +17,7 @@ dependencies = [ "numpy >=1.24", "astropy >=5.3.0", # "rad >=0.24.0", - # "rad @ git+https://github.com/spacetelescope/rad.git", - "rad @ git+https://github.com/PaulHuwe/rad.git@RAD-211-212_L1GWFixes", + "rad @ git+https://github.com/spacetelescope/rad.git", "asdf-standard >=1.1.0", "pyarrow >= 10.0.1", ] From 1d2908add30446a816bc2c8ee36fe93794a44566 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Thu, 8 May 2025 14:55:01 -0400 Subject: [PATCH 5/5] Updated ASDF-Astropy version. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8ac0ae09..ee0acb6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ classifiers = [ dependencies = [ "asdf >=4.1.0", "lz4 >= 4.3.0", - "asdf-astropy >=0.5.0", + "asdf-astropy >=0.6.0", "gwcs >=0.19.0", "numpy >=1.24", "astropy >=5.3.0",