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-34919: Remove gen2 support #402

Merged
merged 5 commits into from Jun 1, 2022
Merged

DM-34919: Remove gen2 support #402

merged 5 commits into from Jun 1, 2022

Conversation

timj
Copy link
Member

@timj timj commented May 24, 2022

No description provided.

Copy link
Contributor

@parejkoj parejkoj left a comment

Choose a reason for hiding this comment

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

How are ccdExposureIds handled in gen3? Those and detector names are the removals here, so I hope we're testing the modern interface for that somewhere?

instrument.makeDefaultRawIngestRunName(),
instrument.makeCalibrationCollectionName()]
cls._butler = lsst.daf.butler.Butler(cls.data_dir, collections=collections,
instrument=instrument.getName())
Copy link
Contributor

Choose a reason for hiding this comment

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

All of the above is instrument agnostic, so it could go into obs_base:butler_tests.setup_*, I think?

Copy link
Member Author

Choose a reason for hiding this comment

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

Only if the obs_base tests are dropping gen2 and we think any of these tests are worth keeping.

tests/test_comCam.py Show resolved Hide resolved
@timj
Copy link
Member Author

timj commented May 26, 2022

ccdExposureId is not anything to do with butler so the test is no longer relevant.

detector names are all handled transparently by the detector dimension record in butler (which comes from the ObservationInfo) so there is no specialist parsing involved, unlike gen2. The tests asking for a dataset by raft and name_in_raft show that it works.

timj added 4 commits May 31, 2022 14:10
The gen2 tests now all fail.
These are small enough that in the future we should consider creating them
dynamically. This would prevent us hard-coding a camera geometry
into the test but would require an explicit step for the calibration
files to ingest them with a dataId and associate them with
a validity range.
@timj timj merged commit eedf3d5 into main Jun 1, 2022
@timj timj deleted the tickets/DM-34919 branch June 1, 2022 04:38
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

2 participants