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.

Sign up for GitHub

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

Jump to bottom

HLA-1133: DO NOT MERGE (TESTING) - CALACS Serial CTE Correction #601

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

HLA-1133: DO NOT MERGE (TESTING) - CALACS Serial CTE Correction #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d1804f
Latest changes to accommodate serial CTE. Still need to add logic
mdlpstsci Jan 9, 2024
ec29014
Reorganized docte.c to control the imset and amp looping
mdlpstsci Jan 29, 2024
54d75ec
Updated the calacs/acscte code to accommodate the very latest
mdlpstsci Feb 5, 2024
2169a74
Moved a log message so it is only issued once upon a rotation or
mdlpstsci Feb 5, 2024
475b8dc
Put back the dopcte.c routine as the "make" functions are used in
mdlpstsci Feb 5, 2024
fb9a0ec
Force a new line so the rotation/derotation comments stand out in the…
mdlpstsci Feb 5, 2024
b84a542
To perform a rotation, the transpose always needs to be done
mdlpstsci Feb 7, 2024
323cb3d
Update informational files (Dates, History, Updates).
mdlpstsci Feb 9, 2024
d90c7f7
Write the serial CTE parameters to the PHDU as HISTORY keywords as
mdlpstsci Feb 13, 2024
5ded626
Testing to find differences with Linux system.
mdlpstsci Feb 18, 2024
c307cf6
Updated a comment and do only serial correction for a test.
mdlpstsci Feb 29, 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
7 changes: 5 additions & 2 deletions ctegen2/ctegen2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ typedef struct {
char descrip2[256]; /*descrip from table row, not read in for cte purposes*/
char cte_name[256]; /*name of cte algorithm */
char cte_ver[256]; /*version of algorithm */

// Serial CTE FITS extension information only
char ccdamp[2]; /* ID of specific amp for the serial CTE correction */
} CTEParamsFast;

int inverseCTEBlurWithRowMajorIput(const SingleGroup * rsz, SingleGroup * rsc, const SingleGroup * trapPixelMap, CTEParamsFast * cte);
Expand Down Expand Up @@ -102,9 +105,9 @@ void initCTEParamsFast(CTEParamsFast * pars, const unsigned _nTraps, const unsig
int allocateCTEParamsFast(CTEParamsFast * pars);
void freeCTEParamsFast(CTEParamsFast * pars);

int populateImageFileWithCTEKeywordValues(SingleGroup *group, CTEParamsFast *pars);
int populateImageFileWithCTEKeywordValues(SingleGroup *group, CTEParamsFast *pars, char * corrType);
int getCTEParsFromImageHeader(SingleGroup * input, CTEParamsFast * params);
int loadPCTETAB(char *filename, CTEParamsFast * params);
int loadPCTETAB(char *filename, CTEParamsFast * params, int extn, Bool skipLoadPrimary);
void ctewarn (char *message);
void cteerror (char *message);
void ctemessage (char *message);
Expand Down
492 changes: 303 additions & 189 deletions ctegen2/ctehelpers.c
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions hstio/hstio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2489,10 +2489,10 @@ int getHeader(IODescPtr iodesc_, Hdr *hd) {
char *target;
int status = 0;

if (iodesc->options == WriteOnly) {
ioerr(NOGET, iodesc, 0);
return -1;
}
//if (iodesc->options == WriteOnly) {
// ioerr(NOGET, iodesc, 0);
// return -1;
//}

/* get the number of cards in the header */
if (fits_get_hdrspace(iodesc->ff, &ncards, NULL, &status)) {
Expand Down
7 changes: 7 additions & 0 deletions pkg/acs/calacs/Dates
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
14-Sep-2023 CALACS 10.4.0 Implementation of the "Parallel and Serial CTE correction". This
version of the CTE correction (Version 3) is based upon the
algorithm of Version 2, but includes the additional correction
for the serial direction which is amp-dependent. Previous
generations of CTE correction are no longer supported, and
obsolete code has been removed. Note the PCTETAB has changed
substantially to accommodate the amp-dependent serial corrections.
08-Feb-2022 CALACS 10.3.5 Update to the cosmic ray rejection algorithm as to the way
the output ERR extension is computed for the CRJ file. The
output ERR is now propagated from the usable input ERR extensions
Expand Down
9 changes: 9 additions & 0 deletions pkg/acs/calacs/History
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### 14-Sep-2023 - MDD - Version 10.4.0
Implementation of the "Parallel and Serial CTE correction". This
version of the CTE correction (Version 3) is based upon the
algorithm of Version 2, but includes the additional correction
for the serial direction which is amp-dependent. Previous
generations of CTE correction are no longer supported, and obsolete
code has been removed. Note the PCTETAB has changed substantially
to accommodate the amp-dependent serial corrections.

### 08-Feb-2022 - MDD - Version 10.3.5
Update to the cosmic ray rejection algorithm as to the way
the output ERR extension is computed for the CRJ file. The
Expand Down
10 changes: 10 additions & 0 deletions pkg/acs/calacs/Updates
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Update for version 10.4.0 - 14-Sep-2023 (MDD)
pkg/acs/calacs/Dates
pkg/acs/calacs/History
pkg/acs/calacs/Updates
pkg/acs/calacs/acscte/docte.c
pkg/acs/calacs/acscte/dopcte-gen2.c
pkg/acs/calacs/acscte/dopcte.c
ctegen2/ctegen2.h
ctegen2/ctehelpers.c

Update for version 10.3.5 - 08-Feb-2022 (MDD)
pkg/acs/calacs/Dates
pkg/acs/calacs/History
Expand Down
Loading