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-44545: Design initial calibration report format #291

Merged
merged 4 commits into from
Oct 17, 2024
Merged

DM-44545: Design initial calibration report format #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76b8f94
Fix missing PTC dataset.
czwa Oct 2, 2024
817300f
Fix default marker style so plots contain plots.
czwa Oct 8, 2024
0bcd4e3
Make both raw and final PTC curve plots.
czwa Oct 8, 2024
e23fa6a
Formatting fix.
czwa Oct 8, 2024
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
16 changes: 14 additions & 2 deletions pipelines/cpCore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ tasks:
class: lsst.analysis.tools.tasks.VerifyCalibAnalysisTask
config:
connections.outputName: cpPtcCore
connections.data: verifyPtcResults

atools.ptcGainPerAmp: CalibStatisticFocalPlanePlot
atools.ptcGainPerAmp.produce.plot.addHistogram: true
Expand Down Expand Up @@ -209,10 +210,21 @@ tasks:

atools.ptcPlot: CalibAmpScatterTool
atools.ptcPlot.prep.panelKey: amplifier
atools.ptcPlot.prep.dataKey: PTC_PTC_RAW_MEANS
atools.ptcPlot.prep.quantityKey: PTC_PTC_RAW_VARIANCE
atools.ptcPlot.prep.dataKey: PTC_PTC_FINAL_MEANS
atools.ptcPlot.prep.quantityKey: PTC_PTC_FINAL_VARIANCE
atools.ptcPlot.produce.plot.xAxisLabel: "Exposure Pair Flux (ADU)"
atools.ptcPlot.produce.plot.yAxisLabel: "Exposure Pair Variance (ADU^2)"
atools.ptcPlot.produce.plot.suptitle:
t: "PTC (Final)"

atools.rawPtcPlot: CalibAmpScatterTool
atools.rawPtcPlot.prep.panelKey: amplifier
atools.rawPtcPlot.prep.dataKey: PTC_PTC_RAW_MEANS
atools.rawPtcPlot.prep.quantityKey: PTC_PTC_RAW_VARIANCE
atools.rawPtcPlot.produce.plot.xAxisLabel: "Exposure Pair Flux (ADU)"
atools.rawPtcPlot.produce.plot.yAxisLabel: "Exposure Pair Variance (ADU^2)"
atools.rawPtcPlot.produce.plot.suptitle:
t: "PTC (Raw)"
python: |
from lsst.analysis.tools.atools import *

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/analysis/tools/actions/plot/elements/scatterElement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def __call__(self, data: KeyedData, ax: Axes, **kwargs) -> KeyedData:
data[self.xKey] if self.xKey is not None else range(len(data[self.valsKey])), # type: ignore
data[self.valsKey], # type: ignore
color=self.color if self.color is not None else None,
marker=self.marker if self.marker is not None else None,
marker=self.marker if self.marker is not None else ".",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that a lot of these defaults seem a little weird.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was some pushback to this change on slack, but I plan to still merge it with this logic: merging this change will make some line plots that use this element look different; not merging it will make scatter plots that use this element empty.

linestyle=self.linestyle if self.linestyle is not None else None,
linewidth=self.linewidth if self.linewidth is not None else None,
markersize=self.markersize if self.markersize is not None else None,
Expand Down
Loading