initial attempt at fix

jwst/cube_build/cube_build_step.py

@@ -396,14 +396,13 @@ def process(self, input):
                 if key in cube.meta.wcsinfo.instance:
                     del cube.meta.wcsinfo.instance[key]
         if status_cube == 1:
-            self.skip = True
+            self.record_step_status(cube_container, "cube_build", success=False)
+        else:
+            self.record_step_status(cube_container, "cube_build", success=True)
 
         t1 = time.time()
         self.log.debug(f'Time to build all cubes {t1-t0}')
 
-        if status_cube == 1:
-            self.skip = True
-
         input_table.close()
         return cube_container
 # ******************************************************************************

jwst/pipeline/calwebb_spec2.py

@@ -332,7 +332,7 @@ def process_exposure_product(
             # as DO_NOT_USE or NON_SCIENCE.
             resampled = self.pixel_replace(resampled)
             resampled = self.cube_build(resampled)
-            if not self.cube_build.skip:
+            if resampled[0].meta.cal_step.cube_build == 'COMPLETE':
                 self.save_model(resampled[0], suffix='s3d')
         elif exp_type in ['MIR_LRS-SLITLESS']:
             resampled = calibrated.copy()
@@ -346,7 +346,7 @@ def process_exposure_product(
             # as DO_NOT_USE or NON_SCIENCE.
             resampled = self.pixel_replace(resampled)
         # Extract a 1D spectrum from the 2D/3D data
-        if exp_type in ['MIR_MRS', 'NRS_IFU'] and self.cube_build.skip:
+        if exp_type in ['MIR_MRS', 'NRS_IFU'] and resampled[0].meta.cal_step.cube_build == 'SKIPPED':
             # Skip extract_1d for IFU modes where no cube was built
             self.extract_1d.skip = True
 

jwst/pipeline/calwebb_spec3.py

@@ -148,7 +148,7 @@ def process(self, input):
 
             # If the step is skipped, do the container splitting that
             # would've been done in master_background
-            if self.master_background.skip:
+            if source_models[0].meta.cal_step.master_background == 'SKIPPED':
                 source_models, bkg_models = split_container(input_models)
                 # we don't need the background members
                 bkg_models.close()

jwst/stpipe/core.py

@@ -107,7 +107,6 @@ def record_step_status(self, datamodel, cal_step, success=True):
             status = 'COMPLETE'
         else:
             status = 'SKIPPED'
-            self.skip = True
 
         if isinstance(datamodel, Sequence):
             for model in datamodel:

jwst/tweakreg/tweakreg_step.py

@@ -204,9 +204,7 @@ def process(self, input):
                 self.log.warning("At least two exposures are required for image "
                                  "alignment.")
                 self.log.warning("Nothing to do. Skipping 'TweakRegStep'...")
-                self.skip = True
-                for model in images:
-                    model.meta.cal_step.tweakreg = "SKIPPED"
+                self.record_step_status(input, "tweakreg", success=False)
                 return input
 
         # === start processing images ===
@@ -311,10 +309,8 @@ def process(self, input):
                     self.log.warning("At least two exposures are required for "
                                      "image alignment.")
                     self.log.warning("Nothing to do. Skipping 'TweakRegStep'...")
-                    for model in images:
-                        model.meta.cal_step.tweakreg = "SKIPPED"
+                    self.record_step_status(images, "tweakreg", success=False)
                     if not align_to_abs_refcat:
-                        self.skip = True
                         return images
                     local_align_failed = True
                 else:
@@ -329,9 +325,7 @@ def process(self, input):
                                    "matched to a single reference source. Try to "
                                    "adjust 'tolerance' and/or 'separation' parameters.")
                     self.log.warning("Skipping 'TweakRegStep'...")
-                    self.skip = True
-                    for model in images:
-                        model.meta.cal_step.tweakreg = "SKIPPED"
+                    self.record_step_status(images, "tweakreg", success=False)
                     return images
                 else:
                     raise e
@@ -341,9 +335,7 @@ def process(self, input):
                     self.log.warning("Skipping relative alignment (stage 1)...")
                 else:
                     self.log.warning("Skipping 'TweakRegStep'...")
-                    self.skip = True
-                    for model in images:
-                        model.meta.cal_step.tweakreg = "SKIPPED"
+                    self.record_step_status(images, "tweakreg", success=False)
                     return images
 
         if align_to_abs_refcat:
@@ -461,9 +453,7 @@ def process(self, input):
                         )
                         if local_align_failed or n_groups == 1:
                             self.log.warning("Nothing to do. Skipping 'TweakRegStep'...")
-                            for model in images:
-                                model.meta.cal_step.tweakreg = "SKIPPED"
-                            self.skip = True
+                            self.record_step_status(images, "tweakreg", success=False)
                             return images
                     else:
                         raise e
@@ -482,9 +472,7 @@ def process(self, input):
                         )
                         if local_align_failed or n_groups == 1:
                             self.log.warning("Skipping 'TweakRegStep'...")
-                            self.skip = True
-                            for model in images:
-                                model.meta.cal_step.tweakreg = "SKIPPED"
+                            self.record_step_status(images, "tweakreg", success=False)
                             return images
                     else:
                         raise e