|
6 | 6 | 14-Sep-2023 MDD: Updated to accommodate only the "Parallel/Serial PixelCTE 2023" |
7 | 7 | (aka Generation 3) correction. Code now applies a serial CTE correction for |
8 | 8 | full-frame data. |
9 | | -
|
| 9 | + 16-Mar-2026 PLL: Enabled serial CTE correction for subarrays. |
10 | 10 | */ |
11 | 11 | # include <string.h> |
12 | 12 | # include <stdio.h> |
@@ -326,8 +326,7 @@ int DoCTE (ACSInfo *acs_info, const bool forwardModelOnly) { |
326 | 326 | trlwarn("(pctecorr) IGNORING read noise level PCTERNOI from PCTETAB: %f. Using amp dependent values from CCDTAB instead", cteParallelPars.rn_amp); |
327 | 327 | trlmessage("(pctecorr) Readout simulation forward modeling iterations PCTENFOR: %i\n" |
328 | 328 | "(pctecorr) Number of iterations used in the parallel transfer PCTENPAR: %i\n" |
329 | | - "(pctecorr) CTE_FRAC: %f\n\n" |
330 | | - "(pctecorr) NOTE: No serial CTE correction is done for any subarray data.\n", |
| 329 | + "(pctecorr) CTE_FRAC: %f\n\n", |
331 | 330 | cteParallelPars.n_forward, cteParallelPars.n_par, cteParallelPars.scale_frac); |
332 | 331 | /* End read of the parallel CTE parameters */ |
333 | 332 |
|
@@ -364,9 +363,9 @@ int DoCTE (ACSInfo *acs_info, const bool forwardModelOnly) { |
364 | 363 | ampIDInCalib = amplocInCalib - AMPCALIBORDER; // This is a number. |
365 | 364 |
|
366 | 365 | /* |
367 | | - Only perform the serial CTE correction for full-frame, post-SM4 data |
| 366 | + Only perform the serial CTE correction for post-SM4 data. |
368 | 367 | */ |
369 | | - if ((acs_info->expstart >= SM4MJD) && (!acs[i].subarray)) { |
| 368 | + if (acs_info->expstart >= SM4MJD) { |
370 | 369 |
|
371 | 370 | startOfSetInCalib = SET_TO_PROCESS[ampIDInCalib]; |
372 | 371 | strcpy(corrType, "serial"); |
@@ -443,8 +442,8 @@ int DoCTE (ACSInfo *acs_info, const bool forwardModelOnly) { |
443 | 442 |
|
444 | 443 | clock_t begin = (double)clock(); |
445 | 444 |
|
446 | | - /* Perform the serial CTE correction for only full-frame, post-SM4 data */ |
447 | | - if ((acs_info->expstart >= SM4MJD) && (!acs[i].subarray)) { |
| 445 | + /* Perform the serial CTE correction for only post-SM4 data */ |
| 446 | + if (acs_info->expstart >= SM4MJD) { |
448 | 447 | /* Serial correction */ |
449 | 448 | strcpy(corrType, "serial"); |
450 | 449 | if ((status = doPCTEGen3(&acs[i], &ctePars, &x[i], forwardModelOnly, corrType, ccdamp, nthAmp, amploc, ampID))) |
|
0 commit comments