JP-2603: Catch None return from SOSS F277W in Level3 (#6863)

* Catch None return from SOSS F277W in Level3 * changelog * [skip ci] forgot whitespace in changelog Co-authored-by: Howard Bushouse <[email protected]>
spacetelescope · May 31, 2022 · 3548187 · 3548187
1 parent 527fc14
commit 3548187
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 1.5.3 (unreleased)
 ==================
 
+pipeline
+--------
+
+- Add check to ensure SOSS `extract_1d` return is not None, to
+  avoid photom errors in Spec3Pipeline and Tso3Pipeline [#6863]
+
 resample
 --------
 

diff --git a/jwst/pipeline/calwebb_spec3.py b/jwst/pipeline/calwebb_spec3.py
@@ -217,10 +217,13 @@ def process(self, input):
                     # instead run photom on the extract_1d results and save
                     # those instead.
                     self.extract_1d.save_results = False
-                    self.photom.save_results = self.save_results
-                    self.photom.suffix = 'x1d'
                     result = self.extract_1d(result)
-                    result = self.photom(result)
+
+                    # SOSS F277W may return None - don't bother with that.
+                    if result is not None:
+                        self.photom.save_results = self.save_results
+                        self.photom.suffix = 'x1d'
+                        result = self.photom(result)
                 else:
                     result = self.extract_1d(result)
 

diff --git a/jwst/pipeline/calwebb_tso3.py b/jwst/pipeline/calwebb_tso3.py
@@ -163,16 +163,18 @@ def process(self, input):
                 self.log.info("Extracting 1-D spectra ...")
                 result = self.extract_1d(cube)
 
-                if input_exptype == 'NIS_SOSS':
-                    # SOSS data have yet to be photometrically calibrated
-                    # Calibrate 1D spectra here.
-                    result = self.photom(result)
-
-                x1d_result.spec.extend(result.spec)
-
-                # perform white-light photometry on 1d extracted data
-                self.log.info("Performing white-light photometry ...")
-                phot_result_list.append(self.white_light(result))
+                # SOSS F277W may return None - don't bother with that
+                if result is not None:
+                    if input_exptype == 'NIS_SOSS':
+                        # SOSS data have yet to be photometrically calibrated
+                        # Calibrate 1D spectra here.
+                        result = self.photom(result)
+
+                    x1d_result.spec.extend(result.spec)
+
+                    # perform white-light photometry on 1d extracted data
+                    self.log.info("Performing white-light photometry ...")
+                    phot_result_list.append(self.white_light(result))
 
             # Update some metadata from the association
             x1d_result.meta.asn.pool_name = input_models.meta.asn_table.asn_pool