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-16297: Add Gen3 butler support #105

Merged
merged 33 commits into from Sep 19, 2019
Merged

DM-16297: Add Gen3 butler support #105

merged 33 commits into from Sep 19, 2019

Conversation

timj
Copy link
Member

@timj timj commented Apr 25, 2019

No description provided.

@timj timj marked this pull request as ready for review July 26, 2019 20:31
@timj timj force-pushed the tickets/DM-16297 branch 2 times, most recently from 85001cb to 03cc500 Compare July 27, 2019 02:12
@timj timj force-pushed the tickets/DM-16297 branch 4 times, most recently from 23eacbb to ce84327 Compare September 11, 2019 20:41
@timj timj changed the title DM-16297: WIP for Gen3 butler support DM-16297: Add Gen3 butler support Sep 16, 2019
@timj timj force-pushed the tickets/DM-16297 branch 2 times, most recently from 985569d to d098d43 Compare September 16, 2019 16:13
@timj timj requested a review from TallJimbo September 16, 2019 18:53
@timj
Copy link
Member Author

timj commented Sep 16, 2019

This PR requires lsst/obs_base#170 and lsst/daf_butler#173

@timj timj requested a review from czwa September 17, 2019 20:51
@@ -138,6 +138,10 @@ class LsstBaseTranslator(FitsTranslator):
detectorSerials = None
"""Mapping of detector serial number to raft, number, and name."""

DETECTOR_MAX = 999
Copy link
Contributor

Choose a reason for hiding this comment

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

This is actually a maximum detector index to use, correct? Having this be 0 for latiss confused me due to this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. It's the maximum detector ID we can use before we change the size of the calculated detector_exposure_id

* writeCuratedCalibrations
* applyConfigOverrides
The latter does not work properly if rmtree fails (eg on NFS)
because it is not configured to ignore errors. Instead use
mkdtemp in the setUp and remove it in the tearDown as is done
in daf_butler.
For LATISS and TS3 at the moment since they take a while.
lsstCamMapper was not really doing anything clever to create
the camera so copy the one line into gen3 instrument rather
than importing the mapper code.
Without this if LsstCam is created first the subclasses
won't read their cameras.
(although may be better to use pytest --profile).
This allows gen3 instrument to obtain it.
Otherwise you can get a race where pytest starts before
all the camera YAML files have been created.
Although it can no longer run without a detector being supplied.
We could make detector optional if we took that to mean we
can skip the fix amp geometry step.
It seems that the latter has been deprecated for a while.
@timj timj merged commit aeaebe9 into master Sep 19, 2019
@timj timj deleted the tickets/DM-16297 branch September 19, 2019 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants