Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverting PR #1860 #1915

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Reverting PR #1860 #1915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6196e13
Revert "updated configuration files and use of those values in align.…
s-goldman Nov 21, 2024
22dbcda
revert changelog entry for #1860.
s-goldman Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
13 changes: 4 additions & 9 deletions drizzlepac/align.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 1 addition & 2 deletions drizzlepac/pars/hap_pars/svm_parameters/acs/hrc/acs_hrc_alignment_all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
{
Expand Down
3 changes: 1 addition & 2 deletions drizzlepac/pars/hap_pars/svm_parameters/acs/sbc/acs_sbc_alignment_all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
{
Expand Down
3 changes: 1 addition & 2 deletions drizzlepac/pars/hap_pars/svm_parameters/acs/wfc/acs_wfc_alignment_all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
{
Expand Down
3 changes: 1 addition & 2 deletions drizzlepac/pars/hap_pars/svm_parameters/wfc3/ir/wfc3_ir_alignment_all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
{
Expand Down
3 changes: 1 addition & 2 deletions drizzlepac/pars/hap_pars/svm_parameters/wfc3/uvis/wfc3_uvis_alignment_all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
{
Expand Down
3 changes: 1 addition & 2 deletions drizzlepac/pars/hap_pars/svm_parameters/wfpc2/pc/wfpc2_pc_alignment_all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
{
Expand Down
Loading