addressing changes in PR

spacetelescope · Nov 26, 2024 · b7e50f9 · b7e50f9
1 parent 636b2f3
commit b7e50f9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git 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
@@ -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/...atamodels/schemas/conv_kernel.schema.yaml → ...atamodels/schemas/sirs_kernel.schema.yaml b/...atamodels/schemas/conv_kernel.schema.yaml → ...atamodels/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/...datamodels/jwst/datamodels/conv_kernel.py → ...datamodels/jwst/datamodels/sirs_kernel.py b/...datamodels/jwst/datamodels/conv_kernel.py → ...datamodels/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()