Reverting PR #1860 (#1915)

spacetelescope · Nov 21, 2024 · 248ed62 · 248ed62
1 parent 496db58
commit 248ed62
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 23 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -53,8 +53,6 @@ number of the code change for that issue.  These PRs can be viewed at:
 
 - Addressed additional issures related to numpy 2.0 scalar promotion. [#1875]
 
-- Added new header keywords and match requirements for relative fitting. [#1860]
-
 - Update to HDRTABLE for MVM products to include SVM rootname and SVM creation date. [#1846]
 
 - Added python 3.12 to testing matrix for Jenkins and github actions. [#1843]

diff --git a/drizzlepac/align.py b/drizzlepac/align.py
@@ -986,16 +986,11 @@ def determine_fit_quality(
 
         # Execute checks
         nmatches_check = False
-
-        if item.meta['fit method']!='relative':
-            required_nmatches = align_pars["run_align"]["mosaic_fitgeom_list"][fitgeom]
-        else:
-            required_nmatches = align_pars["run_align"]["mosaic_relgeom_list"][fitgeom]
-
-        # If the number of matches is more than requirement set in configuration (json) files
-        # OR the fit RMS is higher --> fit is compromised below
-        if num_xmatches >= required_nmatches or (num_xmatches >= 2 and fit_rms_val > 0.5):
+        if num_xmatches >= align_pars["run_align"]["mosaic_fitgeom_list"][fitgeom] or (
+            num_xmatches >= 2 and fit_rms_val > 0.5
+        ):
             nmatches_check = True
+
         radial_offset_check = False
         radial_offset = (
             math.sqrt(

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
@@ -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": {"rshift": 4, "rscale": 10, "general": 6},
-      "mosaic_relgeom_list": {"rshift": 20, "rscale": 10, "general": 9}
+        "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
@@ -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": {"rshift": 4, "rscale": 10, "general": 6},
-      "mosaic_relgeom_list": {"rshift": 20, "rscale": 10, "general": 9}
+        "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
@@ -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": {"rshift": 4, "rscale": 10, "general": 6},
-        "mosaic_relgeom_list": {"rshift":20, "rscale": 10, "general": 9}
+        "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
@@ -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": {"rshift": 4, "rscale": 10, "general": 6},
-        "mosaic_relgeom_list": {"rshift":20, "rscale": 10, "general": 9}
+        "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
@@ -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": {"rshift": 4, "rscale": 10, "general": 6},
-        "mosaic_relgeom_list": {"rshift":20, "rscale": 10, "general": 9}
+        "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
@@ -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": {"rshift": 4, "rscale": 10, "general": 6},
-        "mosaic_relgeom_list": {"rshift":20, "rscale": 10, "general": 9}
+        "mosaic_fitgeom_list": {"rshift": 4, "rscale": 10, "general": 6}
       },
     "generate_source_catalogs":
       {