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.

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

U/jbosch/fix dimensions #13

Merged
merged 5 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion doc/versionHistory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
Version History
##################

.. _lsst.ts.donut.viz-1.1.1:

-------------
1.1.1
-------------

* Add deferQueryConstraint=True to input connections that have no incoming data from an intrafocal DataId.
* Add dummyExposureJoiner to get ``exposure`` dimension into quantum graph generation to relate visit and group.

.. _lsst.ts.donut.viz-1.1.0:

-------------
Expand All @@ -20,4 +29,4 @@ Version History
1.0.0
-------------

* First official release of the donut_viz package
* First official release of the donut_viz package
20 changes: 20 additions & 0 deletions python/lsst/donut/viz/aggregate_visit.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class AggregateZernikeTablesTaskConnections(
storageClass="AstropyQTable",
name="zernikes",
multiple=True,
deferGraphConstraint=True,
)
camera = ct.PrerequisiteInput(
name="camera",
Expand Down Expand Up @@ -163,6 +164,7 @@ class AggregateDonutTablesTaskConnections(
storageClass="AstropyQTable",
name="donutQualityTable",
multiple=True,
deferGraphConstraint=True,
)
camera = ct.PrerequisiteInput(
name="camera",
Expand All @@ -178,6 +180,18 @@ class AggregateDonutTablesTaskConnections(
name="aggregateDonutTable",
multiple=True,
)
dummyExposureJoiner = ct.Input(
name="raw",
doc=(
"A dummy connection (datasets are never actually loaded) "
"that adds the 'exposure' dimension to the QG generation query "
"in order to relate 'visit' and 'group'."
),
dimensions=("exposure", "detector"),
storageClass="Exposure",
deferLoad=True,
multiple=True,
)

def __init__(self, *, config=None):
super().__init__(config=config)
Expand Down Expand Up @@ -396,18 +410,21 @@ class AggregateAOSVisitTableTaskConnections(
dimensions=("visit", "instrument"),
storageClass="AstropyQTable",
name="aggregateDonutTable",
deferGraphConstraint=True,
)
aggregateZernikesRaw = ct.Input(
doc="Visit-level table of donuts and Zernikes",
dimensions=("visit", "instrument"),
storageClass="AstropyTable",
name="aggregateZernikesRaw",
deferGraphConstraint=True,
)
aggregateZernikesAvg = ct.Input(
doc="Visit-level table of donuts and Zernikes",
dimensions=("visit", "instrument"),
storageClass="AstropyTable",
name="aggregateZernikesAvg",
deferGraphConstraint=True,
)
aggregateAOSRaw = ct.Output(
doc="Visit-level table of donuts and Zernikes",
Expand Down Expand Up @@ -516,20 +533,23 @@ class AggregateDonutStampsTaskConnections(
storageClass="StampsBase",
name="donutStampsIntra",
multiple=True,
deferGraphConstraint=True,
)
donutStampsExtra = ct.Input(
doc="Extrafocal Donut Stamps",
dimensions=("visit", "detector", "instrument"),
storageClass="StampsBase",
name="donutStampsExtra",
multiple=True,
deferGraphConstraint=True,
)
qualityTables = ct.Input(
doc="Donut quality tables",
dimensions=("visit", "detector", "instrument"),
storageClass="AstropyQTable",
name="donutQualityTable",
multiple=True,
deferGraphConstraint=True,
)
donutStampsIntraVisit = ct.Output(
doc="Intrafocal Donut Stamps",
Expand Down
Loading