Merge pull request #436 from mdlpstsci/calacs_issue_435

PHOTMODE keyword updated with MJD for SBC
spacetelescope · Sep 27, 2019 · cb3ca69 · cb3ca69
2 parents 54cbf1e + 619c370
commit cb3ca69
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/pkg/acs/calacs/Dates b/pkg/acs/calacs/Dates
@@ -1,3 +1,7 @@
+ 25-Sep-2019   CALACS 10.2.1 CALACS has been modified to allow the PHOTMODE keyword
+                             to be updated with the MJDUTC for the SBC, in addition to
+                             the HRC and WFC. This will allow time-dependent sensitivity
+                             to be applied properly to SBC.
  06-Mar-2019:  CALACS 10.2.0 ACSREJ treats Bias and Dark image combination
                              differently than other data.  ACSREJ ignores the 
                              bad pixels (BPIXTAB flag of 4) during the combination 

diff --git a/pkg/acs/calacs/History b/pkg/acs/calacs/History
@@ -1,3 +1,8 @@
+### 25-Sep-2019 - MDD -- Version 10.2.1
+    CALACS has been modified to allow the PHOTMODE keyword to be updated with
+    the MJD for the SBC, in addition to the HRC and WFC. This will allow
+    time-dependent sensitivity to be applied properly to SBC.
+
 ### 06-Mar-2019 - MDD -- Version 10.2.0
     For bias or dark images, ACSREJ ignores the bad pixels (BPIXTAB flag of 4) 
     during the combination process for the SCI and ERR arrays (i.e. treat bad 

diff --git a/pkg/acs/calacs/Updates b/pkg/acs/calacs/Updates
@@ -1,3 +1,9 @@
+update for version 10.2.1 - 25-Sep-2019 (MDD)
+    pkg/acs/calacs/Dates
+    pkg/acs/calacs/History
+    pkg/acs/calacs/Updates
+    pkg/acs/calacs/acs2d/photmode.c
+
 Update for version 10.2.0 - 06-Mar-2019 (MDD)
     pkg/acs/calacs/acsrej/acsrej_do.c
     pkg/acs/calacs/acsrej/acsrej_loop.c

diff --git a/pkg/acs/calacs/acs2d/photmode.c b/pkg/acs/calacs/acs2d/photmode.c
@@ -100,11 +100,10 @@ SingleGroup *x    io: image to be calibrated; primary header is modified
             }
 	    }
     }
-    /* Add 'mjd#' keyword to PHOTMODE string, but only for WFC and HRC */
-	if (acs2d->detector != MAMA_DETECTOR) {
-        sprintf (scratch, " MJD#%0.4f", acs2d->expstart);
-        strcat (photstr,scratch);
-    }
+    /* Add 'mjd#' keyword to PHOTMODE string, modified (Git Issue #435)
+       to apply to all ACS detectors */
+    sprintf (scratch, " MJD#%0.4f", acs2d->expstart);
+    strcat (photstr,scratch);
 
     if (acs2d->verbose){
         sprintf(MsgText,"Keyword PHOTMODE built as: %s",photstr);

diff --git a/pkg/acs/calacs/include/acsversion.h b/pkg/acs/calacs/include/acsversion.h
@@ -2,8 +2,8 @@
 #define INCL_ACSVERSION_H
 
 /* This string is written to the output primary header as CAL_VER. */
-#define ACS_CAL_VER "10.2.0 (19-May-2019)"
-#define ACS_CAL_VER_NUM "10.2.0"
+#define ACS_CAL_VER "10.2.1 (25-Sept-2019)"
+#define ACS_CAL_VER_NUM "10.2.1"
 
 /* name and version number of the CTE correction algorithm */
 #define ACS_GEN1_CTE_NAME "PixelCTE 2012"