From b7e50f991f33077275b8f4d6ce5d08e8b014bf99 Mon Sep 17 00:00:00 2001 From: Maria Pena-Guerrero Date: Tue, 26 Nov 2024 18:52:27 -0500 Subject: [PATCH] addressing changes in PR --- src/stdatamodels/jwst/datamodels/__init__.py | 6 +++--- .../jwst/datamodels/schemas/core.schema.yaml | 4 ++-- ...kernel.schema.yaml => sirs_kernel.schema.yaml} | 4 ++-- .../datamodels/{conv_kernel.py => sirs_kernel.py} | 15 ++++++++------- 4 files changed, 15 insertions(+), 14 deletions(-) rename src/stdatamodels/jwst/datamodels/schemas/{conv_kernel.schema.yaml => sirs_kernel.schema.yaml} (72%) rename src/stdatamodels/jwst/datamodels/{conv_kernel.py => sirs_kernel.py} (65%) diff --git a/src/stdatamodels/jwst/datamodels/__init__.py b/src/stdatamodels/jwst/datamodels/__init__.py index 9afa85b4..983b61ec 100644 --- a/src/stdatamodels/jwst/datamodels/__init__.py +++ b/src/stdatamodels/jwst/datamodels/__init__.py @@ -12,7 +12,6 @@ from .barshadow import BarshadowModel from .combinedspec import CombinedSpecModel from .contrast import ContrastModel -from .conv_kernel import ConvKernelModel from .cube import CubeModel from .dark import DarkModel from .darkMIRI import DarkMIRIModel @@ -65,6 +64,7 @@ from .rscd import RSCDModel from .saturation import SaturationModel from .segmap import SegmentationMapModel +from .sirs_kernel import SIRSKernelModel from .slit import SlitModel, SlitDataModel from .pastasossmodel import PastasossModel from .sossextractmodel import SossExtractModel @@ -103,7 +103,7 @@ 'NrsMosApcorrModel', 'NrsFsApcorrModel', 'NrsIfuApcorrModel', 'AsnModel', 'BarshadowModel', 'CameraModel', 'CollimatorModel', - 'CombinedSpecModel', 'ContrastModel', 'ConvKernelModel','CubeModel', + 'CombinedSpecModel', 'ContrastModel', 'CubeModel', 'DarkModel', 'DarkMIRIModel', 'DisperserModel', 'DistortionModel', 'DistortionMRSModel', 'EmiModel', @@ -141,7 +141,7 @@ 'ReferenceFileModel', 'ReferenceCubeModel', 'ReferenceImageModel', 'ReferenceQuadModel', 'RegionsModel', 'ResetModel', 'ResolutionModel', 'MiriResolutionModel', - 'RSCDModel', 'SaturationModel', 'SlitDataModel', 'SlitModel', 'SpecModel', + 'RSCDModel', 'SaturationModel', 'SIRSKernelModel', 'SlitDataModel', 'SlitModel', 'SpecModel', 'SegmentationMapModel', 'SossExtractModel', 'SossWaveGridModel', diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index beee6b6a..64a19c37 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1795,9 +1795,9 @@ properties: type: object properties: name: - title: NIR Optimized Convolution Kernel reference file name + title: NIR Simple Improved Reference Subtraction type: string - fits_keyword: R_CONVKL + fits_keyword: R_SIRSKL blend_table: True cubepar: title: IFU cube reference file information diff --git a/src/stdatamodels/jwst/datamodels/schemas/conv_kernel.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/sirs_kernel.schema.yaml similarity index 72% rename from src/stdatamodels/jwst/datamodels/schemas/conv_kernel.schema.yaml rename to src/stdatamodels/jwst/datamodels/schemas/sirs_kernel.schema.yaml index 2cf567c5..b6c1c008 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/conv_kernel.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/sirs_kernel.schema.yaml @@ -1,12 +1,12 @@ %YAML 1.1 --- $schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.0.0" -id: "http://stsci.edu/schemas/jwst_datamodel/conv_kernel.schema" +id: "http://stsci.edu/schemas/jwst_datamodel/sirs_kernel.schema" allOf: - $ref: referencefile.schema - type: object patternProperties: - "^(nrca1|nrca2|nrca3|nrca4|nrcalong|nrcb1|nrcb2|nrcb3|nrcb4|nrcblong|nrs1|nrs2|mirimage|mirifulong|mirifushort|nis|guider1|guider2)$": + "^(nrca1|nrca2|nrca3|nrca4|nrcalong|nrcb1|nrcb2|nrcb3|nrcb4|nrcblong|nrs1|nrs2|mirimage|mirifulong|mirifushort|nis)$": type: object properties: gamma: diff --git a/src/stdatamodels/jwst/datamodels/conv_kernel.py b/src/stdatamodels/jwst/datamodels/sirs_kernel.py similarity index 65% rename from src/stdatamodels/jwst/datamodels/conv_kernel.py rename to src/stdatamodels/jwst/datamodels/sirs_kernel.py index 8dc461e4..768180cc 100644 --- a/src/stdatamodels/jwst/datamodels/conv_kernel.py +++ b/src/stdatamodels/jwst/datamodels/sirs_kernel.py @@ -1,12 +1,13 @@ from .reference import ReferenceFileModel -__all__ = ['ConvKernelModel'] +__all__ = ['SIRSKernelModel'] -class ConvKernelModel(ReferenceFileModel): +class SIRSKernelModel(ReferenceFileModel): """ - A data model for the NIR Optimized Convolution Kernel Fourier Coefficients. + A data model for the NIR Optimized Convolution Kernel Fourier Coefficients, + also called Simple Improved Reference Subtraction (SIRS). Parameters __________ @@ -18,14 +19,14 @@ class ConvKernelModel(ReferenceFileModel): - gamma: float32 1D array - zeta: float32 1D array """ - schema_url = "http://stsci.edu/schemas/jwst_datamodel/conv_kernel.schema" - reftype = "conv_kernel" + schema_url = "http://stsci.edu/schemas/jwst_datamodel/sirs_kernel.schema" + reftype = "sirskernel" def __init__(self, init=None, **kwargs): - super(ConvKernelModel, self).__init__(init=init, **kwargs) + super(SIRSKernelModel, self).__init__(init=init, **kwargs) def on_save(self, path=None): self.meta.reftype = self.reftype def validate(self): - super(ConvKernelModel, self).validate() + super(SIRSKernelModel, self).validate()