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-32315: Fix trying to set exposure ID for non-raws in Gen 2 #395

Merged
merged 1 commit into from
Oct 27, 2021
Merged

DM-32315: Fix trying to set exposure ID for non-raws in Gen 2 #395

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
17 changes: 12 additions & 5 deletions python/lsst/obs/base/cameraMapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ def std_raw(self, item, dataId):
"""Standardize a raw dataset by converting it to an Exposure instead
of an Image"""
return self._standardizeExposure(self.exposures['raw'], item, dataId,
trimmed=False, setVisitInfo=True)
trimmed=False, setVisitInfo=True, setExposureId=True)

def map_skypolicy(self, dataId):
"""Map a sky policy."""
Expand Down Expand Up @@ -1179,7 +1179,7 @@ def _setFilter(self, mapping, item, dataId):
self.log.warning("Filter %s not defined. Set to UNKNOWN.", idFilter)

def _standardizeExposure(self, mapping, item, dataId, filter=True,
trimmed=True, setVisitInfo=True):
trimmed=True, setVisitInfo=True, setExposureId=False):
"""Default standardization function for images.

This sets the Detector from the camera geometry
Expand All @@ -1203,6 +1203,8 @@ def _standardizeExposure(self, mapping, item, dataId, filter=True,
Should detector be marked as trimmed?
setVisitInfo : `bool`
Should Exposure have its VisitInfo filled out from the metadata?
setExposureId : `bool`
Should Exposure have its exposure ID filled out from the data ID?

Returns
-------
Expand All @@ -1211,7 +1213,8 @@ def _standardizeExposure(self, mapping, item, dataId, filter=True,
"""
try:
exposure = exposureFromImage(item, dataId, mapper=self, logger=self.log,
setVisitInfo=setVisitInfo, setFilter=filter)
setVisitInfo=setVisitInfo, setFilter=filter,
setExposureId=setExposureId)
except Exception as e:
self.log.error("Could not turn item=%r into an exposure: %s", item, e)
raise
Expand Down Expand Up @@ -1443,7 +1446,8 @@ def _initWriteRecipes(self):
self._writeRecipes[storageType] = validationMenu[storageType](recipes[storageType])


def exposureFromImage(image, dataId=None, mapper=None, logger=None, setVisitInfo=True, setFilter=False):
def exposureFromImage(image, dataId=None, mapper=None, logger=None, setVisitInfo=True, setFilter=False,
setExposureId=False):
"""Generate an Exposure from an image-like object

If the image is a DecoratedImage then also set its metadata
Expand All @@ -1470,6 +1474,9 @@ def exposureFromImage(image, dataId=None, mapper=None, logger=None, setVisitInfo
result. Converts non-``FilterLabel`` information provided in ``image``.
Ignored if ``image`` is an `~lsst.afw.image.Exposure` with existing
filter information.
setExposureId : `bool`, optional
If `True`, create and set an exposure ID from ``dataID``. Ignored if
``image`` is an `~lsst.afw.image.Exposure` with an existing ID.

Returns
-------
Expand All @@ -1496,7 +1503,7 @@ def exposureFromImage(image, dataId=None, mapper=None, logger=None, setVisitInfo
exposure = afwImage.makeExposure(afwImage.makeMaskedImage(image))

# set exposure ID if we can
if not exposure.info.hasId() and mapper is not None:
if setExposureId and not exposure.info.hasId() and mapper is not None:
try:
exposureId = mapper._computeCcdExposureId(dataId)
exposure.info.id = exposureId
Expand Down