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

DM-30351: Make sure brighter-fatter correction is working on DC2 data for DP0.2 #524

Merged
merged 1 commit into from
Jun 9, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions python/lsst/pipe/tasks/ingestCalibs.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ def getCalibType(self, filename):
obstype = "linearizer"
elif "crosstalk" in obstype:
obstype = "crosstalk"
elif "BFK" in obstype:
obstype = "bfk"
return obstype

def getDestination(self, butler, info, filename):
Expand All @@ -75,13 +77,14 @@ def getDestination(self, butler, info, filename):
class CalibsRegisterConfig(RegisterConfig):
"""Configuration for the CalibsRegisterTask"""
tables = ListField(dtype=str, default=["bias", "dark", "flat", "fringe", "sky", "defects", "qe_curve",
"linearizer", "crosstalk"], doc="Names of tables")
"linearizer", "crosstalk", "bfk"], doc="Names of tables")
calibDate = Field(dtype=str, default="calibDate", doc="Name of column for calibration date")
validStart = Field(dtype=str, default="validStart", doc="Name of column for validity start")
validEnd = Field(dtype=str, default="validEnd", doc="Name of column for validity stop")
detector = ListField(dtype=str, default=["filter", "ccd"],
doc="Columns that identify individual detectors")
validityUntilSuperseded = ListField(dtype=str, default=["defects", "qe_curve", "linearizer", "crosstalk"],
validityUntilSuperseded = ListField(dtype=str, default=["defects", "qe_curve", "linearizer", "crosstalk",
"bfk"],
doc="Tables for which to set validity for a calib from when it is "
"taken until it is superseded by the next; validity in other tables "
"is calculated by applying the validity range.")
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/pipe/tasks/read_curated_calibs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from lsst.meas.algorithms.simple_curve import Curve
from lsst.ip.isr import (Linearizer, CrosstalkCalib, Defects)
from lsst.ip.isr import (Linearizer, CrosstalkCalib, Defects, BrighterFatterKernel)

import os
import glob
Expand All @@ -26,7 +26,7 @@ def read_one_chip(root, chip_name, chip_id):
The key is the validity start time as a `datetime` object.
"""
factory_map = {'qe_curve': Curve, 'defects': Defects, 'linearizer': Linearizer,
'crosstalk': CrosstalkCalib}
'crosstalk': CrosstalkCalib, 'bfk': BrighterFatterKernel}
files = []
extensions = (".ecsv", ".yaml")
for ext in extensions:
Expand Down