From b65f76b3e0ac80106b64859842b202967ddbe05e Mon Sep 17 00:00:00 2001 From: Michele De La Pena Date: Tue, 16 Apr 2024 17:37:09 -0400 Subject: [PATCH 1/3] Rebase with latest on master and replaced spaces with tab. --- pkg/wfc3/lib/wf32d/photmode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/wfc3/lib/wf32d/photmode.c b/pkg/wfc3/lib/wf32d/photmode.c index 64df64f7a..f56285c29 100644 --- a/pkg/wfc3/lib/wf32d/photmode.c +++ b/pkg/wfc3/lib/wf32d/photmode.c @@ -78,10 +78,10 @@ Hdr *hdr io: image header to be modified strcat (photstr, wf32d->filter); } - /* Add 'MJD#' keyword to PHOTMODE string for UVIS detector only */ - if (wf32d->detector == CCD_DETECTOR) - sprintf (scratch, " MJD#%0.4f", wf32d->expstart); - strcat (photstr, scratch); + /* Update: Add 'MJD#' value to the PHOTMODE string for both the + UVIS and IR detectors */ + sprintf (scratch, " MJD#%0.4f", wf32d->expstart); + strcat (photstr, scratch); if (wf32d->verbose) { sprintf (MsgText, "Keyword PHOTMODE built as: %s", photstr); From 40761334eeb2243bce375a696850d82c27a25c6a Mon Sep 17 00:00:00 2001 From: Michele De La Pena Date: Tue, 16 Apr 2024 17:39:13 -0400 Subject: [PATCH 2/3] Forgot to fix the spaces vs tab for comment too --- pkg/wfc3/lib/wf32d/photmode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/wfc3/lib/wf32d/photmode.c b/pkg/wfc3/lib/wf32d/photmode.c index f56285c29..bf90f8de4 100644 --- a/pkg/wfc3/lib/wf32d/photmode.c +++ b/pkg/wfc3/lib/wf32d/photmode.c @@ -78,8 +78,8 @@ Hdr *hdr io: image header to be modified strcat (photstr, wf32d->filter); } - /* Update: Add 'MJD#' value to the PHOTMODE string for both the - UVIS and IR detectors */ + /* Update: Add 'MJD#' value to the PHOTMODE string for both the + UVIS and IR detectors */ sprintf (scratch, " MJD#%0.4f", wf32d->expstart); strcat (photstr, scratch); From cd067fa5798d4e26ea26632021db623419cd5c6c Mon Sep 17 00:00:00 2001 From: Michele De La Pena Date: Tue, 27 Aug 2024 16:01:30 -0400 Subject: [PATCH 3/3] Allow MJD as a parameterized variable for the PHOTMODE keyword to enable a time-dependent photometric correction for the IR detector. This supplements the change done for the UVIS in 2020 (Version 3.5.2). --- pkg/wfc3/Dates | 5 +++++ pkg/wfc3/History | 5 +++++ pkg/wfc3/Updates | 5 +++++ pkg/wfc3/include/wf3version.h | 4 ++-- pkg/wfc3/lib/wf32d/photmode.c | 4 ++++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pkg/wfc3/Dates b/pkg/wfc3/Dates index f1b3155f2..21759c682 100644 --- a/pkg/wfc3/Dates +++ b/pkg/wfc3/Dates @@ -1,3 +1,8 @@ +15-Apr-2024 - MDD = Version 3.7.2 + - Allow MJD as a parameterized variable for the PHOTMODE keyword to + enable a time-dependent photometric correction for the IR detector. + This supplements the change done for the UVIS in 2020 (Version 3.5.2). + 18-Oct-2023 - MDD - Version 3.7.1 - Updates to reconcile the old and new algorithms for flagging full-well saturated pixels. The new algorithm uses a saturation image which is applied after BLECORR/BIASCORR, and diff --git a/pkg/wfc3/History b/pkg/wfc3/History index 9b69bf977..e1138f093 100644 --- a/pkg/wfc3/History +++ b/pkg/wfc3/History @@ -1,3 +1,8 @@ +### 15-Apr-2024 - MDD - Version 3.7.2 + - Allow MJD as a parameterized variable for the PHOTMODE keyword to + enable a time-dependent photometric correction for the IR detector. + This supplements the change done for the UVIS in 2020 (Version 3.5.2). + ### 18-Oct-2023 - MDD - Version 3.7.1 - Updates to reconcile the old and new algorithms for flagging full-well saturated pixels. The new algorithm uses a saturation image which is applied after BLECORR/BIASCORR, and diff --git a/pkg/wfc3/Updates b/pkg/wfc3/Updates index 657391b36..61f07d526 100644 --- a/pkg/wfc3/Updates +++ b/pkg/wfc3/Updates @@ -1,3 +1,8 @@ +Updates for Version 3.7.2 15-Apr-2024 - MDD + - Allow MJD as a parameterized variable for the PHOTMODE keyword to + enable a time-dependent photometric correction for the IR detector. + This supplements the change done for the UVIS in 2020 (Version 3.5.2). + Updates for Version 3.7.1 18-Oct-2023 - MDD - Updates to reconcile the old and new algorithms for flagging full-well saturated pixels. The new algorithm uses a saturation image which is applied after BLECORR/BIASCORR, and diff --git a/pkg/wfc3/include/wf3version.h b/pkg/wfc3/include/wf3version.h index 987b7860d..b0368d7a5 100644 --- a/pkg/wfc3/include/wf3version.h +++ b/pkg/wfc3/include/wf3version.h @@ -4,7 +4,7 @@ /* This string is written to the output primary header as CAL_VER. */ -# define WF3_CAL_VER "3.7.1 (Oct-18-2023)" -# define WF3_CAL_VER_NUM "3.7.1" +# define WF3_CAL_VER "3.7.2 (Apr-15-2024)" +# define WF3_CAL_VER_NUM "3.7.2" #endif /* INCL_WF3VERSION_H */ diff --git a/pkg/wfc3/lib/wf32d/photmode.c b/pkg/wfc3/lib/wf32d/photmode.c index bf90f8de4..18d8aabb5 100644 --- a/pkg/wfc3/lib/wf32d/photmode.c +++ b/pkg/wfc3/lib/wf32d/photmode.c @@ -39,6 +39,10 @@ for IR exposures because they're now in units of electrons. M.De La Pena, 2020 Feb 28: Added MJD in order to enable a time-dependent photometric correction. + M.De La Pena, 2024 Apr 15: + Allow the 'MJD#' value to be added to the PHOTMODE keyword in order to + enable a time-dependent photometric correction for the IR. This supplements + the change done previously for the UVIS in 2020. */ int PhotMode (WF3Info *wf32d, Hdr *hdr) {