From fb9828396f61cb813e06f3349884f71b7efec419 Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:22:58 -0400 Subject: [PATCH] HLA-1111: Updated SVM filenames for WFPC2 (#1678) --- drizzlepac/align.py | 2 +- drizzlepac/hapsequencer.py | 4 ++-- drizzlepac/haputils/align_utils.py | 2 +- drizzlepac/haputils/config_utils.py | 10 +++++----- drizzlepac/haputils/poller_utils.py | 2 +- drizzlepac/haputils/product.py | 5 ++++- .../wfpc2_pc_alignment_all.json} | 0 .../wfpc2_pc_astrodrizzle_any_n1.json} | 0 .../wfpc2_pc_astrodrizzle_any_n2.json} | 0 .../wfpc2_pc_astrodrizzle_any_n4.json} | 0 .../wfpc2_pc_astrodrizzle_any_total.json} | 0 .../wfpc2_pc_catalog_generation_all.json} | 0 .../wfpc2_pc_quality_control_all.json} | 0 .../mvm_parameters/wfpc2_pc_index.json | 19 ++++++++++++++++++ .../mvm_parameters/wfpc2_wfpc2_index.json | 19 ------------------ .../wfpc2_pc_alignment_all.json} | 0 .../wfpc2_pc_astrodrizzle_any_n1.json} | 0 .../wfpc2_pc_astrodrizzle_any_n2.json} | 0 .../wfpc2_pc_astrodrizzle_any_n3.json} | 0 .../wfpc2_pc_astrodrizzle_any_n4.json} | 0 .../wfpc2_pc_astrodrizzle_any_total.json} | 0 .../wfpc2_pc_catalog_generation_all.json} | 0 .../wfpc2_pc_quality_control_all.json} | 0 .../svm_parameters/wfpc2_pc_index.json | 20 +++++++++++++++++++ .../svm_parameters/wfpc2_wfpc2_index.json | 20 ------------------- drizzlepac/runastrodriz.py | 2 +- drizzlepac/wfpc2Data.py | 2 +- 27 files changed, 55 insertions(+), 52 deletions(-) rename drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_alignment_all.json => pc/wfpc2_pc_alignment_all.json} (100%) rename drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json => pc/wfpc2_pc_astrodrizzle_any_n1.json} (100%) rename drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json => pc/wfpc2_pc_astrodrizzle_any_n2.json} (100%) rename drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json => pc/wfpc2_pc_astrodrizzle_any_n4.json} (100%) rename drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json => pc/wfpc2_pc_astrodrizzle_any_total.json} (100%) rename drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_catalog_generation_all.json => pc/wfpc2_pc_catalog_generation_all.json} (100%) rename drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_quality_control_all.json => pc/wfpc2_pc_quality_control_all.json} (100%) create mode 100644 drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_pc_index.json delete mode 100644 drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_wfpc2_index.json rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_alignment_all.json => pc/wfpc2_pc_alignment_all.json} (100%) rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json => pc/wfpc2_pc_astrodrizzle_any_n1.json} (100%) rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json => pc/wfpc2_pc_astrodrizzle_any_n2.json} (100%) rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_n3.json => pc/wfpc2_pc_astrodrizzle_any_n3.json} (100%) rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json => pc/wfpc2_pc_astrodrizzle_any_n4.json} (100%) rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json => pc/wfpc2_pc_astrodrizzle_any_total.json} (100%) rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_catalog_generation_all.json => pc/wfpc2_pc_catalog_generation_all.json} (100%) rename drizzlepac/pars/hap_pars/svm_parameters/wfpc2/{wfpc2/wfpc2_wfpc2_quality_control_all.json => pc/wfpc2_pc_quality_control_all.json} (100%) create mode 100644 drizzlepac/pars/hap_pars/svm_parameters/wfpc2_pc_index.json delete mode 100644 drizzlepac/pars/hap_pars/svm_parameters/wfpc2_wfpc2_index.json diff --git a/drizzlepac/align.py b/drizzlepac/align.py index fe16e722c..f6e6dadbe 100644 --- a/drizzlepac/align.py +++ b/drizzlepac/align.py @@ -367,7 +367,7 @@ def perform_align( hdr0 = fits.getheader(imglist[0]) inst = hdr0.get("instrume") if inst.lower() == "wfpc2" and "detector" not in hdr0: - det = "wfpc2" + det = "pc" else: det = hdr0.get("detector") apars = get_default_pars(inst, det) diff --git a/drizzlepac/hapsequencer.py b/drizzlepac/hapsequencer.py index 0a9fb20b9..8dcc10ce1 100755 --- a/drizzlepac/hapsequencer.py +++ b/drizzlepac/hapsequencer.py @@ -94,7 +94,7 @@ "SVM_CATALOG_WFC": 'on', "SVM_CATALOG_UVIS": 'on', "SVM_CATALOG_IR": 'on', - "SVM_CATALOG_WFPC2": 'on'} + "SVM_CATALOG_PC": 'on'} envvar_cat_str = "SVM_CATALOG_{}" # -------------------------------------------------------------------------------------------------------------- @@ -122,7 +122,7 @@ def create_catalog_products(total_obj_list, log_level, diagnostic_mode=False, ph Specify which, if any, catalogs should be generated at all, based on detector. This dictionary needs to contain values for all instruments; namely: - SVM_CATALOG_HRC, SVM_CATALOG_SBC, SVM_CATALOG_WFC, SVM_CATALOG_UVIS, SVM_CATALOG_IR, SVM_CATALOG_WFPC2 + SVM_CATALOG_HRC, SVM_CATALOG_SBC, SVM_CATALOG_WFC, SVM_CATALOG_UVIS, SVM_CATALOG_IR, SVM_CATALOG_PC These variables can be defined with values of 'on'/'off'/'yes'/'no'/'true'/'false'. diff --git a/drizzlepac/haputils/align_utils.py b/drizzlepac/haputils/align_utils.py index 750f5a895..8a13ef227 100755 --- a/drizzlepac/haputils/align_utils.py +++ b/drizzlepac/haputils/align_utils.py @@ -174,7 +174,7 @@ def __init__(self, input_list, clobber=False, dqname='DQ', process_type='', hdr0 = fits.getheader(img) instrume = hdr0.get('instrume') if instrume.lower() == 'wfpc2' and 'detector' not in hdr0: - detector = 'WFPC2' + detector = 'PC' else: detector = hdr0.get('detector') diff --git a/drizzlepac/haputils/config_utils.py b/drizzlepac/haputils/config_utils.py index 7144fb994..441e65fd1 100644 --- a/drizzlepac/haputils/config_utils.py +++ b/drizzlepac/haputils/config_utils.py @@ -248,14 +248,14 @@ def _determine_conditions(self, prod_obj): elif self.instrument == "wfpc2": if self.hap_pipeline_name == 'mvm': if n_exp > 1: - self.conditions.append("wfpc2_wfpc2_any_n2") + self.conditions.append("wfpc2_pc_any_n2") if self.hap_pipeline_name == 'svm': if n_exp == 2: - self.conditions.append("wfpc2_wfpc2_any_n2") + self.conditions.append("wfpc2_pc_any_n2") if n_exp == 3: - self.conditions.append("wfpc2_wfpc2_any_n3") + self.conditions.append("wfpc2_pc_any_n3") if n_exp >= 4: - self.conditions.append("wfpc2_wfpc2_any_n4") + self.conditions.append("wfpc2_pc_any_n4") else: log.error("{} is an invalid HST instrument!".format(self.instrument)) sys.exit(1) @@ -672,7 +672,7 @@ def read_index(instrument, detector, hap_pipeline_name='svm'): def get_wfpc2_pars(infiles): pars = {} - full_cfg_index, pars_dir = read_index('wfpc2', 'wfpc2', hap_pipeline_name='svm') + full_cfg_index, pars_dir = read_index('wfpc2', 'pc', hap_pipeline_name='svm') hap_pipeline_name = 'svm' conditions = ["single_basic"] diff --git a/drizzlepac/haputils/poller_utils.py b/drizzlepac/haputils/poller_utils.py index a9b0f43ce..d8a74cd7e 100755 --- a/drizzlepac/haputils/poller_utils.py +++ b/drizzlepac/haputils/poller_utils.py @@ -482,7 +482,7 @@ def parse_mvm_tree(det_tree, all_mvm_exposures, log_level): # mvm prod_info = 'skycell_p1234_x01y01 wfc3 uvis f200lp all 2009 1 drz' # prod_list = prod_info.split(" ") - multi_scale = prod_list[2].upper() in ['IR'] + multi_scale = prod_list[2].upper() in ['IR', 'PC'] pscale = 'fine' if not multi_scale else 'coarse' prod_info += " {:s}".format(pscale) diff --git a/drizzlepac/haputils/product.py b/drizzlepac/haputils/product.py index 896b75009..0c6e94862 100755 --- a/drizzlepac/haputils/product.py +++ b/drizzlepac/haputils/product.py @@ -70,6 +70,10 @@ def __init__( log.setLevel(log_level) self.log_level = log_level + # Special logic to specify the WFPC2 detector name always to PC (as opposed to WFPC2) for filenaming. + if instrument =='wfpc2': + detector = 'pc' + # Make sure the proposal ID is a 5-character string self.prop_id = prop_id.zfill(5) self.obset_id = obset_id @@ -77,7 +81,6 @@ def __init__( self.detector = detector self.filetype = filetype self.rules_file = None - self.basename = ( "hst_" + "_".join(map(str, [prop_id, obset_id, instrument, detector])) + "_" ) diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_alignment_all.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json similarity index 100% rename from drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_alignment_all.json rename to drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json similarity index 100% rename from drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json rename to drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n2.json similarity index 100% rename from drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json rename to drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n2.json diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n4.json similarity index 100% rename from drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json rename to drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n4.json diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json similarity index 100% rename from drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json rename to drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_catalog_generation_all.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_catalog_generation_all.json similarity index 100% rename from drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_catalog_generation_all.json rename to drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_catalog_generation_all.json diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_quality_control_all.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_quality_control_all.json similarity index 100% rename from drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_quality_control_all.json rename to drizzlepac/pars/hap_pars/mvm_parameters/wfpc2/pc/wfpc2_pc_quality_control_all.json diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_pc_index.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_pc_index.json new file mode 100644 index 000000000..0aa496146 --- /dev/null +++ b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_pc_index.json @@ -0,0 +1,19 @@ +{ + "alignment": { + "all": "wfpc2/pc/wfpc2_pc_alignment_all.json" + }, + "astrodrizzle": { + "any_n1": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json", + "filter_basic": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json", + "single_basic": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json", + "wfpc2_pc_any_n2": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_n2.json", + "wfpc2_pc_any_n4": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_n4.json", + "wfpc2_pc_any_total": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json" + }, + "catalog generation": { + "all": "wfpc2/pc/wfpc2_pc_catalog_generation_all.json" + }, + "quality control": { + "all": "wfpc2/pc/wfpc2_pc_quality_control_all.json" + } +} \ No newline at end of file diff --git a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_wfpc2_index.json b/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_wfpc2_index.json deleted file mode 100644 index e4b99009c..000000000 --- a/drizzlepac/pars/hap_pars/mvm_parameters/wfpc2_wfpc2_index.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "alignment": { - "all": "wfpc2/wfpc2/wfpc2_wfpc2_alignment_all.json" - }, - "astrodrizzle": { - "any_n1": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json", - "filter_basic": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json", - "single_basic": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json", - "wfpc2_wfpc2_any_n2": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json", - "wfpc2_wfpc2_any_n4": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json", - "wfpc2_wfpc2_any_total": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json" - }, - "catalog generation": { - "all": "wfpc2/wfpc2/wfpc2_wfpc2_catalog_generation_all.json" - }, - "quality control": { - "all": "wfpc2/wfpc2/wfpc2_wfpc2_quality_control_all.json" - } -} \ No newline at end of file diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_alignment_all.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_alignment_all.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n2.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n2.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n3.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n3.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n3.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n3.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n4.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_n4.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_catalog_generation_all.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_catalog_generation_all.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_catalog_generation_all.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_catalog_generation_all.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_quality_control_all.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_quality_control_all.json similarity index 100% rename from drizzlepac/pars/hap_pars/svm_parameters/wfpc2/wfpc2/wfpc2_wfpc2_quality_control_all.json rename to drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_quality_control_all.json diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2_pc_index.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2_pc_index.json new file mode 100644 index 000000000..d5fa7e733 --- /dev/null +++ b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2_pc_index.json @@ -0,0 +1,20 @@ +{ + "alignment": { + "all": "wfpc2/pc/wfpc2_pc_alignment_all.json" + }, + "astrodrizzle": { + "any_n1": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json", + "filter_basic": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json", + "single_basic": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_n1.json", + "total_basic": "wfpc2/pc/wfpc2_pc_astrodrizzle_any_total.json", + "wfpc2_pc_any_n2":"wfpc2/pc/wfpc2_pc_astrodrizzle_any_n2.json", + "wfpc2_pc_any_n3":"wfpc2/pc/wfpc2_pc_astrodrizzle_any_n3.json", + "wfpc2_pc_any_n4":"wfpc2/pc/wfpc2_pc_astrodrizzle_any_n4.json" + }, + "catalog generation": { + "all": "wfpc2/pc/wfpc2_pc_catalog_generation_all.json" + }, + "quality control": { + "all": "wfpc2/pc/wfpc2_pc_quality_control_all.json" + } +} \ No newline at end of file diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2_wfpc2_index.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2_wfpc2_index.json deleted file mode 100644 index 3008d5708..000000000 --- a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2_wfpc2_index.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "alignment": { - "all": "wfpc2/wfpc2/wfpc2_wfpc2_alignment_all.json" - }, - "astrodrizzle": { - "any_n1": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json", - "filter_basic": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json", - "single_basic": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n1.json", - "total_basic": "wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_total.json", - "wfpc2_wfpc2_any_n2":"wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n2.json", - "wfpc2_wfpc2_any_n3":"wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n3.json", - "wfpc2_wfpc2_any_n4":"wfpc2/wfpc2/wfpc2_wfpc2_astrodrizzle_any_n4.json" - }, - "catalog generation": { - "all": "wfpc2/wfpc2/wfpc2_wfpc2_catalog_generation_all.json" - }, - "quality control": { - "all": "wfpc2/wfpc2/wfpc2_wfpc2_quality_control_all.json" - } -} \ No newline at end of file diff --git a/drizzlepac/runastrodriz.py b/drizzlepac/runastrodriz.py index 56c9a832d..329a3d109 100755 --- a/drizzlepac/runastrodriz.py +++ b/drizzlepac/runastrodriz.py @@ -162,7 +162,7 @@ "ACS/WFC": {'sigma': 1.5, 'good_bits': 1360}, "ACS/SBC": {'sigma': 2.0, 'good_bits': 0}, "ACS/HRC": {'sigma': 1.5, 'good_bits': 1360}, - "WFPC2/WFPC2": {'sigma': 1.5, 'good_bits': 1360}} + "WFPC2/PC": {'sigma': 1.5, 'good_bits': 1360}} sub_dirs = ['OrIg_files', 'pipeline-default'] valid_alignment_modes = ['apriori', 'aposteriori', 'default-pipeline'] diff --git a/drizzlepac/wfpc2Data.py b/drizzlepac/wfpc2Data.py index 82c031350..65a6fe50b 100644 --- a/drizzlepac/wfpc2Data.py +++ b/drizzlepac/wfpc2Data.py @@ -397,7 +397,7 @@ def wfpc2_to_flt(imgname): # Add keywords to be more compatible with ACS and WFC3 data num_sci = fileutil.countExtn(imgname) - det_name = 'WFPC2' + det_name = 'PC' in_sci[0].header['DETECTOR'] = det_name in_sci[0].header['PRIMESI'] = det_name