Fix intermediate filenames and empty error extensions

Author: melanieclarke

jwst/adaptive_trace_model/adaptive_trace_model_step.py

@@ -138,20 +138,19 @@ def process(self, input_data):
             model.meta.cal_step.adaptive_trace_model = "COMPLETE"
             if self.save_intermediate_results:
                 _, full_spline, used_spline, linear, residual = results
-                basepath = model.meta.filename
 
-                outpath = self.make_output_path(basepath=basepath, suffix="spline_full")
+                outpath = self.make_output_path(suffix="spline_full")
                 full_spline.save(outpath)
                 full_spline.close()
                 log.info(f"Saved full spline model in {outpath}")
 
-                outpath = self.make_output_path(basepath=basepath, suffix="spline_used")
+                outpath = self.make_output_path(suffix="spline_used")
                 used_spline.save(outpath)
                 used_spline.close()
                 log.info(f"Saved spline model for compact sources in {outpath}")
 
                 if linear is not None:
-                    outpath = self.make_output_path(basepath=basepath, suffix="linear_interp")
+                    outpath = self.make_output_path(suffix="linear_interp")
                     linear.save(outpath)
                     linear.close()
                     log.info(f"Saved linearly interpolated data in {outpath}")
@@ -160,7 +159,7 @@ def process(self, input_data):
                         f"No linearly interpolated data to save for oversample={self.oversample}"
                     )
                 if residual is not None:
-                    outpath = self.make_output_path(basepath=basepath, suffix="spline_residual")
+                    outpath = self.make_output_path(suffix="spline_residual")
                     residual.save(outpath)
                     residual.close()
                     log.info(f"Saved spline residuals in {outpath}")

jwst/adaptive_trace_model/trace_model.py

@@ -137,7 +137,9 @@ def fit_2d_spline_trace(
 
     # Scale the flux for fitting
     if fit_scale is not None:
-        scaled_flux = flux / fit_scale
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=RuntimeWarning)
+            scaled_flux = flux / fit_scale
     else:
         scaled_flux = flux
 
@@ -1320,7 +1322,11 @@ def _intermediate_models(model, data_arrays):
         else:
             new_model = model_type(data=data)
             new_model.update(model_for_update)
+
+            # prevent empty error arrays
             new_model.err = None
+            new_model.meta.bunit_err = None
+
         new_models.append(new_model)
 
     if model_for_update is not model: