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-18551: update ccdExposureId_bits #88

Merged
merged 2 commits into from
Mar 21, 2019
Merged

DM-18551: update ccdExposureId_bits #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff47fcd
implement [Im,Pho]simMapper.bypass_ccdExposureId_bits and set bits to 38
jchiang87 Mar 8, 2019
65a2a9e
update unit tests for change in ccdExposureId_bits
jchiang87 Mar 8, 2019
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
4 changes: 4 additions & 0 deletions python/lsst/obs/lsst/imsim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ class ImsimMapper(LsstCamMapper):

_cameraName = "imsim"

def bypass_ccdExposureId_bits(self, datasetType, pythonType, location, dataId):
"""How many bits are required for the maximum exposure ID"""
return 38 # max detector_exposure_id ~ 60000000205


class ImsimParseTask(LsstCamParseTask):
"""Parser suitable for imsim data.
Expand Down
4 changes: 4 additions & 0 deletions python/lsst/obs/lsst/phosim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ class PhosimMapper(LsstCamMapper):

_cameraName = "phosim"

def bypass_ccdExposureId_bits(self, datasetType, pythonType, location, dataId):
"""How many bits are required for the maximum exposure ID"""
return 38 # max detector_exposure_id ~ 60000000205


class PhosimParseTask(LsstCamParseTask):
"""Parser suitable for phosim data.
Expand Down
2 changes: 1 addition & 1 deletion tests/test_imsim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def setUp(self):
}
self.setUp_tests(self._butler, self._mapper, dataIds)

ccdExposureId_bits = 51
ccdExposureId_bits = 38
exposureIds = {'raw': 204595042,
'bias': 204595042,
'dark': 204595042,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_phosim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def setUp(self):
}
self.setUp_tests(self._butler, self._mapper, dataIds)

ccdExposureId_bits = 51
ccdExposureId_bits = 38
exposureIds = {'raw': 204595042}
filters = {'raw': 'i'}
exptimes = {'raw': 30.0}
Expand Down