Move the 93 non-pilot beamline/site descriptors to xmap/descriptors

apps/api/tests/architecture/test_bleps_binding_is_read_only.py

@@ -118,9 +118,14 @@ def test_the_descriptor_scan_reads_files() -> None:
     This is the check that was missing when `_descriptor_files()` pointed
     at a directory that does not exist. Asserting on the roster alone said
     nothing about whether anything was ever opened.
+
+    deployments/ carries just 2-bm/beamline.yaml and aps/site.yaml today
+    (the further 93 descriptors moved to the private xmap/descriptors repo,
+    a presentation and vocabulary-testing move unrelated to this safety
+    posture check, which must keep scanning whatever cora actually carries).
     """
     found = _descriptor_files()
-    assert len(found) > 50, f"expected the deployments tree, found {len(found)} files"
+    assert len(found) >= 2, f"expected at least 2-bm + aps, found {len(found)} files"
     assert any(p.parent.name == "2-bm" for p in found)
 
 

apps/api/tests/integration/scenarios/test_bernina_diffractometer_setup.py

@@ -10,7 +10,7 @@
 end-to-end against Postgres. The blueprint was earned across 4-ID + 8-ID and
 graduated to the catalog; this scenario proves it composes at a non-APS facility
 from the assets Bernina's deployment descriptor actually carries
-(`deployments/bernina/beamline.yaml`, DIFF-1), rather than re-modelling the
+(`bernina/beamline.yaml` in the private xmap/descriptors repo, DIFF-1), rather than re-modelling the
 sample circles per platform.
 
 Bernina runs two independent diffractometer platforms (eco gps + eco xrd), so
@@ -83,7 +83,7 @@
 _CAP_PSEUDO_AXIS_ID = family_stream_id(FamilyName("PseudoAxis"))
 
 # The five diffractometer constituent Assets (scenario-supplied ids), mirroring
-# the named devices in deployments/bernina/beamline.yaml. GPS carries a goniometer
+# the named devices in bernina/beamline.yaml (now in xmap/descriptors). GPS carries a goniometer
 # + reciprocal-space (no modelled detector arm); XRD carries all three.
 _ASSET_GPS_GONIOMETER_ID = UUID("01900000-0000-7000-8000-000000be0a11")
 _ASSET_GPS_RECIPROCAL_SPACE_ID = UUID("01900000-0000-7000-8000-000000be0a21")

apps/api/tests/integration/scenarios/test_cdi_kb_mirror_setup.py

@@ -8,7 +8,7 @@
 Materializes CDI's Kirkpatrick-Baez nanofocusing mirror pair as the FIRST binding
 of the catalog KirkpatrickBaez Assembly (which shipped with zero Fixtures),
 end-to-end against Postgres, from the assets CDI's deployment descriptor carries
-(`deployments/cdi/beamline.yaml`, KB-1).
+(`cdi/beamline.yaml` in the private xmap/descriptors repo, KB-1).
 
 CDI's descriptor collapses the pair into ONE `KBMirror` Mirror Asset, but its note
 names both physical mirrors with their real PVs: a vertical VKB at `Mir:KBv` and a
@@ -70,7 +70,7 @@
 _CAP_MIRROR_ID = family_stream_id(FamilyName("Mirror"))
 
 # The two KB mirror Assets (scenario-supplied ids), split from the collapsed
-# `KBMirror` device in deployments/cdi/beamline.yaml per its note (Mir:KBv +
+# `KBMirror` device in cdi/beamline.yaml (now in xmap/descriptors) per its note (Mir:KBv +
 # Mir:KBh) and the catalog KirkpatrickBaez split-on-materialize sanction.
 _ASSET_VKB_ID = UUID("01900000-0000-7000-8000-000000cd0a11")
 _ASSET_HKB_ID = UUID("01900000-0000-7000-8000-000000cd0a21")

apps/api/tests/integration/scenarios/test_cristallina_diffractometer_setup.py

@@ -8,7 +8,7 @@
 Materializes Cristallina's DM1 diffractometer as a THIRD independent binding of
 the Assembly(Diffractometer) blueprint (after 8-ID and Bernina), end-to-end
 against Postgres, from the assets Cristallina's deployment descriptor actually
-carries (`deployments/cristallina/beamline.yaml`, DIFF-1).
+carries (`cristallina/beamline.yaml` in the private xmap/descriptors repo, DIFF-1).
 
 Cristallina instantiates two diffractometer platforms in slic (DM1 + DM2), but
 only DM1 is materializable from the descriptor:
@@ -78,7 +78,7 @@
 _CAP_PSEUDO_AXIS_ID = family_stream_id(FamilyName("PseudoAxis"))
 
 # The three DM1 constituent Assets (scenario-supplied ids), mirroring the named
-# devices in deployments/cristallina/beamline.yaml. DM2 is not materialized
+# devices in cristallina/beamline.yaml (now in xmap/descriptors). DM2 is not materialized
 # (goniometer-only, DISABLED-1, no reciprocal-space Asset; see module docstring).
 _ASSET_DM1_GONIOMETER_ID = UUID("01900000-0000-7000-8000-000000ca0a11")
 _ASSET_DM1_DETECTOR_ARM_ID = UUID("01900000-0000-7000-8000-000000ca0a21")

apps/api/tests/integration/scenarios/test_i06_diffractometer_setup.py

@@ -7,7 +7,8 @@
 
 Materializes Diamond i06's diffraction-dichroism diffractometer as a binding of
 the catalog Diffractometer Assembly, end-to-end against Postgres, from the assets
-i06's deployment descriptor carries (`deployments/i06/beamline.yaml`, DIFF-1).
+i06's deployment descriptor carries (`i06/beamline.yaml` in the private
+xmap/descriptors repo, DIFF-1).
 
 This extends the blueprint beyond the hard X-ray six-circle it was earned on
 (4-ID + 8-ID) and the SwissFEL platforms (Bernina + Cristallina) to a soft X-ray
@@ -73,7 +74,7 @@
 _CAP_PSEUDO_AXIS_ID = family_stream_id(FamilyName("PseudoAxis"))
 
 # The two constituent Assets (scenario-supplied ids), mirroring the named devices
-# in deployments/i06/beamline.yaml.
+# in i06/beamline.yaml (now in xmap/descriptors).
 _ASSET_GONIOMETER_ID = UUID("01900000-0000-7000-8000-000000060a11")
 _ASSET_RECIPROCAL_SPACE_ID = UUID("01900000-0000-7000-8000-000000060a21")
 

apps/api/tests/integration/scenarios/test_i10_diffractometer_setup.py

@@ -8,7 +8,7 @@
 Materializes Diamond i10's RASOR sample diffractometer (two-theta scattering arm,
 sample theta / chi, chamber X, alpha) as a binding of the catalog Diffractometer
 Assembly, end-to-end against Postgres, from the assets i10's deployment descriptor
-carries (`deployments/i10/beamline.yaml`, DIFF-1).
+carries (`i10/beamline.yaml` in the private xmap/descriptors repo, DIFF-1).
 
 This extends the blueprint beyond the hard X-ray six-circle it was earned on
 (4-ID + 8-ID) and the SwissFEL platforms (Bernina + Cristallina) to a soft X-ray
@@ -74,7 +74,7 @@
 _CAP_PSEUDO_AXIS_ID = family_stream_id(FamilyName("PseudoAxis"))
 
 # The two constituent Assets (scenario-supplied ids), mirroring the named devices
-# in deployments/i10/beamline.yaml.
+# in i10/beamline.yaml (now in xmap/descriptors).
 _ASSET_GONIOMETER_ID = UUID("01900000-0000-7000-8000-000000100a11")
 _ASSET_RECIPROCAL_SPACE_ID = UUID("01900000-0000-7000-8000-000000100a21")
 

apps/api/tests/integration/scenarios/test_i19_diffractometer_setup.py

@@ -8,7 +8,7 @@
 Materializes Diamond i19's Newport kappa four-circle diffractometer (phi / omega /
 kappa sample circles + the 2THETA detector arm + det_z) as a binding of the catalog
 Diffractometer Assembly, end-to-end against Postgres, from the assets i19's
-deployment descriptor carries (`deployments/i19/beamline.yaml`, DIFF-1).
+deployment descriptor carries (`i19/beamline.yaml` in the private xmap/descriptors repo, DIFF-1).
 
 This is a fifth independent binding of the one blueprint (after 4-ID + 8-ID +
 Bernina + Cristallina), a hard X-ray kappa-geometry small-molecule instrument:
@@ -75,7 +75,7 @@
 _CAP_PSEUDO_AXIS_ID = family_stream_id(FamilyName("PseudoAxis"))
 
 # The two constituent Assets (scenario-supplied ids), mirroring the named devices
-# in deployments/i19/beamline.yaml.
+# in i19/beamline.yaml (now in xmap/descriptors).
 _ASSET_GONIOMETER_ID = UUID("01900000-0000-7000-8000-000000190a11")
 _ASSET_RECIPROCAL_SPACE_ID = UUID("01900000-0000-7000-8000-000000190a21")
 

apps/api/tests/integration/scenarios/test_id32_diffractometer_setup.py

@@ -8,7 +8,7 @@
 Materializes ESRF ID32's four-circle sample diffractometer (BLISS DiffE4CH, E4CH
 geometry) as a binding of the catalog Diffractometer Assembly, end-to-end against
 Postgres, from the assets ID32's deployment descriptor carries
-(`deployments/id32/beamline.yaml`, DIFF-1).
+(`id32/beamline.yaml` in the private xmap/descriptors repo, DIFF-1).
 
 This extends the blueprint beyond the hard X-ray six-circle it was earned on
 (4-ID + 8-ID) and the SwissFEL platforms (Bernina + Cristallina) to an ESRF soft
@@ -73,7 +73,7 @@
 _CAP_PSEUDO_AXIS_ID = family_stream_id(FamilyName("PseudoAxis"))
 
 # The two constituent Assets (scenario-supplied ids), mirroring the named devices
-# in deployments/id32/beamline.yaml.
+# in id32/beamline.yaml (now in xmap/descriptors).
 _ASSET_GONIOMETER_ID = UUID("01900000-0000-7000-8000-000000320a11")
 _ASSET_RECIPROCAL_SPACE_ID = UUID("01900000-0000-7000-8000-000000320a21")
 

apps/api/tests/integration/scenarios/test_ios_kb_mirror_setup.py

@@ -7,7 +7,8 @@
 
 Materializes IOS's Kirkpatrick-Baez focusing mirror pair as a binding of the
 catalog KirkpatrickBaez Assembly, end-to-end against Postgres, from the assets
-IOS's deployment descriptor carries (`deployments/ios/beamline.yaml`, OPT-1).
+IOS's deployment descriptor carries (`ios/beamline.yaml` in the private
+xmap/descriptors repo, OPT-1).
 
 Unlike CDI (which collapses its KB pair into one Asset that the Fixture splits),
 IOS's descriptor already models the two mirrors as distinct Mirror Assets, so the
@@ -62,7 +63,7 @@
 _CAP_MIRROR_ID = family_stream_id(FamilyName("Mirror"))
 
 # The two KB mirror Assets (scenario-supplied ids), mirroring the distinct named
-# devices in deployments/ios/beamline.yaml.
+# devices in ios/beamline.yaml (now in xmap/descriptors).
 _ASSET_VKB_ID = UUID("01900000-0000-7000-8000-000000e50a11")
 _ASSET_HKB_ID = UUID("01900000-0000-7000-8000-000000e50a21")