Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JP-3708, JP-3771, JP-3791 #318

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4cd6ea5
Added initial CR magnitude computation.
kmacdonald-stsci Aug 20, 2024
6f8c005
Creating the crmag portion of the optional results product in the ram…
kmacdonald-stsci Aug 21, 2024
9a70bd7
Creating array with initialization to zeros.
kmacdonald-stsci Oct 9, 2024
de89630
Adding test for the crmag element in the optional results product.
kmacdonald-stsci Oct 9, 2024
50f9a99
Adding change log fragment.
kmacdonald-stsci Oct 10, 2024
331de41
Adding comment to the CRMAG test.
kmacdonald-stsci Oct 10, 2024
75637f4
Adding comments to clarify the implementation of the linked lists.
kmacdonald-stsci Oct 24, 2024
5511d2c
Checking for required return non-NoneTypes the multiprocessing pool.
kmacdonald-stsci Nov 1, 2024
c5e3582
The cube size used the wrong dimensions. This seems to have solved t…
kmacdonald-stsci Nov 6, 2024
c3768bf
Adding CHARGELOSS handling during multiprocessing slicing.
kmacdonald-stsci Nov 7, 2024
beb5387
Adding some convenience variables for multiprocessing.
kmacdonald-stsci Nov 7, 2024
e2ecff9
Adding comment.
kmacdonald-stsci Nov 7, 2024
10ba745
Updating comments and raising exception for bad indexing when saving …
kmacdonald-stsci Nov 13, 2024
3167e60
Correcting the opt_res clean up function and add error checking for c…
kmacdonald-stsci Nov 13, 2024
d6a57a4
Adding change log fragment.
kmacdonald-stsci Nov 13, 2024
96abac2
Removing fragment for closed PR. Replaced by new fragment.
kmacdonald-stsci Nov 14, 2024
b81d1de
Updating the change log fragment.
kmacdonald-stsci Nov 14, 2024
e37085f
Removed path for debugging logger.
kmacdonald-stsci Nov 16, 2024
d34d0fd
Editing the change fragment to be properly processed.
kmacdonald-stsci Nov 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changes/318.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This PR fixes JP-3791, JP-3771, and JP-3708. For `ramp_fitting`, the
`CRMAG` element was not originally implementd in the C-extension for
ramp fitting. It is now implemented. The bug the read noise recalculation
for CHARGELOSS when using the multiprocessing option has been fixed. Further,
in `JWST` regression tests have been added to test for multiprocessing to
ensure testing for anything that could affect multiprocessing.
13 changes: 13 additions & 0 deletions src/stcal/ramp_fitting/ols_fit.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@
"""
# Create output arrays for each output tuple. The input ramp data and
# slices are needed for this.
for result in pool_results:
image_slice, integ_slice, opt_slice = result
if image_slice is None or integ_slice is None:
return None, None, None

Check warning on line 220 in src/stcal/ramp_fitting/ols_fit.py

View check run for this annotation

Codecov / codecov/patch

src/stcal/ramp_fitting/ols_fit.py#L220

Added line #L220 was not covered by tests

image_info, integ_info, opt_info = create_output_info(ramp_data, pool_results, save_opt)

# Loop over the slices and assemble each slice into the main return arrays.
Expand Down Expand Up @@ -570,6 +575,14 @@
ramp_data_slice.flags_saturated = ramp_data.flags_saturated
ramp_data_slice.flags_no_gain_val = ramp_data.flags_no_gain_val
ramp_data_slice.flags_unreliable_slope = ramp_data.flags_unreliable_slope
ramp_data_slice.flags_chargeloss = ramp_data.flags_chargeloss

# For possible CHARGELOSS flagging.
if ramp_data.orig_gdq is not None:
ogdq = ramp_data.orig_gdq[:, :, start_row : start_row + nrows, :].copy()
ramp_data_slice.orig_gdq = ogdq

Check warning on line 583 in src/stcal/ramp_fitting/ols_fit.py

View check run for this annotation

Codecov / codecov/patch

src/stcal/ramp_fitting/ols_fit.py#L582-L583

Added lines #L582 - L583 were not covered by tests
else:
ramp_data_slice.orig_gdq = None

# Slice info
ramp_data_slice.start_row = start_row
Expand Down
Loading
Loading