Speed up Jump detection (#229)

spacetelescope · Nov 10, 2023 · 41c4ec6 · 41c4ec6
2 parents d416c8b + 7ec3a6b
commit 41c4ec6
Show file tree

Hide file tree

Showing 16 changed files with 1,432 additions and 1,532 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -15,6 +15,8 @@ ramp_fitting
 
 - Moving some CI tests from JWST to STCAL. [#228, spacetelescope/jwst#6080]
 
+- Significantly, improve the performance of the uneven ramp fitting algorithm. [#229]
+
 Changes to API
 --------------
 

diff --git a/setup.py b/setup.py
@@ -8,26 +8,20 @@
 
 extensions = [
     Extension(
-        'stcal.ramp_fitting.ols_cas22._core',
-        ['src/stcal/ramp_fitting/ols_cas22/_core.pyx'],
+        'stcal.ramp_fitting.ols_cas22._ramp',
+        ['src/stcal/ramp_fitting/ols_cas22/_ramp.pyx'],
         include_dirs=[np.get_include()],
         language='c++'
     ),
     Extension(
-        'stcal.ramp_fitting.ols_cas22._fixed',
-        ['src/stcal/ramp_fitting/ols_cas22/_fixed.pyx'],
+        'stcal.ramp_fitting.ols_cas22._jump',
+        ['src/stcal/ramp_fitting/ols_cas22/_jump.pyx'],
         include_dirs=[np.get_include()],
         language='c++'
     ),
     Extension(
-        'stcal.ramp_fitting.ols_cas22._pixel',
-        ['src/stcal/ramp_fitting/ols_cas22/_pixel.pyx'],
-        include_dirs=[np.get_include()],
-        language='c++'
-    ),
-    Extension(
-        'stcal.ramp_fitting.ols_cas22._fit_ramps',
-        ['src/stcal/ramp_fitting/ols_cas22/_fit_ramps.pyx'],
+        'stcal.ramp_fitting.ols_cas22._fit',
+        ['src/stcal/ramp_fitting/ols_cas22/_fit.pyx'],
         include_dirs=[np.get_include()],
         language='c++'
     ),

diff --git a/src/stcal/ramp_fitting/ols_cas22/__init__.py b/src/stcal/ramp_fitting/ols_cas22/__init__.py
@@ -1,4 +1,4 @@
-from ._fit_ramps import fit_ramps, RampFitOutputs
-from ._core import Parameter, Variance, Diff, RampJumpDQ
+from ._fit import fit_ramps, RampFitOutputs, Parameter, Variance
+from ._jump import JUMP_DET
 
-__all__ = ['fit_ramps', 'RampFitOutputs', 'Parameter', 'Variance', 'Diff', 'RampJumpDQ']
+__all__ = ['fit_ramps', 'RampFitOutputs', 'Parameter', 'Variance', 'Diff', 'JUMP_DET']
diff --git a/src/stcal/ramp_fitting/ols_cas22/_core.pxd b/src/stcal/ramp_fitting/ols_cas22/_core.pxd
diff --git a/src/stcal/ramp_fitting/ols_cas22/_core.pyx b/src/stcal/ramp_fitting/ols_cas22/_core.pyx
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,8 @@ ramp_fitting @@
     - Moving some CI tests from JWST to STCAL. [#228, spacetelescope/jwst#6080]
+    - Significantly, improve the performance of the uneven ramp fitting algorithm. [#229]
     Changes to API
     --------------
@@ Expand Down @@