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-16338: Remove addFluxErr (permanently make it True) #143

Merged
merged 1 commit into from
Dec 18, 2018
Merged

DM-16338: Remove addFluxErr (permanently make it True) #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion python/lsst/meas/algorithms/ingestIndexReferenceTask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ def makeSchema(self, dtype):
# make a schema with the standard fields
schema = LoadReferenceObjectsTask.makeMinimalSchema(
filterNameList=self.config.mag_column_list,
addFluxErr=bool(self.config.mag_err_column_map),
addCentroid=False,
addIsPhotometric=bool(self.config.is_photometric_name),
addIsResolved=bool(self.config.is_resolved_name),
Expand Down
19 changes: 8 additions & 11 deletions python/lsst/meas/algorithms/loadReferenceObjects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ def addAliasesForOneFilter(filterName, refFilterName):
addAliasesForOneFilter(filterName, refFilterName)

@staticmethod
def makeMinimalSchema(filterNameList, *, addFluxErr=False, addCentroid=True,
def makeMinimalSchema(filterNameList, *, addCentroid=True,
addIsPhotometric=False, addIsResolved=False,
addIsVariable=False, coordErrDim=2,
addProperMotion=False, properMotionErrDim=2,
Expand All @@ -439,8 +439,6 @@ def makeMinimalSchema(filterNameList, *, addFluxErr=False, addCentroid=True,
----------
filterNameList : `list` of `str`
List of filter names. Used to create <filterName>_flux fields.
addFluxErr : `bool`
If True then include flux sigma fields.
addIsPhotometric : `bool`
If True then add field "photometric".
addIsResolved : `bool`
Expand Down Expand Up @@ -498,14 +496,13 @@ def makeMinimalSchema(filterNameList, *, addFluxErr=False, addCentroid=True,
doc="flux in filter %s" % (filterName,),
units="Jy",
)
if addFluxErr:
for filterName in filterNameList:
schema.addField(
field="%s_fluxErr" % (filterName,),
type=numpy.float64,
doc="flux uncertainty in filter %s" % (filterName,),
units="Jy",
)
for filterName in filterNameList:
schema.addField(
field="%s_fluxErr" % (filterName,),
type=numpy.float64,
doc="flux uncertainty in filter %s" % (filterName,),
units="Jy",
)
if addIsPhotometric:
schema.addField(
field="photometric",
Expand Down
115 changes: 53 additions & 62 deletions tests/test_loadReferenceObjects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,14 @@ class TestLoadReferenceObjects(lsst.utils.tests.TestCase):
def testMakeMinimalSchema(self):
"""Make a schema and check it."""
for filterNameList in (["r"], ["foo", "_bar"]):
for (addFluxErr, addIsPhotometric, addIsResolved, addIsVariable,
for (addIsPhotometric, addIsResolved, addIsVariable,
coordErrDim, addProperMotion, properMotionErrDim,
addParallax, addParallaxErr) in itertools.product(
(False, True), (False, True), (False, True), (False, True),
(False, True), (False, True), (False, True),
(-1, 0, 1, 2, 3, 4), (False, True), (-1, 0, 1, 2, 3, 4),
(False, True), (False, True)):
argDict = dict(
filterNameList=filterNameList,
addFluxErr=addFluxErr,
addIsPhotometric=addIsPhotometric,
addIsResolved=addIsResolved,
addIsVariable=addIsVariable,
Expand All @@ -80,7 +79,7 @@ def testMakeMinimalSchema(self):
self.assertIn(fluxField, refSchema)
self.assertNotIn("x" + fluxField, refSchema)
fluxErrField = fluxField + "Err"
self.assertEqual(fluxErrField in refSchema, addFluxErr)
self.assertIn(fluxErrField, refSchema)
self.assertEqual(getRefFluxField(refSchema, filterName), filterName + "_flux")
self.assertEqual("resolved" in refSchema, addIsResolved)
self.assertEqual("variable" in refSchema, addIsVariable)
Expand All @@ -105,64 +104,56 @@ def testFilterAliasMap(self):
"""Make a schema with filter aliases."""
for defaultFilter in ("", "r", "camr"):
for filterMap in ({}, {"camr": "r"}):
for addFluxErr in (False, True):
config = TrivialLoader.ConfigClass()
config.defaultFilter = defaultFilter
config.filterMap = filterMap
loader = TrivialLoader(config=config)
refSchema = TrivialLoader.makeMinimalSchema(filterNameList="r", addFluxErr=addFluxErr)
try:
loader._addFluxAliases(refSchema)
self.assertNotEqual(defaultFilter, "camr")
except Exception:
# only reference filters are allowed as default filters
self.assertEqual(defaultFilter, "camr")
continue

self.assertIn("r_flux", refSchema)
self.assertEqual("r_fluxErr" in refSchema, addFluxErr)

# camera filters aliases are named <filter>_camFlux
if "camr" in filterMap:
self.assertEqual(getRefFluxField(refSchema, "camr"), "camr_camFlux")
else:
with self.assertRaises(RuntimeError):
getRefFluxField(refSchema, "camr")

# if a non-empty default filter is specified then camFlux
# and camFluxErr (if addFluxErr) should be present
hasDefault = bool(defaultFilter)
self.assertEqual("camFlux" in refSchema, hasDefault)
self.assertEqual("camFluxErr" in refSchema, hasDefault and addFluxErr)

refCat = afwTable.SimpleCatalog(refSchema)
refObj = refCat.addNew()
refObj["r_flux"] = 1.23
self.assertAlmostEqual(refCat[0].get(getRefFluxField(refSchema, "r")), 1.23)
if "camr" in filterMap:
self.assertAlmostEqual(refCat[0].get(getRefFluxField(refSchema, "camr")), 1.23)
if hasDefault:
self.assertEqual(getRefFluxField(refSchema, ""), "camFlux")
self.assertAlmostEqual(refCat[0].get(getRefFluxField(refSchema, "")), 1.23)
if addFluxErr:
refObj["r_fluxErr"] = 0.111
if "camr" in filterMap:
self.assertEqual(refCat[0].get("camr_camFluxErr"), 0.111)
fluxKey, fluxErrKey = getRefFluxKeys(refSchema, "r")
self.assertEqual(refCat[0].get(fluxKey), 1.23)
if addFluxErr:
self.assertEqual(refCat[0].get(fluxErrKey), 0.111)
else:
self.assertEqual(fluxErrKey, None)
if "camr" in filterMap:
fluxKey, fluxErrKey = getRefFluxKeys(refSchema, "camr")
if addFluxErr:
self.assertEqual(refCat[0].get(fluxErrKey), 0.111)
else:
self.assertEqual(fluxErrKey, None)
else:
with self.assertRaises(RuntimeError):
getRefFluxKeys(refSchema, "camr")
config = TrivialLoader.ConfigClass()
config.defaultFilter = defaultFilter
config.filterMap = filterMap
loader = TrivialLoader(config=config)
refSchema = TrivialLoader.makeMinimalSchema(filterNameList="r")
try:
loader._addFluxAliases(refSchema)
self.assertNotEqual(defaultFilter, "camr")
except Exception:
# only reference filters are allowed as default filters
self.assertEqual(defaultFilter, "camr")
continue

self.assertIn("r_flux", refSchema)
self.assertIn("r_fluxErr", refSchema)

# camera filters aliases are named <filter>_camFlux
if "camr" in filterMap:
self.assertEqual(getRefFluxField(refSchema, "camr"), "camr_camFlux")
else:
with self.assertRaises(RuntimeError):
getRefFluxField(refSchema, "camr")

# if a non-empty default filter is specified then camFlux
# and camFluxErr should be present
hasDefault = bool(defaultFilter)
self.assertEqual("camFlux" in refSchema, hasDefault)
self.assertEqual("camFluxErr" in refSchema, hasDefault)

refCat = afwTable.SimpleCatalog(refSchema)
refObj = refCat.addNew()
refObj["r_flux"] = 1.23
self.assertAlmostEqual(refCat[0].get(getRefFluxField(refSchema, "r")), 1.23)
if "camr" in filterMap:
self.assertAlmostEqual(refCat[0].get(getRefFluxField(refSchema, "camr")), 1.23)
if hasDefault:
self.assertEqual(getRefFluxField(refSchema, ""), "camFlux")
self.assertAlmostEqual(refCat[0].get(getRefFluxField(refSchema, "")), 1.23)
refObj["r_fluxErr"] = 0.111
if "camr" in filterMap:
self.assertEqual(refCat[0].get("camr_camFluxErr"), 0.111)
fluxKey, fluxErrKey = getRefFluxKeys(refSchema, "r")
self.assertEqual(refCat[0].get(fluxKey), 1.23)
self.assertEqual(refCat[0].get(fluxErrKey), 0.111)
if "camr" in filterMap:
fluxKey, fluxErrKey = getRefFluxKeys(refSchema, "camr")
self.assertEqual(refCat[0].get(fluxErrKey), 0.111)
else:
with self.assertRaises(RuntimeError):
getRefFluxKeys(refSchema, "camr")


class TestMemory(lsst.utils.tests.MemoryTestCase):
Expand Down