updates to crpix (get straight from saif) and narrow_bar values

spacetelescope · Dec 7, 2023 · 2ee1b29 · 2ee1b29
1 parent dc1e066
commit 2ee1b29
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/spaceKLIP/database.py b/spaceKLIP/database.py
@@ -276,8 +276,10 @@ def read_jwst_s012_data(self,
             BLURFWHM += [head.get('BLURFWHM', np.nan)]
             head = hdul['SCI'].header
             BUNIT += [head.get('BUNIT', 'NONE')]
-            CRPIX1 += [head.get('CRPIX1', np.nan)]
-            CRPIX2 += [head.get('CRPIX2', np.nan)]
+            # CRPIX1 += [head.get('CRPIX1', np.nan)]
+            # CRPIX2 += [head.get('CRPIX2', np.nan)]
+            CRPIX1 += [ap.XSciRef]
+            CRPIX2 += [ap.YSciRef]
             VPARITY += [head.get('VPARITY', -1)]
             V3I_YANG += [head.get('V3I_YANG', 0.)]
             RA_REF += [head.get('RA_REF', np.nan)]
@@ -720,8 +722,10 @@ def read_jwst_s3_data(self,
             if TYPE[-1] == 'CORON3':
                 head = hdul['SCI'].header
             BUNIT += [head.get('BUNIT', 'NONE')]
-            CRPIX1 += [head.get('CRPIX1', np.nan)]
-            CRPIX2 += [head.get('CRPIX2', np.nan)]
+            # CRPIX1 += [head.get('CRPIX1', np.nan)]
+            # CRPIX2 += [head.get('CRPIX2', np.nan)]
+            CRPIX1 += [ap.XSciRef]
+            CRPIX2 += [ap.YSciRef]
             HASH += [TELESCOP[-1] + '_' + INSTRUME[-1] + '_' + DETECTOR[-1] + '_' + FILTER[-1] + '_' + PUPIL[-1] + '_' + CORONMSK[-1] + '_' + SUBARRAY[-1]]
             hdul.close()
         TYPE = np.array(TYPE)

diff --git a/spaceKLIP/resources/crpix_jarron.json b/spaceKLIP/resources/crpix_jarron.json
@@ -11,8 +11,14 @@
 	"NRCB5_MASK335R": [160.1, 161.4],
 	"NRCA2_MASK430R": [295.91, 160.88],
 	"NRCA5_MASK430R": [151.3, 175.2],
-        "NRCA5_MASKLWB": [151.3, 175.2],
+  "NRCA5_MASKLWB": [151.3, 175.2],
+	"NRCA5_FULL_MASKLWB_NARROW": [1738.7, 1684.4],
+	"NRCA5_400X256_MASKLWB_NARROW": [264.7, 145.4],
 	"NRCA2_FULL_MASK430R": [2023.91, 1519.88],
+	"NRCA4_FULL_MASKLWB_NARROW": [1410.4, 1508.4],
+	"NRCA4_400X256_MASKLWB_NARROW": [343.4, 126.4],
 	"NRCA5_FULL_MASK430R": [964.3, 1676.2],
+	"NRCA4_FULL_MASKSWB_NARROW": [226.2, 1508.7],
+  "NRCA4_MASKSWB_NARROW": [56.2, 334.7],
 	"NRCB5_MASK430R": [160.5, 161.0]
 }