Materialize the Diffractometer Assembly at four more beamlines (Diamond + ESRF)#544
Merged
Merged
Conversation
…nd + ESRF) Extends the catalog Diffractometer blueprint from the hard X-ray six-circle it was earned on (4-ID + 8-ID) and the SwissFEL platforms to four further independent bindings from real descriptor data: Diamond i06 (diffraction- dichroism), ESRF ID32 (E4CH RIXS), Diamond i10 (RASOR), and Diamond i19 (Newport kappa four-circle). Each binds a goniometer + reciprocal-space PseudoAxis, with the detector arm folded into the goniometer circle set (detector_arm at count 0, as at Bernina GPS). Proves the one composition contract spans soft X-ray resonant-scattering and kappa geometries, not just the six-circle it started on. The RotaryStage detector_arm Family is defined so the blueprint can reference it even where no arm Asset is bound; a Family is a federation-shared device class, so defining it does not assert the beamline owns a RotaryStage device. Co-Authored-By: Claude <noreply@anthropic.com>
Coverage report
This PR does not seem to contain any modification to coverable code. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Extends the catalog
DiffractometerAssembly from 3 facility bindings to 7, all from real descriptor data (DIFF-1). Four new per-deployment scenarios:test_i06_diffractometer_setup.py) - diffraction-dichroism circlestest_id32_diffractometer_setup.py) - BLISS DiffE4CH four-circle RIXStest_i10_diffractometer_setup.py) - RASOR resonant-scatteringtest_i19_diffractometer_setup.py) - Newport kappa four-circleEach binds a
Diffractometergoniometer + aReciprocalSpacePseudoAxis (both named in the descriptor and DIFF-tagged). The detector arm is folded into the goniometer circle set in each descriptor rather than modelled as a separate RotaryStage Asset, so theZeroOrMoredetector_armslot binds at count 0 (as at Bernina GPS).Why
The blueprint was earned on the hard X-ray six-circle (4-ID + 8-ID). These bindings prove the one composition contract spans soft X-ray resonant-scattering/dichroism instruments and kappa geometry too, not just the six-circle it started on, across two more facilities (Diamond + ESRF). Nothing fabricated: every Asset maps to a named, DIFF-tagged device in each
beamline.yaml.Note: the RotaryStage detector_arm Family is defined in each scenario so the blueprint can reference it even where no arm Asset is bound. A Family is a federation-shared device class, so defining it does not assert the beamline owns a RotaryStage device.
Test plan
ruff check+ruff formatclean; pre-commit pyright passes🤖 Generated with Claude Code