Follow-up to #137 (DET-10). The Asset rename Focus -> PropagationDistance and FocusDrive -> PropagationDistanceDrive shipped across the descriptor and docs via #167 (e39a22d8f5), but the integration scenario apps/api/tests/integration/scenarios/test_2bm_alignment_resolution.py was not part of that reconciliation and still carries the retired names and the pre-DET-10 semantics. This issue tracks closing that gap.
Part 1: mechanical reseed (retired names)
The test still registers and references the old Asset names:
apps/api/tests/integration/scenarios/test_2bm_alignment_resolution.py:179 registers "FocusDrive":185 registers "Focus":257 builds a Setpoint step on "channel": "Focus":22, :149-150, :337-343, :560, :577 and the prose throughout (focus-Z motor, _ASSET_FOCUS_Z_ID, FocusDrive controller) use the retired vocabulary
The descriptor and docs already use PropagationDistance / PropagationDistanceDrive (deployments/2-bm/beamline.yaml:382-390, docs/deployments/2-bm/procedures.md:15).
Part 2: settle the semantics first (do not bake in the old framing)
The reseed should not be a blind find-and-replace, because the test also asserts the wrong physics that DET-10 corrected:
:9 / :49 frame 2bmbAERO:m1 as "the Optique Peter focus-Z motor (the lens-to-scintillator distance)" and run a focus-peak search on it.- DET-10 established
2bmbAERO:m1 is the sample-to-detector propagation-distance rail, not a focus motor; real per-objective focus is the separate, currently unmodelled 2bmb:m2/m3/m4 (MCTOptics-owned, see DET-2 / docs/deployments/2-bm/equipment/microscope.md:97).
procedures.md:15 now points resolution_alignment at PropagationDistance.
Open question this issue must resolve: does resolution_alignment genuinely drive the propagation-distance rail (so the test's "focus-peak" framing is just mislabeled and the search target is correct), or should the scenario be remodelled around the real focus motors? Decide before reseeding so the rename does not lock in an unsettled answer.
References
Follow-up to #137 (DET-10). The Asset rename
Focus->PropagationDistanceandFocusDrive->PropagationDistanceDriveshipped across the descriptor and docs via #167 (e39a22d8f5), but the integration scenarioapps/api/tests/integration/scenarios/test_2bm_alignment_resolution.pywas not part of that reconciliation and still carries the retired names and the pre-DET-10 semantics. This issue tracks closing that gap.Part 1: mechanical reseed (retired names)
The test still registers and references the old Asset names:
apps/api/tests/integration/scenarios/test_2bm_alignment_resolution.py:179registers"FocusDrive":185registers"Focus":257builds a Setpoint step on"channel": "Focus":22,:149-150,:337-343,:560,:577and the prose throughout (focus-Z motor,_ASSET_FOCUS_Z_ID,FocusDrivecontroller) use the retired vocabularyThe descriptor and docs already use
PropagationDistance/PropagationDistanceDrive(deployments/2-bm/beamline.yaml:382-390,docs/deployments/2-bm/procedures.md:15).Part 2: settle the semantics first (do not bake in the old framing)
The reseed should not be a blind find-and-replace, because the test also asserts the wrong physics that DET-10 corrected:
:9/:49frame2bmbAERO:m1as "the Optique Peter focus-Z motor (the lens-to-scintillator distance)" and run a focus-peak search on it.2bmbAERO:m1is the sample-to-detector propagation-distance rail, not a focus motor; real per-objective focus is the separate, currently unmodelled2bmb:m2/m3/m4(MCTOptics-owned, see DET-2 /docs/deployments/2-bm/equipment/microscope.md:97).procedures.md:15now pointsresolution_alignmentatPropagationDistance.Open question this issue must resolve: does
resolution_alignmentgenuinely drive the propagation-distance rail (so the test's "focus-peak" framing is just mislabeled and the search target is correct), or should the scenario be remodelled around the real focus motors? Decide before reseeding so the rename does not lock in an unsettled answer.References
e39a22d8f5)deployments/2-bm/beamline.yaml:382-390,docs/deployments/2-bm/procedures.md:15,docs/deployments/2-bm/equipment/microscope.md:97,99project_2bm_optical_table_alignment.md(Reconciliation section)