JP-3248 MIRI Subarrays 390 Hz EMI bug fix 3 (#8151)

CHANGES.rst

@@ -1,7 +1,10 @@
 1.13.2 (unreleased)
 ===================
 
-- 
+emicorr
+-------
+
+- Fix another bug with subarray=Full. [#8151]
 
 1.13.1 (2023-12-19)
 ===================

jwst/emicorr/emicorr.py

@@ -245,6 +245,11 @@ def apply_emicorr(input_model, emicorr_model, save_onthefly_reffile,
 
     # Initialize the output model as a copy of the input
     output_model = input_model.copy()
+    nints, ngroups, ny, nx = np.shape(output_model.data)
+    if nints_to_phase is None:
+        nints_to_phase = nints
+    elif nints_to_phase > nints:
+        nints_to_phase = nints
 
     # create the dictionary to store the frequencies and corresponding phase amplitudes
     if save_intermediate_results and save_onthefly_reffile is not None:
@@ -260,9 +265,6 @@ def apply_emicorr(input_model, emicorr_model, save_onthefly_reffile,
         # Read image data and set up some variables
         orig_data = output_model.data
         data = orig_data.copy()
-        nints, ngroups, ny, nx = np.shape(data)
-        if nints_to_phase is None:
-            nints_to_phase = nints
 
         # Correspondance of array order in IDL
         # sz[0] = 4 in idl
@@ -618,10 +620,10 @@ def get_subarcase(subarray_cases, subarray, readpatt, detector):
     # search and return the specific values for the configuration
     if isinstance(subarray_cases, dict):
         for subname in subarray_cases:
-            if subarray not in subname:
+            if subarray == 'FULL':
+                subarray = subarray + '_' + readpatt
+            if subarray != subname:
                 continue
-            if subname == 'FULL':
-                subname = subname + '_' + readpatt
             rowclocks = subarray_cases[subname]["rowclocks"]
             frameclocks = subarray_cases[subname]["frameclocks"]
             if readpatt == "SLOW":
@@ -639,6 +641,8 @@ def get_subarcase(subarray_cases, subarray, readpatt, detector):
             log.debug('Found subarray case {}!'.format(subname))
             for item, val in mdl_dict.items():
                 if subname in item:
+                    if 'FULL' in item and readpatt not in item:
+                        continue
                     if "rowclocks" in item:
                         rowclocks = val
                     elif "frameclocks" in item: