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-26593: Create an integrated pipeline for AP fake analysis #67

Merged
merged 3 commits into from
Jan 7, 2021
Merged

DM-26593: Create an integrated pipeline for AP fake analysis #67

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a424934
Remove wildcards from createApFakes skyMap name.
morriscb Dec 15, 2020
612f6f9
Add default fakesType name to connections.
morriscb Dec 17, 2020
64d21df
Change defaultTemplate names.
morriscb Jan 6, 2021
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
3 changes: 2 additions & 1 deletion python/lsst/ap/pipe/createApFakes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from lsst.pipe.base import PipelineTask, PipelineTaskConnections, Struct
import lsst.pipe.base.connectionTypes as connTypes
from lsst.pipe.tasks.insertFakes import InsertFakesConfig
from lsst.skymap import BaseSkyMap

__all__ = ["CreateRandomApFakesTask",
"CreateRandomApFakesConfig",
Expand All @@ -39,7 +40,7 @@ class CreateRandomApFakesConnections(PipelineTaskConnections,
skyMap = connTypes.Input(
doc="Input definition of geometry/bbox and projection/wcs for "
"template exposures",
name="{CoaddName}Coadd_skyMap",
name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
dimensions=("skymap",),
storageClass="SkyMap",
)
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ap/pipe/matchApFakes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

class MatchApFakesConnections(PipelineTaskConnections,
defaultTemplates={"CoaddName": "deep",
"fakesType": ""},
"fakesType": "fakes_"},
dimensions=("tract",
"skymap",
"instrument",
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ap/pipe/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class ApFakesCompletenessMetricConnections(
MetricTask.ConfigClass.ConnectionsClass,
dimensions={"instrument", "visit", "detector", "band"},
defaultTemplates={"coaddName": "deep",
"fakesType": "",
"fakesType": "fakes_",
"package": "ap_pipe",
"metric": "apFakesCompleteness"}):
"""ApFakesCompleteness connections.
Expand Down
6 changes: 3 additions & 3 deletions tests/test_createApFakes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def testRunQuantum(self):
"""
root = tempfile.mkdtemp()
dimensions = {"instrument": ["notACam"],
"skymap": ["deepCoadd_skyMap"],
"skymap": ["skyMap"],
"tract": [0, 42],
}
testRepo = butlerTests.makeTestRepo(root, dimensions)
Expand All @@ -81,9 +81,9 @@ def testRunQuantum(self):
connections.fakeCat.dimensions,
connections.fakeCat.storageClass)

dataId = {"skymap": "deepCoadd_skyMap", "tract": 0}
dataId = {"skymap": "skyMap", "tract": 0}
butler = butlerTests.makeTestCollection(testRepo)
butler.put(self.simpleMap, "deepCoadd_skyMap", {"skymap": "deepCoadd_skyMap"})
butler.put(self.simpleMap, "skyMap", {"skymap": "skyMap"})

quantum = testUtils.makeQuantum(
fakesTask, butler, dataId,
Expand Down