WIP: Test DQs with LIKELY

Author: pllim

tests/test_ramp_fitting.py

@@ -1,7 +1,8 @@
-import numpy as np
-
 import sys
 
+import numpy as np
+import pytest
+
 from stcal.multiprocessing import compute_num_cores
 from stcal.ramp_fitting.ramp_fit import ramp_fit_data
 from stcal.ramp_fitting.ramp_fit_class import RampData
@@ -439,7 +440,8 @@ def test_miri_ramp_dnu_and_jump_at_ramp_beginning():
     assert abs(s2[0, 0] - answer) < tol
 
 
-def test_2_group_cases():
+@pytest.mark.parametrize("algo", [DEFAULT_OLS, "LIKELY"])
+def test_2_group_cases(algo):
     """
     Tests the special cases of 2 group ramps.  Create multiple pixel ramps
     with two groups to test the various DQ cases.
@@ -494,7 +496,7 @@ def test_2_group_cases():
     ramp_data.set_dqflags(dqflags)
 
     # Run ramp fit on RampData
-    save_opt, algo, wt, ncores = True, DEFAULT_OLS, "optimal", "none"
+    save_opt, wt, ncores = True, "optimal", "none"
     slopes, cube, optional = ramp_fit_data(
         ramp_data, save_opt, rnoise, gain, algo, wt, ncores
     )
@@ -519,7 +521,7 @@ def test_2_group_cases():
     np.testing.assert_allclose(err, check, tol)
 
 
-def run_one_group_ramp_suppression(nints, suppress):
+def run_one_group_ramp_suppression(nints, suppress, algo=DEFAULT_OLS):
     """
     Forms the base of the one group suppression tests.  Create three ramps
     using three pixels with two integrations.  In the first integration:
@@ -568,7 +570,6 @@ def run_one_group_ramp_suppression(nints, suppress):
 
     ramp_data.suppress_one_group_ramps = suppress
 
-    algo = DEFAULT_OLS
     save_opt, ncores = False, "none"
     slopes, cube, ols_opt = ramp_fit_data(
         ramp_data, save_opt, rnoise2d, gain2d, algo, "optimal", ncores
@@ -577,11 +578,12 @@ def run_one_group_ramp_suppression(nints, suppress):
     return slopes, cube, dims
 
 
-def test_one_group_ramp_suppressed_one_integration():
+@pytest.mark.parametrize("algo", [DEFAULT_OLS, "LIKELY"])
+def test_one_group_ramp_suppressed_one_integration(algo):
     """
     Tests one group ramp fitting where suppression turned on.
     """
-    slopes, cube, dims = run_one_group_ramp_suppression(1, True)
+    slopes, cube, dims = run_one_group_ramp_suppression(1, True, algo=algo)
     nints, ngroups, nrows, ncols = dims
     tol = 1e-5
 

tests/test_ramp_fitting_likely_fit.py

@@ -38,7 +38,7 @@ def create_blank_ramp_data(dims, var, tm):
     data = np.zeros(shape=(nints, ngroups, nrows, ncols), dtype=np.float32)
     pixdq = np.zeros(shape=(nrows, ncols), dtype=np.uint32)
     gdq = np.zeros(shape=(nints, ngroups, nrows, ncols), dtype=np.uint8)
-    dark_current = np.zeros(shape=(nrows, ncols), dtype = np.float32)
+    dark_current = np.zeros(shape=(nrows, ncols), dtype=np.float32)
 
     ramp_data = RampData()
     ramp_data.set_arrays(data=data, groupdq=gdq, pixeldq=pixdq, average_dark_current=dark_current)
@@ -152,7 +152,7 @@ def test_basic_ramp_multi_pixel():
     data_tol = 1e-4
     err_tol = 0.1
     np.testing.assert_allclose(data, data1, data_tol)
-    np.testing.assert_allclose(dq, dq1)
+    np.testing.assert_array_equal(dq, dq1)
     np.testing.assert_allclose(vp, vp1, err_tol)
     np.testing.assert_allclose(vr, vr1, err_tol)
     np.testing.assert_allclose(err, err1, err_tol)
@@ -266,8 +266,7 @@ def test_long_ramp():
 
     data = cube[0][0, 0, 0]
     ddiff = (ramp_data.data[0, ngroups-1, 0, 0] - ramp_data.data[0, 0, 0, 0])
-    check = ddiff / float(ngroups-1)
-    check = check / ramp_data.group_time
+    check = ddiff / ((ngroups - 1) * ramp_data.group_time)
     tol = 1.e-5
     np.testing.assert_allclose(data, check, tol)
 
@@ -309,8 +308,7 @@ def test_short_group_ramp(nframes):
 
     data = cube[0][0, 0, 0]
     ddiff = (ramp_data.data[0, ngroups-1, 0, 0] - ramp_data.data[0, 0, 0, 0])
-    check = ddiff / float(ngroups-1)
-    check = check / ramp_data.group_time
+    check = ddiff / ((ngroups - 1) * ramp_data.group_time)
     tol = 1.e-5
     np.testing.assert_allclose(data, check, tol)
 
@@ -467,10 +465,10 @@ def test_zeroframe_bad_group(caplog):
     np.testing.assert_allclose(slopes[0], slopes1[0], tol)
 
 
-
 # -----------------------------------------------------------------
 #                              DEBUG
 # -----------------------------------------------------------------
+
 def dbg_print_basic_ramp(ramp_data, pix=(0, 0)):
     row, col = pix
     nints = ramp_data.data.shape[0]