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

Jump to bottom

DM-35115: Add bulge_flux_fraction column to source injection schema #691

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

DM-35115: Add bulge_flux_fraction column to source injection schema #691

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
871af87
Add bulge_flux_fraction column to source injection
jmeyers314 Jun 6, 2022
8bed068
rebase me
jmeyers314 Jun 8, 2022
de7439f
Add debug logging to fake source injection
jmeyers314 Jun 13, 2022
9b286f1
rebase me
jmeyers314 Jun 15, 2022
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
70 changes: 56 additions & 14 deletions python/lsst/pipe/tasks/insertFakes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _add_fake_sources(exposure, objects, calibFluxRadius=12.0, logger=None):
posd = galsim.PositionD(pt.x, pt.y)
posi = galsim.PositionI(pt.x//1, pt.y//1)
if logger:
logger.debug(f"Adding fake source at {pt}")
logger.debug("Adding fake source %s at %s", gsObj, pt)

mat = wcs.linearizePixelToSky(spt, geom.arcseconds).getMatrix()
gsWCS = galsim.JacobianWCS(mat[0, 0], mat[0, 1], mat[1, 0], mat[1, 1])
Expand Down Expand Up @@ -372,7 +372,8 @@ class InsertFakesConfig(PipelineTaskConfig,
)

bulge_disk_flux_ratio_col = pexConfig.Field(
doc="Source catalog column name for the bulge/disk flux ratio.",
doc="Source catalog column name for the bulge/disk flux ratio. See "
"also: ``bulge_flux_fraction_col``.",
dtype=str,
default="bulge_disk_flux_ratio",
)
Expand All @@ -386,6 +387,20 @@ class InsertFakesConfig(PipelineTaskConfig,
default="%s_mag"
)

bulge_flux_fraction_col = pexConfig.Field(
doc="Source catalog column name for fraction of flux in bulge "
"component, in the format ``filter name``_bulge_flux_fraction. "
"E.g., if this config variable is set to ``%s_bulge_flux_fraction,"
"then the i-band bulge flux fraction will be search for in the "
"``i_bulge_flux_fraction`` column of the source catalog. "
"Note that if the source catalog contains both the config values "
"for bulge_flux_fraction_col and bulge_disk_flux_ratio_col, then "
"the fluxes will be determined from bulge_flux_fraction_col and "
"the bulge_disk_flux_ratio_col column will be ignored.",
dtype=str,
default="%s_bulge_flux_fraction"
)

select_col = pexConfig.Field(
doc="Source catalog column name to be used to select which sources to "
"add.",
Expand Down Expand Up @@ -747,6 +762,8 @@ def add_to_replace_dict(new_name, depr_name, std_name):
cfg.sourceSelectionColName,
'select'
)
if replace_dict:
self.log.debug("Replacing columns: %s", replace_dict)
fakeCat = fakeCat.rename(columns=replace_dict, copy=False)

# Handling the half-light radius and axis-ratio are trickier, since we
Expand All @@ -757,15 +774,18 @@ def add_to_replace_dict(new_name, depr_name, std_name):
cfg.bulge_semimajor_col in fakeCat.columns
and cfg.bulge_axis_ratio_col in fakeCat.columns
):
replace_dict = {
cfg.bulge_semimajor_col: 'bulge_semimajor',
cfg.bulge_axis_ratio_col: 'bulge_axis_ratio',
cfg.disk_semimajor_col: 'disk_semimajor',
cfg.disk_axis_ratio_col: 'disk_axis_ratio',
}
fakeCat = fakeCat.rename(
columns={
cfg.bulge_semimajor_col: 'bulge_semimajor',
cfg.bulge_axis_ratio_col: 'bulge_axis_ratio',
cfg.disk_semimajor_col: 'disk_semimajor',
cfg.disk_axis_ratio_col: 'disk_axis_ratio',
},
columns=replace_dict,
copy=False
)
if replace_dict:
self.log.debug("Replacing columns: %s", replace_dict)
elif (
cfg.bulgeHLR in fakeCat.columns
and cfg.aBulge in fakeCat.columns
Expand All @@ -783,22 +803,44 @@ def add_to_replace_dict(new_name, depr_name, std_name):
fakeCat['disk_semimajor'] = (
fakeCat[cfg.diskHLR]/np.sqrt(fakeCat['disk_axis_ratio'])
)
self.log.debug(
"Replacing (%s, %s, %s, %s, %s, %s) with "
"(bulge_axis_ratio, bulge_semimajor, disk_axis_ratio, "
"disk_semimajor)",
cfg.bBulge, cfg.aBulge, cfg.bulgeHLR,
cfg.bDisk, cfg.aDisk, cfg.diskHLR
)
else:
raise ValueError(
"Could not determine columns for half-light radius and "
"axis ratio."
)

# Process the bulge/disk flux ratio if possible.
if cfg.bulge_disk_flux_ratio_col in fakeCat.columns:
# Standardize flux apportionment between bulge and disk using
# `bulge_flux_fraction`. Prefer, in order:
# - `bulge_flux_fraction_col`
# - `bulge_disk_flux_ratio_col`
# - bd_flux_ratio = 1.0, which is equivalent to bulge_flux_fraction=0.5
if cfg.bulge_flux_fraction_col%band in fakeCat.columns:
fakeCat = fakeCat.rename(
columns={
cfg.bulge_disk_flux_ratio_col: 'bulge_disk_flux_ratio'
cfg.bulge_flux_fraction_col%band: 'bulge_flux_fraction'
},
copy=False
)
self.log.debug(
"Replacing %s with bulge_flux_fraction.",
cfg.bulge_flux_fraction_col%band
)
elif cfg.bulge_disk_flux_ratio_col in fakeCat.columns:
bdfr = cfg.bulge_disk_flux_ratio_col
fakeCat['bulge_flux_fraction'] = (
fakeCat[bdfr] / (1 + fakeCat[bdfr])
)
self.log.debug("Replacing %s with bulge_flux_fraction.", bdfr)
else:
fakeCat['bulge_disk_flux_ratio'] = 1.0
fakeCat['bulge_flux_fraction'] = 0.5
self.log.debug("Asserting bulge_flux_fraction = 0.5")

return fakeCat

Expand Down Expand Up @@ -850,7 +892,7 @@ def _generateGSObjectsFromCatalog(self, exposure, fakeCat, galCheckVal, starChec
disk = galsim.Sersic(n=row['disk_n'], half_light_radius=disk_gs_HLR)
disk = disk.shear(q=row['disk_axis_ratio'], beta=((90 - row['disk_pa'])*galsim.degrees))

gal = bulge*row['bulge_disk_flux_ratio'] + disk
gal = bulge*row['bulge_flux_fraction'] + disk*(1-row['bulge_flux_fraction'])
gal = gal.withFlux(flux)

yield skyCoord, gal
Expand Down Expand Up @@ -1159,7 +1201,7 @@ def mkFakeGalsimGalaxies(self, fakeCat, band, photoCalib, pixelScale, psf, image
disk = galsim.Sersic(n=row['disk_n'], half_light_radius=disk_gs_HLR)
disk = disk.shear(q=row['disk_axis_ratio'], beta=((90 - row['disk_pa'])*galsim.degrees))

gal = bulge*row['bulge_disk_flux_ratio'] + disk
gal = bulge*row['bulge_flux_fraction'] + disk*(1-row['bulge_flux_fraction'])
gal = gal.withFlux(flux)

psfIm = galsim.InterpolatedImage(galsim.Image(psfKernel), scale=pixelScale)
Expand Down