Skip to content

ngmix: single source of truth for original vs reconvolved PSF columns #761

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

Open
cailmdaley wants to merge 14 commits into
base: ngmix_v2.0
Choose a base branch
from
Open

ngmix: single source of truth for original vs reconvolved PSF columns #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b6c84c4
ngmix: restore original-PSF fit; split the two PSF families by name (…
cailmdaley Jun 19, 2026
7e7887b
make_cat: rename ngmix columns to the ESTIMATOR_COMPONENT_OBJECT gram…
cailmdaley Jun 19, 2026
c3fbebe
tests: cover both PSF families and the 3-tuple do_ngmix_metacal (#749)
cailmdaley Jun 19, 2026
b7ababa
make_cat: update shipped param files to the new ngmix column grammar …
cailmdaley Jun 19, 2026
9b3025d
make_cat: add _save_ngmix_data tests; soften the grammar docstring (#…
cailmdaley Jun 19, 2026
9ab43af
ngmix: fit a copy of the original PSF so gal_obs.psf is never mutated…
cailmdaley Jun 19, 2026
b690d3f
ngmix: drop dead r50 columns (derivable from T)
cailmdaley Jun 19, 2026
85db8c1
tests: hypothesis property tests for the PSF column refactor
cailmdaley Jun 19, 2026
dfac162
deps: bump cs_util 0.2 -> 0.2.1 so cs_util.size is in the image
cailmdaley Jun 19, 2026
413c5dd
refactor: route size conversions through cs_util.size
cailmdaley Jun 19, 2026
e2f37be
test: make_data gains psf_shear for an elliptical PSF
cailmdaley Jun 20, 2026
31d2080
review: address PR #761 code review
cailmdaley Jun 20, 2026
8ae3203
refactor(ngmix): build the per-family PSF res-keys from one loop
cailmdaley Jun 20, 2026
2087874
refactor(make_cat): family-loop the PSF column write block
cailmdaley Jun 20, 2026
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
99 changes: 55 additions & 44 deletions example/cfis/final_cat.param
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ FLAGS
IMAFLAGS_ISO
NGMIX_MCAL_FLAGS

# PSF ellipticity
NGMIX_ELL_PSFo_NOSHEAR
# PSF ellipticity (original image PSF)
NGMIX_G1_PSF_ORIG_NOSHEAR
NGMIX_G2_PSF_ORIG_NOSHEAR

# spread class
#SPREAD_CLASS
Expand All @@ -29,52 +30,62 @@ NGMIX_N_EPOCH
## Ngmix: model fitting

# galaxy ellipticity
NGMIX_ELL_1M
NGMIX_ELL_1P
NGMIX_ELL_2M
NGMIX_ELL_2P
NGMIX_ELL_NOSHEAR
#NGMIX_ELL_ERR_1M
#NGMIX_ELL_ERR_1P
#NGMIX_ELL_ERR_2M
#NGMIX_ELL_ERR_2P
NGMIX_ELL_ERR_NOSHEAR
NGMIX_G1_GAL_1M
NGMIX_G2_GAL_1M
NGMIX_G1_GAL_1P
NGMIX_G2_GAL_1P
NGMIX_G1_GAL_2M
NGMIX_G2_GAL_2M
NGMIX_G1_GAL_2P
NGMIX_G2_GAL_2P
NGMIX_G1_GAL_NOSHEAR
NGMIX_G2_GAL_NOSHEAR
#NGMIX_G1_ERR_GAL_1M
#NGMIX_G2_ERR_GAL_1M
#NGMIX_G1_ERR_GAL_1P
#NGMIX_G2_ERR_GAL_1P
#NGMIX_G1_ERR_GAL_2M
#NGMIX_G2_ERR_GAL_2M
#NGMIX_G1_ERR_GAL_2P
#NGMIX_G2_ERR_GAL_2P
NGMIX_G1_ERR_GAL_NOSHEAR
NGMIX_G2_ERR_GAL_NOSHEAR

# flags
NGMIX_FLAGS_1M
NGMIX_FLAGS_1P
NGMIX_FLAGS_2M
NGMIX_FLAGS_2P
NGMIX_FLAGS_NOSHEAR
NGMIX_FLAGS_GAL_1M
NGMIX_FLAGS_GAL_1P
NGMIX_FLAGS_GAL_2M
NGMIX_FLAGS_GAL_2P
NGMIX_FLAGS_GAL_NOSHEAR

# size and error
NGMIX_T_1M
NGMIX_T_1P
NGMIX_T_2M
NGMIX_T_2P
NGMIX_T_NOSHEAR
NGMIX_T_ERR_1M
NGMIX_T_ERR_1P
NGMIX_T_ERR_2M
NGMIX_T_ERR_2P
NGMIX_T_ERR_NOSHEAR
NGMIX_Tpsf_1M
NGMIX_Tpsf_1P
NGMIX_Tpsf_2M
NGMIX_Tpsf_2P
NGMIX_Tpsf_NOSHEAR
NGMIX_T_GAL_1M
NGMIX_T_GAL_1P
NGMIX_T_GAL_2M
NGMIX_T_GAL_2P
NGMIX_T_GAL_NOSHEAR
NGMIX_T_ERR_GAL_1M
NGMIX_T_ERR_GAL_1P
NGMIX_T_ERR_GAL_2M
NGMIX_T_ERR_GAL_2P
NGMIX_T_ERR_GAL_NOSHEAR
NGMIX_T_PSF_RECONV_1M
NGMIX_T_PSF_RECONV_1P
NGMIX_T_PSF_RECONV_2M
NGMIX_T_PSF_RECONV_2P
NGMIX_T_PSF_RECONV_NOSHEAR

# flux and error
NGMIX_FLUX_1M
NGMIX_FLUX_1P
NGMIX_FLUX_2M
NGMIX_FLUX_2P
NGMIX_FLUX_NOSHEAR
NGMIX_FLUX_ERR_1M
NGMIX_FLUX_ERR_1P
NGMIX_FLUX_ERR_2M
NGMIX_FLUX_ERR_2P
NGMIX_FLUX_ERR_NOSHEAR
NGMIX_FLUX_GAL_1M
NGMIX_FLUX_GAL_1P
NGMIX_FLUX_GAL_2M
NGMIX_FLUX_GAL_2P
NGMIX_FLUX_GAL_NOSHEAR
NGMIX_FLUX_ERR_GAL_1M
NGMIX_FLUX_ERR_GAL_1P
NGMIX_FLUX_ERR_GAL_2M
NGMIX_FLUX_ERR_GAL_2P
NGMIX_FLUX_ERR_GAL_NOSHEAR

# magnitudes
MAG_AUTO
Expand All @@ -94,10 +105,10 @@ FWHM_IMAGE
FWHM_WORLD

# PSF size measured on original image
NGMIX_T_PSFo_NOSHEAR
NGMIX_T_PSF_ORIG_NOSHEAR

# PSF size measured on reconvolved image
# NGMIX_Tpsf_NOSHEAR
# NGMIX_T_PSF_RECONV_NOSHEAR

# ngmix moment failure flag
NGMIX_MOM_FAIL
99 changes: 55 additions & 44 deletions example/unions_800/cat_matched.param
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ FLAGS
IMAFLAGS_ISO
NGMIX_MCAL_FLAGS

# PSF ellipticity
NGMIX_ELL_PSFo_NOSHEAR
# PSF ellipticity (original image PSF)
NGMIX_G1_PSF_ORIG_NOSHEAR
NGMIX_G2_PSF_ORIG_NOSHEAR

# spread class
SPREAD_CLASS
Expand All @@ -29,52 +30,62 @@ NGMIX_N_EPOCH
## Ngmix: model fitting

# galaxy ellipticity
NGMIX_ELL_1M
NGMIX_ELL_1P
NGMIX_ELL_2M
NGMIX_ELL_2P
NGMIX_ELL_NOSHEAR
#NGMIX_ELL_ERR_1M
#NGMIX_ELL_ERR_1P
#NGMIX_ELL_ERR_2M
#NGMIX_ELL_ERR_2P
NGMIX_ELL_ERR_NOSHEAR
NGMIX_G1_GAL_1M
NGMIX_G2_GAL_1M
NGMIX_G1_GAL_1P
NGMIX_G2_GAL_1P
NGMIX_G1_GAL_2M
NGMIX_G2_GAL_2M
NGMIX_G1_GAL_2P
NGMIX_G2_GAL_2P
NGMIX_G1_GAL_NOSHEAR
NGMIX_G2_GAL_NOSHEAR
#NGMIX_G1_ERR_GAL_1M
#NGMIX_G2_ERR_GAL_1M
#NGMIX_G1_ERR_GAL_1P
#NGMIX_G2_ERR_GAL_1P
#NGMIX_G1_ERR_GAL_2M
#NGMIX_G2_ERR_GAL_2M
#NGMIX_G1_ERR_GAL_2P
#NGMIX_G2_ERR_GAL_2P
NGMIX_G1_ERR_GAL_NOSHEAR
NGMIX_G2_ERR_GAL_NOSHEAR

# flags
NGMIX_FLAGS_1M
NGMIX_FLAGS_1P
NGMIX_FLAGS_2M
NGMIX_FLAGS_2P
NGMIX_FLAGS_NOSHEAR
NGMIX_FLAGS_GAL_1M
NGMIX_FLAGS_GAL_1P
NGMIX_FLAGS_GAL_2M
NGMIX_FLAGS_GAL_2P
NGMIX_FLAGS_GAL_NOSHEAR

# size and error
NGMIX_T_1M
NGMIX_T_1P
NGMIX_T_2M
NGMIX_T_2P
NGMIX_T_NOSHEAR
NGMIX_T_ERR_1M
NGMIX_T_ERR_1P
NGMIX_T_ERR_2M
NGMIX_T_ERR_2P
NGMIX_T_ERR_NOSHEAR
NGMIX_Tpsf_1M
NGMIX_Tpsf_1P
NGMIX_Tpsf_2M
NGMIX_Tpsf_2P
NGMIX_Tpsf_NOSHEAR
NGMIX_T_GAL_1M
NGMIX_T_GAL_1P
NGMIX_T_GAL_2M
NGMIX_T_GAL_2P
NGMIX_T_GAL_NOSHEAR
NGMIX_T_ERR_GAL_1M
NGMIX_T_ERR_GAL_1P
NGMIX_T_ERR_GAL_2M
NGMIX_T_ERR_GAL_2P
NGMIX_T_ERR_GAL_NOSHEAR
NGMIX_T_PSF_RECONV_1M
NGMIX_T_PSF_RECONV_1P
NGMIX_T_PSF_RECONV_2M
NGMIX_T_PSF_RECONV_2P
NGMIX_T_PSF_RECONV_NOSHEAR

# flux and error
NGMIX_FLUX_1M
NGMIX_FLUX_1P
NGMIX_FLUX_2M
NGMIX_FLUX_2P
NGMIX_FLUX_NOSHEAR
NGMIX_FLUX_ERR_1M
NGMIX_FLUX_ERR_1P
NGMIX_FLUX_ERR_2M
NGMIX_FLUX_ERR_2P
NGMIX_FLUX_ERR_NOSHEAR
NGMIX_FLUX_GAL_1M
NGMIX_FLUX_GAL_1P
NGMIX_FLUX_GAL_2M
NGMIX_FLUX_GAL_2P
NGMIX_FLUX_GAL_NOSHEAR
NGMIX_FLUX_ERR_GAL_1M
NGMIX_FLUX_ERR_GAL_1P
NGMIX_FLUX_ERR_GAL_2M
NGMIX_FLUX_ERR_GAL_2P
NGMIX_FLUX_ERR_GAL_NOSHEAR

# Flag for multiple objects due to overlapping
# tiles
Expand All @@ -87,10 +98,10 @@ MAG_AUTO
SNR_WIN

# PSF size measured on original image
NGMIX_T_PSFo_NOSHEAR
NGMIX_T_PSF_ORIG_NOSHEAR

# PSF size measured on reconvolved image
# NGMIX_Tpsf_NOSHEAR
# NGMIX_T_PSF_RECONV_NOSHEAR

# ngmix moment failure flag
NGMIX_MOM_FAIL
Expand Down
Loading