From 82eff211a7b97a7d96962e6402275175f396cd3f Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:53:54 -0500 Subject: [PATCH] Revert "HLA-1385 Configuration Parameter Updates for SVM and Pipeline Products. (#1913)" This reverts commit fcea7d7efc48cdf94078fb046eea7a5b485ca3d5. --- CHANGELOG.rst | 3 --- .../hap_pars/svm_parameters/acs/hrc/acs_hrc_alignment_all.json | 3 +-- .../hap_pars/svm_parameters/acs/sbc/acs_sbc_alignment_all.json | 3 +-- .../hap_pars/svm_parameters/acs/wfc/acs_wfc_alignment_all.json | 3 +-- .../hap_pars/svm_parameters/wfc3/ir/wfc3_ir_alignment_all.json | 3 +-- .../svm_parameters/wfc3/uvis/wfc3_uvis_alignment_all.json | 3 +-- .../svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json | 3 +-- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a399cd5e4..e90accba2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -20,9 +20,6 @@ number of the code change for that issue. These PRs can be viewed at: 3.8.0 (unreleased) ================== - -- Update to pipeline and SVM alignment configuration parameters. [1912] - - Include a minimum RMS value for the SBC detector, as is done for the other detectors, as there seems to be a lot of noise in the source catalogs due to a low detection threshold. [#1908] diff --git a/drizzlepac/pars/hap_pars/svm_parameters/acs/hrc/acs_hrc_alignment_all.json b/drizzlepac/pars/hap_pars/svm_parameters/acs/hrc/acs_hrc_alignment_all.json index 6ff9f327e..85f94767f 100644 --- a/drizzlepac/pars/hap_pars/svm_parameters/acs/hrc/acs_hrc_alignment_all.json +++ b/drizzlepac/pars/hap_pars/svm_parameters/acs/hrc/acs_hrc_alignment_all.json @@ -16,8 +16,7 @@ "MAX_FIT_LIMIT": 150, "mosaic_catalog_list": ["GAIAeDR3", "GSC242", "2MASS"], "mosaic_fit_list": ["match_relative_fit", "match_2dhist_fit", "match_default_fit"], - "mosaic_fitgeom_list": {"rscale": 12, "general": 25}, - "mosaic_relgeom_list": {"rscale": 12} + "mosaic_fitgeom_list": {"rshift": 4, "rscale": 10, "general": 6} }, "generate_source_catalogs": { diff --git a/drizzlepac/pars/hap_pars/svm_parameters/acs/sbc/acs_sbc_alignment_all.json b/drizzlepac/pars/hap_pars/svm_parameters/acs/sbc/acs_sbc_alignment_all.json index f4d914561..87aee019f 100644 --- a/drizzlepac/pars/hap_pars/svm_parameters/acs/sbc/acs_sbc_alignment_all.json +++ b/drizzlepac/pars/hap_pars/svm_parameters/acs/sbc/acs_sbc_alignment_all.json @@ -16,8 +16,7 @@ "MAX_FIT_LIMIT": 150, "mosaic_catalog_list": ["GAIAeDR3", "GSC242", "2MASS"], "mosaic_fit_list": ["match_relative_fit", "match_2dhist_fit", "match_default_fit"], - "mosaic_fitgeom_list": {"rscale": 12, "general": 25}, - "mosaic_relgeom_list": {"rscale": 12} + "mosaic_fitgeom_list": {"rshift": 4, "rscale": 10, "general": 6} }, "generate_source_catalogs": { diff --git a/drizzlepac/pars/hap_pars/svm_parameters/acs/wfc/acs_wfc_alignment_all.json b/drizzlepac/pars/hap_pars/svm_parameters/acs/wfc/acs_wfc_alignment_all.json index 93ed346c1..6d5404776 100644 --- a/drizzlepac/pars/hap_pars/svm_parameters/acs/wfc/acs_wfc_alignment_all.json +++ b/drizzlepac/pars/hap_pars/svm_parameters/acs/wfc/acs_wfc_alignment_all.json @@ -16,8 +16,7 @@ "MAX_FIT_LIMIT": 150, "mosaic_catalog_list": ["GAIAeDR3", "GSC242", "2MASS"], "mosaic_fit_list": ["match_relative_fit", "match_2dhist_fit", "match_default_fit"], - "mosaic_fitgeom_list": {"rscale": 12, "general": 25}, - "mosaic_relgeom_list": {"rscale": 12} + "mosaic_fitgeom_list": {"rshift": 4, "rscale": 10, "general": 6} }, "generate_source_catalogs": { diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfc3/ir/wfc3_ir_alignment_all.json b/drizzlepac/pars/hap_pars/svm_parameters/wfc3/ir/wfc3_ir_alignment_all.json index c421751cb..9baa83646 100644 --- a/drizzlepac/pars/hap_pars/svm_parameters/wfc3/ir/wfc3_ir_alignment_all.json +++ b/drizzlepac/pars/hap_pars/svm_parameters/wfc3/ir/wfc3_ir_alignment_all.json @@ -16,8 +16,7 @@ "MAX_FIT_LIMIT": 150, "mosaic_catalog_list": ["GAIAeDR3", "GSC242", "2MASS"], "mosaic_fit_list": ["match_relative_fit", "match_2dhist_fit", "match_default_fit"], - "mosaic_fitgeom_list": {"rscale": 12, "general": 25}, - "mosaic_relgeom_list": {"rscale": 12} + "mosaic_fitgeom_list": {"rshift": 4, "rscale": 10, "general": 6} }, "generate_source_catalogs": { diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfc3/uvis/wfc3_uvis_alignment_all.json b/drizzlepac/pars/hap_pars/svm_parameters/wfc3/uvis/wfc3_uvis_alignment_all.json index a6c8bacad..cb146be44 100644 --- a/drizzlepac/pars/hap_pars/svm_parameters/wfc3/uvis/wfc3_uvis_alignment_all.json +++ b/drizzlepac/pars/hap_pars/svm_parameters/wfc3/uvis/wfc3_uvis_alignment_all.json @@ -16,8 +16,7 @@ "MAX_FIT_LIMIT": 150, "mosaic_catalog_list": ["GAIAeDR3", "GSC242", "2MASS"], "mosaic_fit_list": ["match_relative_fit", "match_2dhist_fit", "match_default_fit"], - "mosaic_fitgeom_list": {"rscale": 12, "general": 25}, - "mosaic_relgeom_list": {"rscale": 12} + "mosaic_fitgeom_list": {"rshift": 4, "rscale": 10, "general": 6} }, "generate_source_catalogs": { diff --git a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json index 78bdea878..4c0bd903c 100644 --- a/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json +++ b/drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json @@ -16,8 +16,7 @@ "MAX_FIT_LIMIT": 150, "mosaic_catalog_list": ["GAIAeDR3", "GSC242", "2MASS"], "mosaic_fit_list": ["match_relative_fit", "match_2dhist_fit", "match_default_fit"], - "mosaic_fitgeom_list": {"rscale": 12, "general": 25}, - "mosaic_relgeom_list": {"rscale": 12} + "mosaic_fitgeom_list": {"rshift": 4, "rscale": 10, "general": 6} }, "generate_source_catalogs": {