Merge pull request #22 from pllim/hacky-blev-fix

BLEVCORR to process new pol/ramp
spacetelescope · Oct 22, 2016 · 0b36164 · 0b36164
2 parents c702f18 + 48faf60
commit 0b36164
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 14 deletions.
diff --git a/pkg/acs/calacs/Dates b/pkg/acs/calacs/Dates
@@ -1,3 +1,5 @@
+ 21-Oct-2016:  CALACS 8.3.5 BLEVCORR can now process polarizer and ramp
+                            subarrays using new readout format.
  07-Jul-2016:  CALACS 8.3.4 BLEVCORR modified to process new 2K subarrays.
  27-Jul-2015:  CALACS 8.3.3 ACSREJ can now process input list of any length.
  02-Mar-2015:  CALACS 8.3.2 ACSREJ can now process longer input list.

diff --git a/pkg/acs/calacs/History b/pkg/acs/calacs/History
@@ -1,3 +1,7 @@
+### 21-Oct-2016 - PLL -- Version 8.3.5
+    BLEVCORR modified to correctly process polarizer and ramp subarrays that
+    use new readout format added by FSW change since Oct 2016.
+
 ### 07-Jul-2016 - PLL -- Version 8.3.4
     BLEVCORR modified to correctly process new subarrays added by FSW change in
     May 2016.

diff --git a/pkg/acs/calacs/Updates b/pkg/acs/calacs/Updates
@@ -1,3 +1,6 @@
+Update for version 8.3.5 - 21-Oct-16 (PLL)
+    acsccd/findover.c
+
 Update for version 8.3.4 - 07-Jul-16 (PLL)
     acsccd/findover.c
 

diff --git a/pkg/acs/calacs/acsccd/findover.c b/pkg/acs/calacs/acsccd/findover.c
@@ -6,9 +6,11 @@
 # include "acsinfo.h"
 # include "acserr.h"
 
+/* NOT USED
 # define FULL_FRAME_READOUT  1
 # define SUBARRAY_READOUT    2
 # define BINNED_READOUT      3
+*/
 
 # define NUMCOLS 18
 
@@ -121,6 +123,8 @@ static int CloseOverTab (TblInfo *);
                            region overlap.
    2016-07-07 P. L. Lim    Removed no virtual overscan assumptions for new
                            subarrays added by FSW change in May 2016.
+   2016-10-21 P. L. Lim    Expand 2016-07-07 logic to polarizer and ramp
+                           subarrays.
 */
 int FindOverscan (ACSInfo *acs, int nx, int ny, int *overscan) {
     /* arguments:
@@ -135,6 +139,7 @@ int FindOverscan (ACSInfo *acs, int nx, int ny, int *overscan) {
     TblRow tabrow;
     int foundit;
     int is_newsub;
+    const double fsw_change_mjd = 57662.0;  /* 2016-10-01 */
 
     int cx0, cx1, tx1, tx2;
     int cy0, cy1, ty1, ty2;
@@ -172,20 +177,50 @@ int FindOverscan (ACSInfo *acs, int nx, int ny, int *overscan) {
 
             /* We are working with a subarray.
                There is never any virtual overscan EXCEPT for new subarrays
-               added by FSW change in May 2016. */
+               added by FSW change in May 2016 and polarizer/ramp after
+               Oct 2016.
+
+               NOTE: In the future, all overscan info should be properly
+               defined within OSCNTAB for all apertures for both WFC and HRC.
+               When that happens, only keep the fullframe logic below to be
+               used for both fullframe and subarrays and discard all these
+               special subarray calculations. This change is not backward
+               compatible and will require new OSCNTAB to be used for all
+               WFC and HRC exposures ever taken.
+            */
             if (acs->subarray == YES) {
                 if (SameString(acs->aperture, "WFC1A-512") ||
-                        SameString(acs->aperture, "WFC1A-1K") ||
-                        SameString(acs->aperture, "WFC1A-2K") ||
-                        SameString(acs->aperture, "WFC1B-512") ||
-                        SameString(acs->aperture, "WFC1B-1K") ||
-                        SameString(acs->aperture, "WFC1B-2K") ||
-                        SameString(acs->aperture, "WFC2C-512") ||
-                        SameString(acs->aperture, "WFC2C-1K") ||
-                        SameString(acs->aperture, "WFC2C-2K") ||
-                        SameString(acs->aperture, "WFC2D-512") ||
-                        SameString(acs->aperture, "WFC2D-1K") ||
-                        SameString(acs->aperture, "WFC2D-2K")) {
+                    SameString(acs->aperture, "WFC1A-1K") ||
+                    SameString(acs->aperture, "WFC1A-2K") ||
+                    SameString(acs->aperture, "WFC1B-512") ||
+                    SameString(acs->aperture, "WFC1B-1K") ||
+                    SameString(acs->aperture, "WFC1B-2K") ||
+                    SameString(acs->aperture, "WFC2C-512") ||
+                    SameString(acs->aperture, "WFC2C-1K") ||
+                    SameString(acs->aperture, "WFC2C-2K") ||
+                    SameString(acs->aperture, "WFC2D-512") ||
+                    SameString(acs->aperture, "WFC2D-1K") ||
+                    SameString(acs->aperture, "WFC2D-2K") ||
+                    (SameString(acs->aperture, "WFC1-POL0V") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC1-POL60V") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC1-POL120V") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC1-POL0UV") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC1-POL60UV") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC1-POL120UV") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC1-IRAMPQ") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC1-MRAMPQ") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC2-MRAMPQ") &&
+                     (acs->expstart >= fsw_change_mjd)) ||
+                    (SameString(acs->aperture, "WFC2-ORAMPQ") &&
+                     (acs->expstart >= fsw_change_mjd))) {
                     is_newsub = YES;
                 } else {
                     acs->trimy[0] = 0;

diff --git a/pkg/acs/calacs/include/acsversion.h b/pkg/acs/calacs/include/acsversion.h
@@ -1,6 +1,6 @@
 /* This string is written to the output primary header as CAL_VER. */
-#define ACS_CAL_VER "8.3.4 (07-Jul-2016)"
-#define ACS_CAL_VER_NUM "8.3.4"
+#define ACS_CAL_VER "8.3.5 (21-Oct-2016)"
+#define ACS_CAL_VER_NUM "8.3.5"
 
 /* name and version number of the CTE correction algorithm */
 #define ACS_CTE_NAME "PixelCTE 2012"