From 91b1b19f3e890235bf367996d8db14c546fb101a Mon Sep 17 00:00:00 2001 From: Ned Molter Date: Fri, 23 Aug 2024 14:40:14 -0400 Subject: [PATCH] removed one more manual change to output file naming --- jwst/pipeline/calwebb_image3.py | 2 +- jwst/resample/resample_step.py | 4 +--- jwst/source_catalog/source_catalog_step.py | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jwst/pipeline/calwebb_image3.py b/jwst/pipeline/calwebb_image3.py index 9fe98b9376..fcdb45c755 100644 --- a/jwst/pipeline/calwebb_image3.py +++ b/jwst/pipeline/calwebb_image3.py @@ -71,7 +71,7 @@ def process(self, input_data): # background and target-acq members are not needed. input_models = self._load_input_as_library(input_data) - if (self.output_file is None) and "name" in input_models.asn["products"][0]: + if (self.output_file is None) and ("name" in input_models.asn["products"][0]): # If input is an association, set the output to the product name. self.output_file = input_models.asn["products"][0]["name"] diff --git a/jwst/resample/resample_step.py b/jwst/resample/resample_step.py index 7d7377e5e6..41b7e18479 100755 --- a/jwst/resample/resample_step.py +++ b/jwst/resample/resample_step.py @@ -77,8 +77,6 @@ def process(self, input): # resampling. # TODO: figure out why and make sure asn_table is carried along output = None - # if self.save_results: - # self.output_file = output # Check that input models are 2D images with input_models: @@ -113,7 +111,7 @@ def process(self, input): model.meta.resample.pixfrac = kwargs['pixfrac'] # update filename to reflect new product # necessary to get source_catalog output names to match i2d filename - model.meta.filename = self.output_file + # model.meta.filename = self.output_file result.shelve(model) if len(result) == 1: diff --git a/jwst/source_catalog/source_catalog_step.py b/jwst/source_catalog/source_catalog_step.py index 90932584e9..0e3b78ef08 100755 --- a/jwst/source_catalog/source_catalog_step.py +++ b/jwst/source_catalog/source_catalog_step.py @@ -102,7 +102,6 @@ def process(self, input_model): model.data += bkg.background if self.save_results: - # self.output_file = model.meta.filename cat_filepath = self.make_output_path(ext='.ecsv') catalog.write(cat_filepath, format='ascii.ecsv', overwrite=True)