BEC AutoUpdate class is not executed, but fixed A3200 status monitoring

Added collimator and 2D auto updates
2025-06-16 13:44:46 +02:00 · 2025-06-16 11:52:02 +02:00
20 changed files with 873 additions and 2397 deletions
@@ -2,7 +2,7 @@
 # It is needed to track the repo template version, and editing may break things.
 # This file will be overwritten by copier on template updates.

-_commit: v1.2.8
+_commit: v1.0.0
 _src_path: https://github.com/bec-project/plugin_copier_template.git
 make_commit: false
 project_name: pxiii_bec
@@ -1,102 +0,0 @@
-name: CI for pxiii_bec
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-    inputs:
-      BEC_WIDGETS_BRANCH:
-        description: "Branch of BEC Widgets to install"
-        required: false
-        type: string
-        default: "main"
-      BEC_CORE_BRANCH:
-        description: "Branch of BEC Core to install"
-        required: false
-        type: string
-        default: "main"
-      OPHYD_DEVICES_BRANCH:
-        description: "Branch of Ophyd Devices to install"
-        required: false
-        type: string
-        default: "main"
-      BEC_PLUGIN_REPO_BRANCH:
-        description: "Branch of the BEC Plugin Repository to install"
-        required: false
-        type: string
-        default: "main"
-      PYTHON_VERSION:
-        description: "Python version to use"
-        required: false
-        type: string
-        default: "3.12"
-
-permissions:
-  pull-requests: write
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      QTWEBENGINE_DISABLE_SANDBOX: 1
-      QT_QPA_PLATFORM: "offscreen"
-
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "${{ inputs.PYTHON_VERSION || '3.12' }}"
-
-      - name: Checkout BEC Plugin Repository
-        uses: actions/checkout@v4
-        with:
-          repository: bec/pxiii_bec
-          ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
-          path: ./pxiii_bec
-
-      - name: Lint for merge conflicts from template updates
-        shell: bash
-        # Find all Copier conflicts except this line
-        run: '! grep -r "<<<<<<< before updating" | grep -v "grep -r \"<<<<<<< before updating"'
-
-      - name: Checkout BEC Core
-        uses: actions/checkout@v4
-        with:
-          repository: bec/bec
-          ref: "${{ inputs.BEC_CORE_BRANCH || 'main' }}"
-          path: ./bec
-
-      - name: Checkout Ophyd Devices
-        uses: actions/checkout@v4
-        with:
-          repository: bec/ophyd_devices
-          ref: "${{ inputs.OPHYD_DEVICES_BRANCH || 'main' }}"
-          path: ./ophyd_devices
-
-      - name: Checkout BEC Widgets
-        uses: actions/checkout@v4
-        with:
-          repository: bec/bec_widgets
-          ref: "${{ inputs.BEC_WIDGETS_BRANCH || 'main' }}"
-          path: ./bec_widgets
-
-      - name: Install dependencies
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgl1 libegl1 x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb
-          sudo apt-get -y install libnss3 libxdamage1 libasound2t64 libatomic1 libxcursor1
-
-      - name: Install Python dependencies
-        shell: bash
-        run: |
-          pip install uv
-          uv pip install --system -e ./ophyd_devices
-          uv pip install --system -e ./bec/bec_lib[dev]
-          uv pip install --system -e ./bec/bec_ipython_client
-          uv pip install --system -e ./bec/bec_server[dev]
-          uv pip install --system -e ./bec_widgets[dev,pyside6]
-          uv pip install --system -e ./pxiii_bec
-
-      - name: Run Pytest with Coverage
-        id: coverage
-        run: pytest --random-order --cov=./pxiii_bec --cov-config=./pxiii_bec/pyproject.toml --cov-branch --cov-report=xml --no-cov-on-fail ./pxiii_bec/tests/ || test $? -eq 5
@@ -1,62 +0,0 @@
-name: Create template upgrade PR for pxiii_bec
-on:
-  workflow_dispatch:
-
-permissions:
-  pull-requests: write
-
-jobs:
-  create_update_branch_and_pr:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-    
-      - name: Install tools
-        run: |
-          pip install copier PySide6
-
-      - name: Checkout
-        uses: actions/checkout@v4
-    
-      - name: Perform update
-        run: |
-          git config --global user.email "bec_ci_staging@psi.ch"
-          git config --global user.name "BEC automated CI"
-
-          branch="chore/update-template-$(python -m uuid)"
-          echo "switching to branch $branch"
-          git checkout -b $branch
-
-          echo "Running copier update..."
-          output="$(copier update --trust --defaults --conflict inline 2>&1)"
-          echo "$output"
-          msg="$(printf '%s\n' "$output" | head -n 1)"
-
-          if ! grep -q "make_commit: true" .copier-answers.yml ; then
-            echo "Autocommit not made, committing..."
-            git add -A
-            git commit -a -m "$msg"
-          fi
-
-          if diff-index --quiet HEAD ; then
-            echo "No changes detected"
-            exit 0
-          fi
-
-          git push -u origin $branch
-          curl -X POST "https://gitea.psi.ch/api/v1/repos/${{ gitea.repository }}/pulls" \
-            -H "Authorization: token ${{ secrets.CI_REPO_WRITE }}" \
-            -H "Content-Type: application/json" \
-            -d "{
-                  \"title\": \"Template: $(echo $msg)\",
-                  \"body\": \"This PR was created by Gitea Actions\",
-                  \"head\": \"$(echo $branch)\",
-                  \"base\": \"main\"
-                }"
@@ -0,0 +1,7 @@
+include:
+- file: /templates/plugin-repo-template.yml
+  inputs:
+    name: pxiii_bec
+    target: pxiii_bec
+    branch: $CHILD_PIPELINE_BRANCH
+  project: bec/awi_utils
@@ -1,14 +1,10 @@
 """
 Pre-startup script for BEC client. This script is executed before the BEC client
-is started. It can be used to add additional command line arguments.
+is started. It can be used to add additional command line arguments. 
 """

-import os
-
 from bec_lib.service_config import ServiceConfig

-import pxiii_bec
-

 def extend_command_line_args(parser):
    """
@@ -22,11 +18,6 @@ def extend_command_line_args(parser):

 def get_config() -> ServiceConfig:
    """
-    Create and return the ServiceConfig for the plugin repository
+    Create and return the service configuration.
    """
-    deployment_path = os.path.dirname(os.path.dirname(os.path.dirname(pxiii_bec.__file__)))
-    files = os.listdir(deployment_path)
-    if "bec_config.yaml" in files:
-        return ServiceConfig(config_path=os.path.join(deployment_path, "bec_config.yaml"))
-    else:
-        return ServiceConfig(redis={"host": "localhost", "port": 6379})
+    return ServiceConfig(redis={"host": "x06da-bec-001", "port": 6379})
@@ -28,30 +28,49 @@ class PlotUpdate(AutoUpdates):
        Args:
            msg (ScanStatusMessage): The scan status message.
        """
-        if msg.scan_name == "line_scan" and msg.scan_report_devices:
-            return self.simple_line_scan(msg)
-        if msg.scan_name == "grid_scan" and msg.scan_report_devices:
-            return self.simple_grid_scan(msg)
-        
-        dev_x = msg.scan_report_devices[0]
-        if "kwargs" in msg.request_inputs:
-            dev_y = msg.request_inputs["kwargs"].get("plot", None)
-            if dev_y is not None:
-                # Set the dock to the waveform widget
-                wf = self.set_dock_to_widget("Waveform")

-                # Clear the waveform widget and plot the data
-                wf.clear_all()
-                wf.plot(
-                    x_name=dev_x,
-                    y_name=dev_y,
-                    label=f"Scan {msg.info.scan_number} - {dev_y}",
-                    title=f"Scan {msg.info.scan_number}",
-                    x_label=dev_x,
-                    y_label=dev_y,
-                )
-        elif msg.scan_report_devices:
-            return self.best_effort(msg)
+        # if "kwargs" in msg.request_inputs:
+        #     dev_plt = msg.request_inputs["kwargs"].get("plot", None)
+
+        #     if dev_plt is not None:
+        #         # Handle depending on scan dimension
+        #         if len(msg.scan_report_devices) == 1:
+        #             dev_x = msg.scan_report_devices[0]
+        #             # Set the dock to the waveform widget
+        #             wf = self.set_dock_to_widget("Waveform")
+        #             # Clear the waveform widget and plot the data
+        #             wf.clear_all()
+        #             wf.plot(
+        #                 x_name=dev_x,
+        #                 y_name=dev_plt,
+        #                 label=f"Scan {msg.info.scan_number} - {dev_plt}",
+        #                 title=f"Scan {msg.info.scan_number}",
+        #                 x_label=dev_x,
+        #                 y_label=dev_plt,
+        #             )
+        #         if len(msg.scan_report_devices) == 2:
+        #             dev_x = msg.scan_report_devices[0]
+        #             dev_y = msg.scan_report_devices[1]
+        #             # Set the dock to the waveform widget
+        #             wf = self.set_dock_to_widget("Waveform")
+        #             # Clear the waveform widget and plot the data
+        #             wf.clear_all()
+        #             wf.plot(
+        #                 x_name=dev_x,
+        #                 y_name=dev_y,
+        #                 z_name=dev_plt,
+        #                 label=f"Scan {msg.info.scan_number} - {dev_plt}",
+        #                 title=f"Scan {msg.info.scan_number} - {dev_plt}",
+        #                 x_label=dev_x,
+        #                 y_label=dev_y,
+        #                 z_label=dev_plt,
+        #             )
+        # elif msg.scan_name == "line_scan" and msg.scan_report_devices:
+        #     return self.simple_line_scan(msg)
+        # elif msg.scan_name == "grid_scan" and msg.scan_report_devices:
+        #     return self.simple_grid_scan(msg)
+        # elif msg.scan_report_devices:
+        #     return self.best_effort(msg)
        return None

    def on_scan_closed(self, msg: ScanStatusMessage) -> None:
@@ -1,62 +0,0 @@
-import csv
-import json
-
-INPUT_CSV = "pxiii-devices-new.csv"
-OUTPUT_YAML = "pxiii-devices-new.yaml"
-
-
-def str_to_bool(val):
-    return str(val).strip().lower() in ["yes", "true", "1"]
-
-
-with open(INPUT_CSV, newline="") as csvfile:
-    reader = csv.DictReader(csvfile)
-
-    with open(OUTPUT_YAML, "w") as yamlfile:
-        for row in reader:
-            include = row["include"]
-            name = row["name"]
-            desc = row["description"]
-            device_class = row["deviceClass"]
-            pv = row["PV"]
-            readout_priority = row["readoutPriority"]
-            tag = row["tag"]
-            read_only = str_to_bool(row["readOnly"])
-            user_param = row.get("userParameter", "").strip()
-
-            if str(include).strip().lower() != "yes":
-                continue
-
-            yamlfile.write(f"{name}:\n")
-            yamlfile.write(f"  description: {desc}\n")
-            yamlfile.write(f"  deviceClass: ophyd.Epics{device_class}\n")
-
-            if device_class == "Motor":
-                yamlfile.write(f"  deviceConfig: {{prefix: '{pv}'}}\n")
-            else:
-                yamlfile.write(
-                    f"  deviceConfig: {{read_pv: '{pv}', auto_monitor: true}}\n"
-                )
-
-            yamlfile.write("  onFailure: buffer\n")
-            yamlfile.write("  enabled: True\n")
-            yamlfile.write(f"  readoutPriority: {readout_priority}\n")
-            yamlfile.write("  deviceTags:\n")
-            yamlfile.write(f"    - {tag}\n")
-            yamlfile.write(f"  readOnly: {read_only}\n")
-            yamlfile.write("  softwareTrigger: false\n")
-
-            # Only add userParameter for Motors if present
-            # if device_class == "Motor" and user_param:
-            if user_param:
-                try:
-                    parsed = json.loads(user_param)
-                    yamlfile.write("  userParameter:\n")
-                    for k, v in parsed.items():
-                        yamlfile.write(f"    {k}: {v}\n")
-                except json.JSONDecodeError:
-                    yamlfile.write(f"  userParameter: {user_param}\n")
-
-            yamlfile.write("\n")
-
-print(f"YAML written to {OUTPUT_YAML}")
@@ -1,169 +0,0 @@
-name,description,deviceClass,PV,readoutPriority,tag,readOnly,include,userParameter,
-sls_current,SLS current,SignalRO,ARS07-DPCT-0100:CURR,monitored,SLS,yes,yes,,
-fe_bpm1,FE XBPM Signal 1,SignalRO,X10SA-FE-XBPM1:Current1:MeanValue_RBV,monitored,bpm,yes,yes,,
-fe_bpm2,FE XBPM Signal 2,SignalRO,X10SA-FE-XBPM1:Current2:MeanValue_RBV,monitored,bpm,yes,yes,,
-fe_bpm3,FE XBPM Signal 3,SignalRO,X10SA-FE-XBPM1:Current3:MeanValue_RBV,monitored,bpm,yes,yes,,
-fe_bpm4,FE XBPM Signal 4,SignalRO,X10SA-FE-XBPM1:Current4:MeanValue_RBV,monitored,bpm,yes,yes,,
-fe_bpmsum,FE XBPM Summed,SignalRO,X10SA-FE-XBPM1:SumAll:MeanValue_RBV,monitored,bpm,yes,yes,,
-fe_bpm_x,FE BPM X,Motor,X10SA-FE-XBPM1:TRX,baseline,fe,no,yes,,
-fe_bpm_y,FE BPM Y,Motor,X10SA-FE-XBPM1:TRY,baseline,fe,no,yes,,
-fe_sl_xr,FE Slit X Ring,Motor,X10SA-FE-SL1:TRXR,baseline,fe,no,yes,,
-fe_sl_yt,FE Slit Y top,Motor,X10SA-FE-SL1:TRYT,baseline,fe,no,yes,,
-fe_sl_xw,FE Slit X Wall,Motor,X10SA-FE-SL1:TRXW,baseline,fe,no,yes,,
-fe_sl_yb,FE SlitY Bottom,Motor,X10SA-FE-SL1:TRYB,baseline,fe,no,yes,,
-fe_sl_xcen,FE Slit X Centre,Motor,X10SA-FE-SL1:CENTERX,baseline,fe,no,yes,,
-fe_sl_xsize,FE Slit X Size,Motor,X10SA-FE-SL1:SIZEX,baseline,fe,no,yes,,
-fe_sl_ycen,FE Slit Y Centre,Motor,X10SA-FE-SL1:CENTERY,baseline,fe,no,yes,,
-fe_sl_ysize,FE Slit Y Size,Motor,X10SA-FE-SL1:SIZEY,baseline,fe,no,yes,,
-bsf_bpm1,BSF BPM Signal 1,SignalRO,X10SA-OP-BSFBPM:SIGNAL1,monitored,bpm,yes,no,,
-bsf_bpm2,BSF BPM Signal 2,SignalRO,X10SA-OP-BSFBPM:SIGNAL2,monitored,bpm,yes,no,,
-bsf_bpm3,BSF BPM Signal 3,SignalRO,X10SA-OP-BSFBPM:SIGNAL3,monitored,bpm,yes,no,,
-bsf_bpm4,BSF BPM Signal 4,SignalRO,X10SA-OP-BSFBPM:SIGNAL4,monitored,bpm,yes,no,,
-bsf_bpmsum,BSF BPM Summed,SignalRO,X10SA-OP-BSFBPM:SUM,monitored,bpm,yes,no,,
-bsf_sl_xw,BSF slit outboard,Motor,X10SA-OP-BSFSLH:TRXW,baseline,bsf,no,yes,,
-bsf_sl_xr,BSF slit inboard,Motor,X10SA-OP-BSFSLH:TRXR,baseline,bsf,no,yes,,
-bsf_sl_yt,BSF slit top,Motor,X10SA-OP-BSFSLV:TRYT,baseline,bsf,no,yes,,
-bsf_sl_yb,BSF slit bottom,Motor,X10SA-OP-BSFSLV:TRYB,baseline,bsf,no,yes,,
-bsf_sl_xcen,BSF X centre,Motor,X10SA-OP-BSFSLH:CENTER,baseline,bsf,no,yes,,
-bsf_sl_xsize,BSF X size,Motor,X10SA-OP-BSFSLH:SIZE,baseline,bsf,no,yes,,
-bsf_sl_ycen,BSF Y centre,Motor,X10SA-OP-BSFSLV:CENTER,baseline,bsf,no,yes,,
-bsf_sl_ysize,BSF Y size,Motor,X10SA-OP-BSFSLV:SIZE,baseline,bsf,no,yes,,
-bsf_f1_y,BSF Filter 1 Y,Motor,X10SA-OP-BSFFI1:TRY,baseline,bsf,no,yes,,
-bsf_f2_y,BSF Filter 2 Y,Motor,X10SA-OP-BSFFI2:TRY,baseline,bsf,no,yes,,
-dcm_bragg,DCM Bragg angle,Motor,X10SA-OP-DCM:ROTY,baseline,dcm,no,yes,,
-dcm_x,DCM lateral,Motor,X10SA-OP-DCM:TRX,baseline,dcm,no,yes,,
-dcm_perp,DCM Perp,Motor,X10SA-OP-DCM:TRX-CR2,baseline,dcm,no,yes,,
-dcm_pitch,DCM 2nd crystal pitch,Motor,X10SA-OP-DCM:ROTY-CR2-PITCH,baseline,dcm,no,yes,,
-dcm_fpitch,DCM 2nd crystal fine pitch,Motor,X10SA-OP-DCM:ROTY-CR2-FINEPITCH,baseline,dcm,no,yes,,
-dcm_froll,DCM 2nd crystal fine roll,Motor,X10SA-OP-DCM:ROTZ-CR2-FINEROLL,baseline,dcm,no,yes,,
-lu_bpm1,LU BPM Signal 1,SignalRO,X10SA-OP-LUBPM:Current1:MeanValue_RBV,monitored,bpm,yes,yes,,
-lu_bpm2,LU BPM Signal 2,SignalRO,X10SA-OP-LUBPM:Current2:MeanValue_RBV,monitored,bpm,yes,yes,,
-lu_bpm3,LU BPM Signal 3,SignalRO,X10SA-OP-LUBPM:Current3:MeanValue_RBV,monitored,bpm,yes,yes,,
-lu_bpm4,LU BPM Signal 4,SignalRO,X10SA-OP-LUBPM:Current4:MeanValue_RBV,monitored,bpm,yes,yes,,
-lu_bpmsum,LU BPM Summed,SignalRO,X10SA-OP-LUBPM:SumAll:MeanValue_RBV,monitored,bpm,yes,yes,,
-lu_bpm_x,BPM2 X translation,Motor,X10SA-OP-LUBPM:TRX,baseline,lu,no,yes,,
-lu_bpm_y,BPM2 Y translation,Motor,X10SA-OP-LUBPM:TRY,baseline,lu,no,yes,,
-lu_z1,Lens Z1 Motion,Motor,X10SA-OP-LUTRZ1:TRZ,baseline,lu,no,yes,,
-lu_z2,Lens Z2 Motion,Motor,X10SA-OP-LUTRZ2:TRZ,baseline,lu,no,yes,,
-lu_pod1_x,SmarPod1 X,Motor,X10SA-OP-LUPOD1:TRX1,baseline,lu,no,no,,
-lu_lens1_x2,Lenses1 X,Motor,X10SA-OP-LUPOD1:TRX2,baseline,lu,no,no,,
-lu_pod1_y,SmarPod1 Y,Motor,X10SA-OP-LUPOD1:TRY,baseline,lu,no,yes,,
-lu_pod1_z,SmarPod1 Z,Motor,X10SA-OP-LUPOD1:TRZ,baseline,lu,no,yes,,
-lu_pod1_rotx,SmarPod1 RX,Motor,X10SA-OP-LUPOD1:ROTX,baseline,lu,no,yes,,
-lu_pod1_roty,SmarPod1 RY,Motor,X10SA-OP-LUPOD1:ROTY,baseline,lu,no,yes,,
-lu_pod1_rotz,SmarPod1 RZ,Motor,X10SA-OP-LUPOD1:ROTZ,baseline,lu,no,yes,,
-lu_pod2_x,SmarPod2 X,Motor,X10SA-OP-LUPOD2:TRX1,baseline,lu,no,no,,
-lu_lens2_x2,Lenses2 X,Motor,X10SA-OP-LUPOD2:TRX2,baseline,lu,no,no,,
-lu_pod2_y,SmarPod2 Y,Motor,X10SA-OP-LUPOD2:TRY,baseline,lu,no,yes,,
-lu_pod2_z,SmarPod2 Z,Motor,X10SA-OP-LUPOD2:TRZ,baseline,lu,no,yes,,
-lu_pod2_rotx,SmarPod2 RX,Motor,X10SA-OP-LUPOD2:ROTX,baseline,lu,no,yes,,
-lu_pod2_roty,SmarPod2 RY,Motor,X10SA-OP-LUPOD2:ROTY,baseline,lu,no,yes,,
-lu_pod2_rotz,SmarPod2 RZ,Motor,X10SA-OP-LUPOD2:ROTZ,baseline,lu,no,yes,,
-ss_bpm1,SS BPM Signal 1,SignalRO,X10SA-ES-SSBPM:Current1:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm2,SS BPM Signal 2,SignalRO,X10SA-ES-SSBPM:Current2:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm3,SS BPM Signal 3,SignalRO,X10SA-ES-SSBPM:Current3:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm4,SS BPM Signal 4,SignalRO,X10SA-ES-SSBPM:Current4:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpmsum,SS BPM Summed,SignalRO,X10SA-ES-SSBPM:SumAll:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm_x,SS BPM X,Motor,X10SA-ES-SSBPM:TRX,baseline,ss,no,yes,,
-ss_bpm_y,SS BPM Y,Motor,X10SA-ES-SSBPM:TRY,baseline,ss,no,yes,,
-ss_f1_x,SS Filter 1 X,Motor,X10SA-ES-SSFI1:TRX,baseline,ss,no,yes,,
-ss_f2_x,SS Filter 2 X,Motor,X10SA-ES-SSFI2:TRX,baseline,ss,no,yes,,
-ss_f3_x,SS Filter 2 X,Motor,X10SA-ES-SSFI3:TRX,baseline,ss,no,yes,,
-ss_f4_x,SS Filter 4 X,Motor,X10SA-ES-SSFI4:TRX,baseline,ss,no,yes,,
-ss_sl_xw,SS slit wall,Motor,X10SA-ES-SSSLH:TRXW,baseline,ss,no,yes,,
-ss_sl_xr,SS slit ring,Motor,X10SA-ES-SSSLH:TRXR,baseline,ss,no,yes,,
-ss_sl_xcen,SS slit X centre,Motor,X10SA-ES-SSSLH:CENTER,baseline,ss,no,yes,,
-ss_sl_xsize,SS slit X size,Motor,X10SA-ES-SSSLH:SIZE,baseline,ss,no,yes,,
-ss_sl_yt,SS slit top,Motor,X10SA-ES-SSSLV:TRYT,baseline,ss,no,yes,,
-ss_sl_yb,SS slit bottom,Motor,X10SA-ES-SSSLV:TRYB,baseline,ss,no,yes,,
-ss_sl_ycen,SS slit Y centre,Motor,X10SA-ES-SSSLV:CENTER,baseline,ss,no,yes,,
-ss_sl_ysize,SS slit Y size,Motor,X10SA-ES-SSSLV:SIZE,baseline,ss,no,yes,,
-ss_xi_x,SS X-ray eye X,Motor,X10SA-ES-SSXI:TRX,baseline,ss,no,yes,"{""type"": multi-position,""in"": 7.5, ""out"": -2.1}",
-ss_xi_y,SS X-ray eye Y,Motor,X10SA-ES-SSXI:TRY,baseline,ss,no,yes,,
-ss_xicam_x,ss cam X,SignalRO,X10SA-ES-SSCAM:Stats5:CentroidX_RBV,baseline,ss,yes,yes,,
-ss_xicam_y,ss cam Y,SignalRO,X10SA-ES-SSCAM:Stats5:CentroidY_RBV,baseline,ss,yes,yes,,
-ss_xicam_max,ss cam max value,SignalRO,X10SA-ES-SSCAM:Stats5:MaxValue_RBV,monitored,ss,yes,yes,,
-ss_xicam_exp,ss camera exposure,Signal,X10SA-ES-SSCAM:cam1:AcquireTime,baseline,ss,no,yes,,
-ss_xicam_gain,ss camera gain,Signal,X10SA-ES-SSCAM:cam1:Gain,baseline,ss,no,yes,,
-ss_xicam_xsig,ss camera  x sigma,Signal,X10SA-ES-SSCAM:Stats5:SigmaX_RBV,baseline,ss,yes,yes,,
-ss_xicam_ysig,ss camera y sigma,Signal,X10SA-ES-SSCAM:Stats5:SigmaY_RBV,baseline,ss,yes,yes,,
-vfm_xu,VFM Upstream X,Motor,X10SA-ES-VFM:TRXU,baseline,vfm,no,yes,,
-vfm_xd,VFM Downstream X,Motor,X10SA-ES-VFM:TRXD,baseline,vfm,no,yes,,
-vfm_yur,VFM Upstream Ring Y,Motor,X10SA-ES-VFM:TRYUR,baseline,vfm,no,yes,,
-vfm_yw,VFM Wall Y,Motor,X10SA-ES-VFM:TRYW,baseline,vfm,no,yes,,
-vfm_ydr,VFM Downstream Ring Y,Motor,X10SA-ES-VFM:TRYDR,baseline,vfm,no,yes,,
-vfm_bu,VFM Upstream Bender,Motor,X10SA-ES-VFM:BNDU,baseline,vfm,no,yes,,
-vfm_bd,VFM Downstream Bender,Motor,X10SA-ES-VFM:BNDD,baseline,vfm,no,yes,,
-vfm_yaw,VFM Virtual Yaw,Motor,X10SA-ES-VFM:YAW,baseline,vfm,no,yes,,
-vfm_roll,VFM Virtual Roll,Motor,X10SA-ES-VFM:ROLL,baseline,vfm,no,yes,,
-vfm_pitch,VFM Virtual Pitch,Motor,X10SA-ES-VFM:PITCH,baseline,vfm,no,yes,,
-vfm_x,VFM Virtual X,Motor,X10SA-ES-VFM:TRX,baseline,vfm,no,yes,,
-vfm_y,VFM Virtual Y ,Motor,X10SA-ES-VFM:TRY,baseline,vfm,no,yes,,
-hfm_xu,HFM Upstream X,Motor,X10SA-ES-HFM:TRXU,baseline,hfm,no,yes,,
-hfm_xd,HFM Downstream X,Motor,X10SA-ES-HFM:TRXD,baseline,hfm,no,yes,,
-hfm_yuw,HFM Upstream Wall Y,Motor,X10SA-ES-HFM:TRYUW,baseline,hfm,no,yes,,
-hfm_yr,HFM Ring Y,Motor,X10SA-ES-HFM:TRYR,baseline,hfm,no,yes,,
-hfm_ydw,HFM Downstream Wall Y,Motor,X10SA-ES-HFM:TRYDW,baseline,hfm,no,yes,,
-hfm_bu,HFM Upstream Bender,Motor,X10SA-ES-HFM:BNDU,baseline,hfm,no,yes,,
-hfm_bd,HFM Downstream Bender,Motor,X10SA-ES-HFM:BNDD,baseline,hfm,no,yes,,
-hfm_yaw,HFM Virtual Yaw,Motor,X10SA-ES-HFM:YAW,baseline,hfm,no,yes,,
-hfm_roll,HFM Virtual Roll,Motor,X10SA-ES-HFM:ROLL,baseline,hfm,no,yes,,
-hfm_pitch,HFM Virtual Pitch,Motor,X10SA-ES-HFM:PITCH,baseline,hfm,no,yes,,
-hfm_x,HFM Virtual X,Motor,X10SA-ES-HFM:TRX,baseline,hfm,no,yes,,
-hfm_y,HFM Virtual Y ,Motor,X10SA-ES-HFM:TRY,baseline,hfm,no,yes,,
-bcu_bpm1,BCU BPM Signal 1 ,SignalRO,X10SA-ES-BCBPM:Current1:MeanValue_RBV,monitored,bpm,yes,yes,,
-bcu_bpm2,BCU BPM Signal 2,SignalRO,X10SA-ES-BCBPM:Current2:MeanValue_RBV,monitored,bpm,yes,yes,,
-bcu_bpm3,BCU BPM Signal 3,SignalRO,X10SA-ES-BCBPM:Current3:MeanValue_RBV,monitored,bpm,yes,yes,,
-bcu_bpm4,BCU BPM Signal 4,SignalRO,X10SA-ES-BCBPM:Current4:MeanValue_RBV,monitored,bpm,yes,yes,,
-bcu_bpmsum,BCU BPM Summed,SignalRO,X10SA-ES-BCBPM:SumAll:MeanValue_RBV,monitored,bpm,yes,yes,,
-bcu_bpm_x,BCU BPM X,Motor,X10SA-ES-BCBPM:TRX,baseline,bcu,no,yes,,
-bcu_bpm_y,BCU BPM Y ,Motor,X10SA-ES-BCBPM:TRY,baseline,bcu,no,yes,,
-bcu_sl_xw,BCU slit wall,Motor,X10SA-ES-BCSLH:TRXW,baseline,bcu,no,yes,,
-bcu_sl_xr,BCU slit ring,Motor,X10SA-ES-BCSLH:TRXR,baseline,bcu,no,yes,,
-bcu_sl_xcen,BCU slit X centre,Motor,X10SA-ES-BCSLH:CENTER,baseline,bcu,no,yes,,
-bcu_sl_xsize,BCU slit X size,Motor,X10SA-ES-BCSLH:SIZE,baseline,bcu,no,yes,,
-bcu_sl_yt,BCU slit top,Motor,X10SA-ES-BCSLV:TRYT,baseline,bcu,no,yes,,
-bcu_sl_yb,BCU slit bottom,Motor,X10SA-ES-BCSLV:TRYB,baseline,bcu,no,yes,,
-bcu_sl_ycen,BCU slit Y centre,Motor,X10SA-ES-BCSLV:CENTER,baseline,bcu,no,yes,,
-bcu_sl_ysize,BCU slit Y size,Motor,X10SA-ES-BCSLV:SIZE,baseline,bcu,no,yes,,
-xrf_pos,XRF det in/out,Signal,X10SA-ES-XRF:POS-SET,baseline,se,no,yes,"{""type"":positioner}",
-samcam_x,sample cam X ,SignalRO,X10SA-ES-MS:Stats5:CentroidX_RBV,baseline,scam,yes,yes,,
-samcam_xsig,sample cam X sigma,SignalRO,X10SA-ES-MS:Stats5:SigmaX_RBV,monitored,scam,yes,yes,,
-samcam_y,sample cam Y ,SignalRO,X10SA-ES-MS:Stats5:CentroidY_RBV,baseline,scam,yes,yes,,
-samcam_ysig,sample cam Y sigma,SignalRO,X10SA-ES-MS:Stats5:SigmaY_RBV,monitored,scam,yes,yes,,
-samcam_max,sample cam max value,SignalRO,X10SA-ES-MS:Stats5:MaxValue_RBV,monitored,scam,yes,yes,,
-samcam_exp,sample cam exp time,Signal,X10SA-ES-MS:cam1:AcquireTime,baseline,scam,no,yes,,
-samcam_gain,sample cam gain,Signal,X10SA-ES-MS:cam1:Gain,baseline,scam,no,yes,,
-scam_zoom,Sample cam zoom,Motor,X10SA-ES-MS:ZOOM,baseline,scam,no,yes,,
-fl_bright,Frontlight brightness,Signal,X10SA-ES-FL:SET,baseline,se,no,yes,,
-coll_x,Collimator X,Motor,X10SA-ES-COL:TRX,baseline,se,no,yes,, 
-coll_y,Collimator Y,Motor,X10SA-ES-COL:TRY,baseline,se,no,yes,"{""type"": multi-position, ""in"": 41.5, ""out"": 20.0, ""park"": 0,""tol"":0.05}",
-diag_y,Scintillator/diode Y,Motor,X10SA-ES-SCL:TRY,baseline,se,no,yes,"{""type"": multi-position, ""scint"": 38.62, ""i1"": 44.0, ""out"": 20.0,""park"": 0,""tol"":0.3}",
-diag_z,Scintillator/diode Z,Motor,X10SA-ES-SCL:TRZ,baseline,se,no,yes,,
-i1,i1 diode reading,SignalRO,X10SA-ES-SCLDI:READOUT,monitored,bpm,yes,yes,,
-bl_pos,Backlight positioner,Signal,X10SA-ES-BL:POS-SET,baseline,se,no,yes,"{""type"":positioner}",
-bl_bright,Backlight brightness,Signal,X10SA-ES-BL:SET,baseline,se,no,yes,,
-bs_x,Beamstop X,Motor,X10SA-ES-BS:TRX,baseline,se,no,yes,,
-bs_y,Beamstop Y,Motor,X10SA-ES-BS:TRY,baseline,se,no,yes,,
-bs_z,Beamstop Z,Motor,X10SA-ES-BS:TRZ,baseline,se,no,yes,"{""type"": guarded, ""min"": 13, ""samp"": 15, ""work_min"": 20, ""safe"": 41, ""max_blin"": 42, ""max_blout"": 70}",
-bs_pos,Beamstop positioner,Signal,X10SA-ES-BS:POS-SET,baseline,se,no,yes,"{""type"":positioner}",
-gon_x,Goniometer X,Motor,X10SA-ES-DF1:TRX1,baseline,det,no,yes,"{""type"": guarded, ""in"": 18.0, ""out"": -10.0, ""safe"": -100,""tol"":0.5}",
-gon_y,Goniometer Y,Motor,X10SA-ES-DF1:TRY1,baseline,det,no,yes,,
-gon_z,Goniometer X,Motor,X10SA-ES-DF1:TRZ1,baseline,det,no,yes,,
-omega,Omega,Motor,X10SA-ES-DF1:ROTU,baseline,det,no,yes,,
-cryo_pos,Cryo positioner,Signal,X10SA-ES-CS:POS-SET,baseline,se,no,yes,"{""type"":positioner}",
-cryo_x,Cryojet X ,Motor,X10SA-ES-CS:TRX,baseline,se,no,yes,,
-det_xi_focus,X-ray eye 2 Focus,Motor,X10SA-ES-XEYE:FOCUS,baseline,detxi,no,yes,,
-det_xi_zoom,X-ray eye 2 Zoom,Motor,X10SA-ES-XEYE:ZOOM,baseline,detxi,no,yes,,
-det_xi_x,X-ray eye X,Motor,X10SA-ES-XEYE:TRX,baseline,detxi,no,yes,,
-i2,i2,SignalRO,X10SA-ES-XEYEDI:READOUT,monitored,bpm,yes,yes,,
-det_xicam_x,sample cam X ,SignalRO,X10SA-ES-XEYE:Stats5:CentroidX_RBV,baseline,detxi,yes,yes,,
-det_xicam_xsig,sample cam X sigma,SignalRO,X10SA-ES-XEYE:Stats5:SigmaX_RBV,monitored,detxi,yes,yes,,
-det_xicam_y,sample cam Y ,SignalRO,X10SA-ES-XEYE:Stats5:CentroidY_RBV,baseline,detxi,yes,yes,,
-det_xicam_ysig,sample cam Y sigma,SignalRO,X10SA-ES-XEYE:Stats5:SigmaY_RBV,monitored,detxi,yes,yes,,
-det_xicam_max,sample cam max value,SignalRO,X10SA-ES-XEYE:Stats5:MaxValue_RBV,monitored,detxi,yes,yes,,
-det_xicam_exp,sample cam exp time,Signal,X10SA-ES-XEYE:cam1:AcquireTime,baseline,detxi,no,yes,,
-det_xicam_gain,sample cam gain,Signal,X10SA-ES-XEYE:cam1:Gain,baseline,detxi,no,yes,,
-det_cov,Detector cover,Signal,X10SA-ES-DETCOV:SET,baseline,det,no,yes,"{""type"":positioner}",
-det_y,Detector Y,Motor,X10SA-ES-DET:TRY,baseline,det,no,yes,,
-det_z,Detector Z,Motor,X10SA-ES-DET:TRZ,baseline,det,no,yes,,
@@ -1,145 +0,0 @@
-name,description,deviceClass,PV,readoutPriority,tag,readOnly,include,userParameter,
-sls_current,SLS current,SignalRO,ARS07-DPCT-0100:CURR,monitored,SLS,yes,yes,,
-fe_sl_xr,FE Slit X Ring,Motor,X06DA-FE-SLDI:TRXR,baseline,fe,no,yes,,
-fe_sl_yt,FE Slit Y top,Motor,X06DA-FE-SLDI:TRYT,baseline,fe,no,yes,,
-fe_sl_xw,FE Slit X Wall,Motor,X06DA-FE-SLDI:TRXW,baseline,fe,no,yes,,
-fe_sl_yb,FE SlitY Bottom,Motor,X06DA-FE-SLDI:TRYB,baseline,fe,no,yes,,
-fe_sl_xcen,FE Slit X Centre,Motor,X06DA-FE-SLDI:CENTERX,baseline,fe,no,yes,,
-fe_sl_xsize,FE Slit X Size,Motor,X06DA-FE-SLDI:SIZEX,baseline,fe,no,yes,,
-fe_sl_ycen,FE Slit Y Centre,Motor,X06DA-FE-SLDI:CENTERY,baseline,fe,no,yes,,
-fe_sl_ysize,FE Slit Y Size,Motor,X06DA-FE-SLDI:SIZEY,baseline,fe,no,yes,,
-tm_xu,TorM Upstream X,Motor,X06DA-FE-MI1:TRXU,baseline,tm,no,yes,,
-tm_xd,TorM Downstream X,Motor,X06DA-FE-MI1:TRXD,baseline,tm,no,yes,,
-tm_yur,TorM Upstream Ring Y,Motor,X06DA-FE-MI1:TRYUR,baseline,tm,no,yes,,
-tm_yw,TorM Wall Y,Motor,X06DA-FE-MI1:TRYW,baseline,tm,no,yes,,
-tm_ydr,TorM Downstream Ring Y,Motor,X06DA-FE-MI1:TRYDR,baseline,tm,no,yes,,
-tm_b1,TorM Bender,Motor,X06DA-FE-MI1:BND1,baseline,tm,no,yes,,
-tm_yaw,TorM Virtual Yaw,Motor,X06DA-FE-MI1:YAW,baseline,tm,no,yes,,
-tm_roll,TorM Virtual Roll,Motor,X06DA-FE-MI1:ROLL,baseline,tm,no,yes,,
-tm_pitch,TorM Virtual Pitch,Motor,X06DA-FE-MI1:PITCH,baseline,tm,no,yes,,
-tm_x,TorM Virtual X,Motor,X06DA-FE-MI1:TRX,baseline,tm,no,yes,,
-tm_y,TorM Virtual Y ,Motor,X06DA-FE-MI1:TRY,baseline,tm,no,yes,,
-bsf_bpm1,BSF BPM Signal 1,SignalRO,X06DA-OP-BSFBPM:SIGNAL1,monitored,bpm,yes,no,,
-bsf_bpm2,BSF BPM Signal 2,SignalRO,X06DA-OP-BSFBPM:SIGNAL2,monitored,bpm,yes,no,,
-bsf_bpm3,BSF BPM Signal 3,SignalRO,X06DA-OP-BSFBPM:SIGNAL3,monitored,bpm,yes,no,,
-bsf_bpm4,BSF BPM Signal 4,SignalRO,X06DA-OP-BSFBPM:SIGNAL4,monitored,bpm,yes,no,,
-bsf_bpmsum,BSF BPM Summed,SignalRO,X06DA-OP-BSFBPM:SUM,monitored,bpm,yes,no,,
-bsf_sl_xw,BSF slit outboard,Motor,X06DA-OP-BSFSLH:TRXW,baseline,bsf,no,yes,,
-bsf_sl_xr,BSF slit inboard,Motor,X06DA-OP-BSFSLH:TRXR,baseline,bsf,no,yes,,
-bsf_sl_yt,BSF slit top,Motor,X06DA-OP-BSFSLV:TRYT,baseline,bsf,no,yes,,
-bsf_sl_yb,BSF slit bottom,Motor,X06DA-OP-BSFSLV:TRYB,baseline,bsf,no,yes,,
-bsf_sl_xcen,BSF X centre,Motor,X06DA-OP-BSFSLH:CENTER,baseline,bsf,no,yes,,
-bsf_sl_xsize,BSF X size,Motor,X06DA-OP-BSFSLH:SIZE,baseline,bsf,no,yes,,
-bsf_sl_ycen,BSF Y centre,Motor,X06DA-OP-BSFSLV:CENTER,baseline,bsf,no,yes,,
-bsf_sl_ysize,BSF Y size,Motor,X06DA-OP-BSFSLV:SIZE,baseline,bsf,no,yes,,
-bsf_f1_y,BSF Filter 1 Y,Motor,X06DA-OP-BSFFI1:TRY,baseline,bsf,no,yes,,
-dccm_theta1,DCCM Theta Xtal1,Motor,X06DA-OP-DCCM:ROTX-CR1,baseline,dccm,no,yes,,
-dccm_theta2,DCCM Theta Xtal2,Motor,X06DA-OP-DCCM:ROTX-CR2,baseline,dccm,no,yes,,
-dccm_rotz,DCCM RotZ Xtal 2,Motor,X06DA-OP-DCCM:ROTZ-CR2,baseline,dccm,no,yes,,
-dccm_xbpm1_y,DCCM XBPM1 Y,Motor,X06DA-OP-DCCMXBPM1:TRY,baseline,dccm,no,yes,,
-dccm_xbpm2_y,DCCM XBPM2 Y,Motor,X06DA-OP-DCCMXBPM2:TRY,baseline,dccm,no,yes,,
-dccm_energy,DCCM energy,Motor,X06DA-OP-DCCM:ENERGY,baseline,dccm,no,yes,,
-ss_bpm1,SS BPM Signal 1,SignalRO,X06DA-ES-SSBPM:Current1:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm2,SS BPM Signal 2,SignalRO,X06DA-ES-SSBPM:Current2:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm3,SS BPM Signal 3,SignalRO,X06DA-ES-SSBPM:Current3:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm4,SS BPM Signal 4,SignalRO,X06DA-ES-SSBPM:Current4:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpmsum,SS BPM Summed,SignalRO,X06DA-ES-SSBPM:SumAll:MeanValue_RBV,monitored,bpm,yes,yes,,
-ss_bpm_x,SS BPM X,Motor,X06DA-ES-SSBPM:TRX,baseline,ss,no,yes,,
-ss_bpm_y,SS BPM Y,Motor,X06DA-ES-SSBPM:TRY,baseline,ss,no,yes,,
-ss_sl_xw,SS slit wall,Motor,X06DA-ES-SSSLH:TRXW,baseline,ss,no,yes,,
-ss_sl_xr,SS slit ring,Motor,X06DA-ES-SSSLH:TRXR,baseline,ss,no,yes,,
-ss_sl_xcen,SS slit X centre,Motor,X06DA-ES-SSSLH:CENTER,baseline,ss,no,yes,,
-ss_sl_xsize,SS slit X size,Motor,X06DA-ES-SSSLH:SIZE,baseline,ss,no,yes,,
-ss_sl_yt,SS slit top,Motor,X06DA-ES-SSSLV:TRYT,baseline,ss,no,yes,,
-ss_sl_yb,SS slit bottom,Motor,X06DA-ES-SSSLV:TRYB,baseline,ss,no,yes,,
-ss_sl_ycen,SS slit Y centre,Motor,X06DA-ES-SSSLV:CENTER,baseline,ss,no,yes,,
-ss_sl_ysize,SS slit Y size,Motor,X06DA-ES-SSSLV:SIZE,baseline,ss,no,yes,,
-ss_xi_x,SS X-ray eye X,Motor,X06DA-ES-SSXI:TRX,baseline,ss,no,yes,"{""type"": multi-position,""in"": 7.5, ""out"": -2.1}",
-ss_xi_y,SS X-ray eye Y,Motor,X06DA-ES-SSXI:TRY,baseline,ss,no,yes,,
-ss_xicam_x,ss cam X,SignalRO,X06DA-ES-SSCAM:Stats5:CentroidX_RBV,baseline,ss,yes,yes,,
-ss_xicam_y,ss cam Y,SignalRO,X06DA-ES-SSCAM:Stats5:CentroidY_RBV,baseline,ss,yes,yes,,
-ss_xicam_max,ss cam max value,SignalRO,X06DA-ES-SSCAM:Stats5:MaxValue_RBV,monitored,ss,yes,yes,,
-ss_xicam_exp,ss camera exposure,Signal,X06DA-ES-SSCAM:cam1:AcquireTime,baseline,ss,no,yes,,
-ss_xicam_gain,ss camera gain,Signal,X06DA-ES-SSCAM:cam1:Gain,baseline,ss,no,yes,,
-ss_xicam_xsig,ss camera  x sigma,Signal,X06DA-ES-SSCAM:Stats5:SigmaX_RBV,baseline,ss,yes,yes,,
-ss_xicam_ysig,ss camera y sigma,Signal,X06DA-ES-SSCAM:Stats5:SigmaY_RBV,baseline,ss,yes,yes,,
-vfm_xu,VFM Upstream X,Motor,X06DA-ES-VFM:TRXU,baseline,vfm,no,yes,,
-vfm_xd,VFM Downstream X,Motor,X06DA-ES-VFM:TRXD,baseline,vfm,no,yes,,
-vfm_yur,VFM Upstream Ring Y,Motor,X06DA-ES-VFM:TRYUR,baseline,vfm,no,yes,,
-vfm_yw,VFM Wall Y,Motor,X06DA-ES-VFM:TRYW,baseline,vfm,no,yes,,
-vfm_ydr,VFM Downstream Ring Y,Motor,X06DA-ES-VFM:TRYDR,baseline,vfm,no,yes,,
-vfm_bu,VFM Upstream Bender,Motor,X06DA-ES-VFM:BNDU,baseline,vfm,no,yes,,
-vfm_bd,VFM Downstream Bender,Motor,X06DA-ES-VFM:BNDD,baseline,vfm,no,yes,,
-vfm_yaw,VFM Virtual Yaw,Motor,X06DA-ES-VFM:YAW,baseline,vfm,no,yes,,
-vfm_roll,VFM Virtual Roll,Motor,X06DA-ES-VFM:ROLL,baseline,vfm,no,yes,,
-vfm_pitch,VFM Virtual Pitch,Motor,X06DA-ES-VFM:PITCH,baseline,vfm,no,yes,,
-vfm_x,VFM Virtual X,Motor,X06DA-ES-VFM:TRX,baseline,vfm,no,yes,,
-vfm_y,VFM Virtual Y ,Motor,X06DA-ES-VFM:TRY,baseline,vfm,no,yes,,
-hfm_xu,HFM Upstream X,Motor,X06DA-ES-HFM:TRXU,baseline,hfm,no,yes,,
-hfm_xd,HFM Downstream X,Motor,X06DA-ES-HFM:TRXD,baseline,hfm,no,yes,,
-hfm_yuw,HFM Upstream Wall Y,Motor,X06DA-ES-HFM:TRYUW,baseline,hfm,no,yes,,
-hfm_yr,HFM Ring Y,Motor,X06DA-ES-HFM:TRYR,baseline,hfm,no,yes,,
-hfm_ydw,HFM Downstream Wall Y,Motor,X06DA-ES-HFM:TRYDW,baseline,hfm,no,yes,,
-hfm_bu,HFM Upstream Bender,Motor,X06DA-ES-HFM:BNDU,baseline,hfm,no,yes,,
-hfm_bd,HFM Downstream Bender,Motor,X06DA-ES-HFM:BNDD,baseline,hfm,no,yes,,
-hfm_yaw,HFM Virtual Yaw,Motor,X06DA-ES-HFM:YAW,baseline,hfm,no,yes,,
-hfm_roll,HFM Virtual Roll,Motor,X06DA-ES-HFM:ROLL,baseline,hfm,no,yes,,
-hfm_pitch,HFM Virtual Pitch,Motor,X06DA-ES-HFM:PITCH,baseline,hfm,no,yes,,
-hfm_x,HFM Virtual X,Motor,X06DA-ES-HFM:TRX,baseline,hfm,no,yes,,
-hfm_y,HFM Virtual Y ,Motor,X06DA-ES-HFM:TRY,baseline,hfm,no,yes,,
-bcu_bpm1,BCU BPM Signal 1 ,SignalRO,X06DA-ES-BCBPM:Current1:MeanValue_RBV,monitored,bpm,yes,no,,
-bcu_bpm2,BCU BPM Signal 2,SignalRO,X06DA-ES-BCBPM:Current2:MeanValue_RBV,monitored,bpm,yes,no,,
-bcu_bpm3,BCU BPM Signal 3,SignalRO,X06DA-ES-BCBPM:Current3:MeanValue_RBV,monitored,bpm,yes,no,,
-bcu_bpm4,BCU BPM Signal 4,SignalRO,X06DA-ES-BCBPM:Current4:MeanValue_RBV,monitored,bpm,yes,no,,
-bcu_bpmsum,BCU BPM Summed,SignalRO,X06DA-ES-BCBPM:SumAll:MeanValue_RBV,monitored,bpm,yes,no,,
-bcu_bpm_x,BCU BPM X,Motor,X06DA-ES-BCBPM:TRX,baseline,bcu,no,no,,
-bcu_bpm_y,BCU BPM Y ,Motor,X06DA-ES-BCBPM:TRY,baseline,bcu,no,no,,
-bcu_sl_xw,BCU slit wall,Motor,X06DA-ES-BCSLH:TRXW,baseline,bcu,no,no,,
-bcu_sl_xr,BCU slit ring,Motor,X06DA-ES-BCSLH:TRXR,baseline,bcu,no,no,,
-bcu_sl_xcen,BCU slit X centre,Motor,X06DA-ES-BCSLH:CENTER,baseline,bcu,no,no,,
-bcu_sl_xsize,BCU slit X size,Motor,X06DA-ES-BCSLH:SIZE,baseline,bcu,no,no,,
-bcu_sl_yt,BCU slit top,Motor,X06DA-ES-BCSLV:TRYT,baseline,bcu,no,no,,
-bcu_sl_yb,BCU slit bottom,Motor,X06DA-ES-BCSLV:TRYB,baseline,bcu,no,no,,
-bcu_sl_ycen,BCU slit Y centre,Motor,X06DA-ES-BCSLV:CENTER,baseline,bcu,no,no,,
-bcu_sl_ysize,BCU slit Y size,Motor,X06DA-ES-BCSLV:SIZE,baseline,bcu,no,no,,
-xrf_pos,XRF det in/out,Signal,X06DA-ES-XRF:POS-SET,baseline,se,no,no,"{""type"":positioner}",
-samcam_x,sample cam X ,SignalRO,X06DA-ES-MS:Stats5:CentroidX_RBV,baseline,scam,yes,no,,
-samcam_xsig,sample cam X sigma,SignalRO,X06DA-ES-MS:Stats5:SigmaX_RBV,monitored,scam,yes,no,,
-samcam_y,sample cam Y ,SignalRO,X06DA-ES-MS:Stats5:CentroidY_RBV,baseline,scam,yes,no,,
-samcam_ysig,sample cam Y sigma,SignalRO,X06DA-ES-MS:Stats5:SigmaY_RBV,monitored,scam,yes,no,,
-samcam_max,sample cam max value,SignalRO,X06DA-ES-MS:Stats5:MaxValue_RBV,monitored,scam,yes,no,,
-samcam_exp,sample cam exp time,Signal,X06DA-ES-MS:cam1:AcquireTime,baseline,scam,no,no,,
-samcam_gain,sample cam gain,Signal,X06DA-ES-MS:cam1:Gain,baseline,scam,no,no,,
-scam_zoom,Sample cam zoom,Motor,X06DA-ES-MS:ZOOM,baseline,scam,no,no,,
-fl_bright,Frontlight brightness,Signal,X06DA-ES-FL:SET,baseline,se,no,no,,
-coll_x,Collimator X,Motor,X06DA-ES-COL:TRX,baseline,se,no,no,, 
-coll_y,Collimator Y,Motor,X06DA-ES-COL:TRY,baseline,se,no,no,"{""type"": multi-position, ""in"": 41.5, ""out"": 20.0, ""park"": 0,""tol"":0.05}",
-diag_y,Scintillator/diode Y,Motor,X06DA-ES-SCL:TRY,baseline,se,no,no,"{""type"": multi-position, ""scint"": 38.62, ""i1"": 44.0, ""out"": 20.0,""park"": 0,""tol"":0.3}",
-diag_z,Scintillator/diode Z,Motor,X06DA-ES-SCL:TRZ,baseline,se,no,no,,
-i1,i1 diode reading,SignalRO,X06DA-ES-SCLDI:READOUT,monitored,bpm,yes,no,,
-bl_pos,Backlight positioner,Signal,X06DA-ES-BL:POS-SET,baseline,se,no,no,"{""type"":positioner}",
-bl_bright,Backlight brightness,Signal,X06DA-ES-BL:SET,baseline,se,no,no,,
-bs_x,Beamstop X,Motor,X06DA-ES-BS:TRX,baseline,se,no,no,,
-bs_y,Beamstop Y,Motor,X06DA-ES-BS:TRY,baseline,se,no,no,,
-bs_z,Beamstop Z,Motor,X06DA-ES-BS:TRZ,baseline,se,no,no,"{""type"": guarded, ""min"": 13, ""samp"": 15, ""work_min"": 20, ""safe"": 41, ""max_blin"": 42, ""max_blout"": 70}",
-bs_pos,Beamstop positioner,Signal,X06DA-ES-BS:POS-SET,baseline,se,no,no,"{""type"":positioner}",
-gon_x,Goniometer X,Motor,X06DA-ES-DF1:TRX1,baseline,det,no,no,"{""type"": guarded, ""in"": 18.0, ""out"": -10.0, ""safe"": -100,""tol"":0.5}",
-gon_y,Goniometer Y,Motor,X06DA-ES-DF1:TRY1,baseline,det,no,no,,
-gon_z,Goniometer X,Motor,X06DA-ES-DF1:TRZ1,baseline,det,no,no,,
-omega,Omega,Motor,X06DA-ES-DF1:ROTU,baseline,det,no,no,,
-cryo_pos,Cryo positioner,Signal,X06DA-ES-CS:POS-SET,baseline,se,no,no,"{""type"":positioner}",
-cryo_x,Cryojet X ,Motor,X06DA-ES-CS:TRX,baseline,se,no,no,,
-det_xi_focus,X-ray eye 2 Focus,Motor,X06DA-ES-XEYE:FOCUS,baseline,detxi,no,no,,
-det_xi_zoom,X-ray eye 2 Zoom,Motor,X06DA-ES-XEYE:ZOOM,baseline,detxi,no,no,,
-det_xi_x,X-ray eye X,Motor,X06DA-ES-XEYE:TRX,baseline,detxi,no,no,,
-i2,i2,SignalRO,X06DA-ES-XEYEDI:READOUT,monitored,bpm,yes,no,,
-det_xicam_x,sample cam X ,SignalRO,X06DA-ES-XEYE:Stats5:CentroidX_RBV,baseline,detxi,yes,no,,
-det_xicam_xsig,sample cam X sigma,SignalRO,X06DA-ES-XEYE:Stats5:SigmaX_RBV,monitored,detxi,yes,no,,
-det_xicam_y,sample cam Y ,SignalRO,X06DA-ES-XEYE:Stats5:CentroidY_RBV,baseline,detxi,yes,no,,
-det_xicam_ysig,sample cam Y sigma,SignalRO,X06DA-ES-XEYE:Stats5:SigmaY_RBV,monitored,detxi,yes,no,,
-det_xicam_max,sample cam max value,SignalRO,X06DA-ES-XEYE:Stats5:MaxValue_RBV,monitored,detxi,yes,no,,
-det_xicam_exp,sample cam exp time,Signal,X06DA-ES-XEYE:cam1:AcquireTime,baseline,detxi,no,no,,
-det_xicam_gain,sample cam gain,Signal,X06DA-ES-XEYE:cam1:Gain,baseline,detxi,no,no,,
-det_cov,Detector cover,Signal,X06DA-ES-DETCOV:SET,baseline,det,no,no,"{""type"":positioner}",
-det_y,Detector Y,Motor,X06DA-ES-DET:TRY,baseline,det,no,no,,
-det_z,Detector Z,Motor,X06DA-ES-DET:TRZ,baseline,det,no,no,,
@@ -1,997 +0,0 @@
-sls_current:
-  description: SLS current
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - SLS
-  readOnly: True
-  softwareTrigger: false
-
-fe_sl_xr:
-  description: FE Slit X Ring
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-fe_sl_yt:
-  description: FE Slit Y top
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-fe_sl_xw:
-  description: FE Slit X Wall
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-fe_sl_yb:
-  description: FE SlitY Bottom
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-fe_sl_xcen:
-  description: FE Slit X Centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-fe_sl_xsize:
-  description: FE Slit X Size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-fe_sl_ycen:
-  description: FE Slit Y Centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-fe_sl_ysize:
-  description: FE Slit Y Size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - fe
-  readOnly: False
-  softwareTrigger: false
-
-tm_xu:
-  description: TorM Upstream X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRXU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_xd:
-  description: TorM Downstream X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRXD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_yur:
-  description: TorM Upstream Ring Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRYUR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_yw:
-  description: TorM Wall Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRYW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_ydr:
-  description: TorM Downstream Ring Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRYDR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_b1:
-  description: TorM Bender
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:BND1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_yaw:
-  description: TorM Virtual Yaw
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:YAW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_roll:
-  description: TorM Virtual Roll
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:ROLL'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_pitch:
-  description: TorM Virtual Pitch
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:PITCH'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_x:
-  description: TorM Virtual X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-tm_y:
-  description: TorM Virtual Y 
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - tm
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_xw:
-  description: BSF slit outboard
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLH:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_xr:
-  description: BSF slit inboard
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLH:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_yt:
-  description: BSF slit top
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLV:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_yb:
-  description: BSF slit bottom
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLV:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_xcen:
-  description: BSF X centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLH:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_xsize:
-  description: BSF X size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLH:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_ycen:
-  description: BSF Y centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLV:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_sl_ysize:
-  description: BSF Y size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFSLV:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-bsf_f1_y:
-  description: BSF Filter 1 Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-BSFFI1:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bsf
-  readOnly: False
-  softwareTrigger: false
-
-dccm_theta1:
-  description: DCCM Theta Xtal1
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:ROTX-CR1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - dccm
-  readOnly: False
-  softwareTrigger: false
-
-dccm_theta2:
-  description: DCCM Theta Xtal2
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:ROTX-CR2'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - dccm
-  readOnly: False
-  softwareTrigger: false
-
-dccm_rotz:
-  description: DCCM RotZ Xtal 2
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:ROTZ-CR2'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - dccm
-  readOnly: False
-  softwareTrigger: false
-
-dccm_xbpm1_y:
-  description: DCCM XBPM1 Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCMXBPM1:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - dccm
-  readOnly: False
-  softwareTrigger: false
-
-dccm_xbpm2_y:
-  description: DCCM XBPM2 Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCMXBPM2:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - dccm
-  readOnly: False
-  softwareTrigger: false
-
-dccm_energy:
-  description: DCCM energy
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:ENERGY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - dccm
-  readOnly: False
-  softwareTrigger: false
-
-ss_bpm1:
-  description: SS BPM Signal 1
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSBPM:Current1:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: True
-  softwareTrigger: false
-
-ss_bpm2:
-  description: SS BPM Signal 2
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSBPM:Current2:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: True
-  softwareTrigger: false
-
-ss_bpm3:
-  description: SS BPM Signal 3
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSBPM:Current3:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: True
-  softwareTrigger: false
-
-ss_bpm4:
-  description: SS BPM Signal 4
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSBPM:Current4:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: True
-  softwareTrigger: false
-
-ss_bpmsum:
-  description: SS BPM Summed
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSBPM:SumAll:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: True
-  softwareTrigger: false
-
-ss_bpm_x:
-  description: SS BPM X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSBPM:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_bpm_y:
-  description: SS BPM Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSBPM:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_xw:
-  description: SS slit wall
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLH:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_xr:
-  description: SS slit ring
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLH:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_xcen:
-  description: SS slit X centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLH:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_xsize:
-  description: SS slit X size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLH:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_yt:
-  description: SS slit top
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLV:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_yb:
-  description: SS slit bottom
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLV:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_ycen:
-  description: SS slit Y centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLV:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_sl_ysize:
-  description: SS slit Y size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSLV:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_xi_x:
-  description: SS X-ray eye X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSXI:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-  userParameter: {"type": multi-position,"in": 7.5, "out": -2.1}
-
-ss_xi_y:
-  description: SS X-ray eye Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSXI:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_xicam_x:
-  description: ss cam X
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSCAM:Stats5:CentroidX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_y:
-  description: ss cam Y
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSCAM:Stats5:CentroidY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_max:
-  description: ss cam max value
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSCAM:Stats5:MaxValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_exp:
-  description: ss camera exposure
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X06DA-ES-SSCAM:cam1:AcquireTime', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_xicam_gain:
-  description: ss camera gain
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X06DA-ES-SSCAM:cam1:Gain', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_xicam_xsig:
-  description: ss camera  x sigma
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X06DA-ES-SSCAM:Stats5:SigmaX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_ysig:
-  description: ss camera y sigma
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X06DA-ES-SSCAM:Stats5:SigmaY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-vfm_xu:
-  description: VFM Upstream X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRXU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_xd:
-  description: VFM Downstream X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRXD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_yur:
-  description: VFM Upstream Ring Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRYUR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_yw:
-  description: VFM Wall Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRYW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_ydr:
-  description: VFM Downstream Ring Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRYDR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_bu:
-  description: VFM Upstream Bender
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:BNDU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_bd:
-  description: VFM Downstream Bender
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:BNDD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_yaw:
-  description: VFM Virtual Yaw
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:YAW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_roll:
-  description: VFM Virtual Roll
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:ROLL'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_pitch:
-  description: VFM Virtual Pitch
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:PITCH'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_x:
-  description: VFM Virtual X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-vfm_y:
-  description: VFM Virtual Y 
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - vfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_xu:
-  description: HFM Upstream X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRXU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_xd:
-  description: HFM Downstream X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRXD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_yuw:
-  description: HFM Upstream Wall Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRYUW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_yr:
-  description: HFM Ring Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRYR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_ydw:
-  description: HFM Downstream Wall Y
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRYDW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_bu:
-  description: HFM Upstream Bender
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:BNDU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_bd:
-  description: HFM Downstream Bender
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:BNDD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_yaw:
-  description: HFM Virtual Yaw
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:YAW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_roll:
-  description: HFM Virtual Roll
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:ROLL'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_pitch:
-  description: HFM Virtual Pitch
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:PITCH'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_x:
-  description: HFM Virtual X
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
-hfm_y:
-  description: HFM Virtual Y 
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - hfm
-  readOnly: False
-  softwareTrigger: false
-
@@ -1,2 +1,777 @@
-base_config:
-  - !include ./pxiii-autogenerated.yaml
+sls_current:
+  description: sls current
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: true
+  softwareTrigger: false
+vg0_press:
+  description: VG0 pressure
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-FE-VMCC-0000:PRESSURE', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: true
+  softwareTrigger: false
+abs_press:
+  description: Absorber pressure
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-FE-ABS1-VMCC-1010:PRESSURE', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: true
+  softwareTrigger: false
+
+
+sldi_cenx:
+  description: FE slit-diaphragm horizontal center
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERX'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+sldi_sizex:
+  description: FE slit-diaphragm horizontal size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEX'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+sldi_ceny:
+  description: FE slit-diaphragm vertical center
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERY'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+sldi_sizey:
+  description: FE slit-diaphragm vertical size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEY'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+
+fecmi_try:
+  description: FE collimating mirror try
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-MI1:TRY'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+fecmi_pitch:
+  description: FE collimating mirror pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-MI1:PITCH'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+fecmi_bend:
+  description: FE collimating mirror bend
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-MI1:BEND1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+
+slh_press:
+  description: OP slit pressure
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-OP-SLH-VMFR-1010:PRESSURE', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+
+slh_trxr:
+  description: OP slit inner blade motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-OP-SLH:TRXR'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+slh_trxw:
+  description: OP slit outer blade motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-OP-SLH:TRXW'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+fi1_try:
+  description: Beam attenuator motion before mono
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-OP-FI1:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+dccm_theta1:
+  description: Monochromator pitch 1
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:THETA1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+dccm_diode_top:
+  description: Top diode between mono crystals
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-OP-XPM1:TOP:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+dccm_diode_bottom:
+  description: Bottom diode between mono crystals
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-OP-XPM1:BOT:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+dccm_theta2:
+  description: Monochromator pitch 2
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:THETA2'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+dccm_xbpm:
+  description: XBPM total intensity after monochromator
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+dccm_energy:
+  description: Monochromator energy
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:ENERGY'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+dccm_eoffset:
+  description: Monochromator energy offset
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:EOFFSET'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssxbpm_trx:
+  description: XBPM motion before secondary source
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRX1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssxbpm_try:
+  description: XBPM motion before secondary source
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssxbpm:
+  description: XBPM before secondary source
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-SSBPM1:SumAll:MeanValue_RBV'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+ssslit_trxr:
+  description: Secondary source blade motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXR'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssslit_trxw:
+  description: Secondary source blade motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXW'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssslit_tryt:
+  description: Secondary source blade motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSSV1:TRYT'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssslit_tryb:
+  description: Secondary source blade motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSSV1:TRYB'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssxi1_trx:
+  description: Secondary source diagnostic screen motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRX1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+ssxi1_try:
+  description: Secondary source diagnostic screen motion
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+vfm_trxu:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-VFM:TRXU'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+vfm_trxd:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-VFM:TRXD'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+# vfm_tryuw:
+#   deviceClass: ophyd.EpicsMotor
+#   deviceConfig: {prefix: 'X06DA-ES-VFM:TRYUW'}
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   readOnly: false
+#   softwareTrigger: false
+# vfm_tryr:
+#   deviceClass: ophyd.EpicsMotor
+#   deviceConfig: {prefix: 'X06DA-ES-VFM:TRYR'}
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   readOnly: false
+#   softwareTrigger: false
+# vfm_trydw:
+#   deviceClass: ophyd.EpicsMotor
+#   deviceConfig: {prefix: 'X06DA-ES-VFM:TRYDW'}
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   readOnly: false
+#   softwareTrigger: false
+vfm_pitch:
+  description: KB mirror vertical steering
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-VFM:PITCH'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+vfm_yaw:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-VFM:YAW'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+vfm_roll:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-VFM:ROLL'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+vfm_trx:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-VFM:TRX'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+vfm_try:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-VFM:TRY'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+hfm_trxu:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-HFM:TRXU'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+hfm_trxd:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-HFM:TRXD'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+# hfm_tryur:
+#   deviceClass: ophyd.EpicsMotor
+#   deviceConfig: {prefix: 'X06DA-ES-HFM:TRYUR'}
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   readOnly: false
+#   softwareTrigger: false
+# hfm_tryw:
+#   deviceClass: ophyd.EpicsMotor
+#   deviceConfig: {prefix: 'X06DA-ES-HFM:TRYW'}
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   readOnly: false
+#   softwareTrigger: false
+# hfm_trydr:
+#   deviceClass: ophyd.EpicsMotor
+#   deviceConfig: {prefix: 'X06DA-ES-HFM:TRYDR'}
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   readOnly: false
+#   softwareTrigger: false
+hfm_pitch:
+  description: KB mirror horizontal steering
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-HFM:PITCH'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+hfm_yaw:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-HFM:YAW'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+hfm_roll:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-HFM:ROLL'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+hfm_trx:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-HFM:TRX'}
+  enabled: false
+  onFailure: buffer
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+hfm_try:
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-HFM:TRY'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+# xbox_xbpm:
+#   description: Exposure box XBPM
+#   deviceClass: ophyd.EpicsSignalRO
+#   deviceConfig: {read_pv: 'X06DA-ES-XBBPM1:SumAll:MeanValue_RBV'}
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   readOnly: true
+#   softwareTrigger: false
+xbox_fil1:
+  description: Exposure box filter wheel 1
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-FI1:ROZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+xbox_fil2:
+  description: Exposure box filter wheel 2
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-FI2:ROZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+xbox_fil3:
+  description: Exposure box filter wheel 3
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-FI3:ROZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+xbox_fil4:
+  description: Exposure box filter wheel 4
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-FI4:ROZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+xbox_diode:
+  description: Exposure box diode
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-DI1:READOUT'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+gonpos:
+  description: Sample sensor distance
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-DF1:CBOX-USER1', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+gonvalid:
+  description: Sample in valid distance
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-DF1:CBOX-CMP1', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+samzoom:
+  description: Sample microscope zoom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-SAMCAM:ZOOM'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+samcam:
+  description: Sample camera aggregate device
+  deviceClass: pxiii_bec.devices.SamCamDetector
+  deviceConfig: {prefix: 'X06DA-SAMCAM:'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+samstream:
+  description: Sample camera ZMQ stream
+  deviceClass: pxiii_bec.devices.StdDaqPreviewDetector
+  deviceConfig:
+    url: 'tcp://129.129.110.12:9089'
+  deviceTags:
+    - detector
+  enabled: true
+  readoutPriority: async
+  readOnly: false
+  softwareTrigger: false
+# samimg:
+#   description: Sample camera image from EPICS
+#   deviceClass: pxiii_bec.devices.NDArrayPreview
+#   deviceConfig:
+#     prefix: 'X06DA-SAMCAM:image1:'
+#   deviceTags:
+#     - detector
+#   enabled: true
+#   readoutPriority: async
+#   readOnly: false
+#   softwareTrigger: false
+
+
+bstop_pneum:
+  description: Beamstop pneumatic in-out
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X06DA-ES-BS:GET-POS', write_pv: 'X06DA-ES-BS:SET-POS'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+bstop_x:
+  description: Beamstop translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-BS:TRX1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+bstop_y:
+  description: Beamstop translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-BS:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+bstop_z:
+  description: Beamstop translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-BS:TRZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+bstop_pneum:
+  description: Beamstop pneumatic
+  deviceClass: pxiii_bec.devices.PneumaticValve
+  deviceConfig: {read_pv: 'X06DA-ES-BS:GET-POS', write_pv: 'X06DA-ES-BS:SET-POS', kind: 'config', auto_monitor: true, put_complete: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+bstop_diode:
+  description: Beamstop diode
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-ES-BS:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+frontlight:
+  description: Microscope frontlight
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X06DA-ES-FL:SET-BRGHT', kind: 'config', put_complete: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+backlight:
+  description: Backlight reflector
+  deviceClass: pxiii_bec.devices.PneumaticValve
+  deviceConfig: {read_pv: 'X06DA-ES-BL:GET-POS', write_pv: 'X06DA-ES-BL:SET-POS', kind: 'config', auto_monitor: true, put_complete: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+
+
+
+
+
+gmx:
+  description: ABR horizontal stage
+  deviceClass: pxiii_bec.devices.A3200Axis
+  deviceConfig: {prefix: 'X06DA-ES-DF1:GMX', base_pv: 'X06DA-ES'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+gmy:
+  description: ABR vertical stage
+  deviceClass: pxiii_bec.devices.A3200Axis
+  deviceConfig: {prefix: 'X06DA-ES-DF1:GMY', base_pv: 'X06DA-ES'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+gmz:
+  description: ABR axial stage
+  deviceClass: pxiii_bec.devices.A3200Axis
+  deviceConfig: {prefix: 'X06DA-ES-DF1:GMZ', base_pv: 'X06DA-ES'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+omega:
+  description: ABR rotation stage
+  deviceClass: pxiii_bec.devices.A3200Axis
+  deviceConfig: {prefix: 'X06DA-ES-DF1:OMEGA', base_pv: 'X06DA-ES'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+abr:
+  description: Aerotech ABR motion system
+  deviceClass: pxiii_bec.devices.AerotechAbrStage
+  deviceConfig: {prefix: 'X06DA-ES'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+
+coll_x:
+  description: Collimator X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-COL:TRX1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+coll_y:
+  description: Collimator Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-COL:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+
+shx:
+  description: SmarGon X axis
+  deviceClass: pxiii_bec.devices.SmarGonAxisB
+  deviceConfig: {prefix: 'SCS', low_limit: -2, high_limit: 2, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+shy:
+  description: SmarGon Y axis
+  deviceClass: pxiii_bec.devices.SmarGonAxisB
+  deviceConfig: {prefix: 'SCS', low_limit: -2, high_limit: 2, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+shz:
+  description: SmarGon Z axis
+  deviceClass: pxiii_bec.devices.SmarGonAxisB
+  deviceConfig: {prefix: 'SCS', low_limit: 10, high_limit: 22, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+chi:
+  description: SmarGon CHI axis
+  deviceClass: pxiii_bec.devices.SmarGonAxisB
+  deviceConfig: {prefix: 'SCS', low_limit: 0, high_limit: 40, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+phi:
+  description: SmarGon PHI axis
+  deviceClass: pxiii_bec.devices.SmarGonAxisB
+  deviceConfig: {prefix: 'SCS', sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+
+det_y:
+  description: Pilatus height
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-DET:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+det_z:
+  description: Pilatus translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-DET:TRZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
@@ -1,757 +0,0 @@
-sls_current:
-  description: sls current
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: true
-  softwareTrigger: false
-vg0_press:
-  description: VG0 pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-FE-VMCC-0000:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: true
-  softwareTrigger: false
-abs_press:
-  description: Absorber pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-FE-ABS1-VMCC-1010:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: true
-  softwareTrigger: false
-
-
-sldi_cenx:
-  description: FE slit-diaphragm horizontal center
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERX'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false
-  softwareTrigger: false
-sldi_sizex:
-  description: FE slit-diaphragm horizontal size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEX'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false
-  softwareTrigger: false
-sldi_ceny:
-  description: FE slit-diaphragm vertical center
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERY'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false
-  softwareTrigger: false
-sldi_sizey:
-  description: FE slit-diaphragm vertical size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:SIZEY'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false
-  softwareTrigger: false
-
-fecmi_try:
-  description: FE collimating mirror try
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:TRY'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false
-  softwareTrigger: false
-fecmi_pitch:
-  description: FE collimating mirror pitch
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:PITCH'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false
-  softwareTrigger: false
-fecmi_bend:
-  description: FE collimating mirror bend
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-MI1:BEND1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false
-  softwareTrigger: false
-
-slh_press:
-  description: OP slit pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-OP-SLH-VMFR-1010:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-
-slh_trxr:
-  description: OP slit inner blade motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-SLH:TRXR'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-slh_trxw:
-  description: OP slit outer blade motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-SLH:TRXW'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-fi1_try:
-  description: Beam attenuator motion before mono
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-FI1:TRY1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-dccm_theta1:
-  description: Monochromator pitch 1
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:THETA1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-dccm_diode_top:
-  description: Top diode between mono crystals
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-OP-XPM1:TOP:READOUT', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-dccm_diode_bottom:
-  description: Bottom diode between mono crystals
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-OP-XPM1:BOT:READOUT', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-dccm_theta2:
-  description: Monochromator pitch 2
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:THETA2'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-dccm_xbpm:
-  description: XBPM total intensity after monochromator
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-dccm_energy:
-  description: Monochromator energy
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:ENERGY'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-dccm_eoffset:
-  description: Monochromator energy offset
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:EOFFSET'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssxbpm_trx:
-  description: XBPM motion before secondary source
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRX1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssxbpm_try:
-  description: XBPM motion before secondary source
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRY1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssxbpm:
-  description: XBPM before secondary source
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-SSBPM1:SumAll:MeanValue_RBV'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-ssslit_trxr:
-  description: Secondary source blade motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXR'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssslit_trxw:
-  description: Secondary source blade motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXW'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssslit_tryt:
-  description: Secondary source blade motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSV1:TRYT'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssslit_tryb:
-  description: Secondary source blade motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSSV1:TRYB'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssxi1_trx:
-  description: Secondary source diagnostic screen motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRX1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-ssxi1_try:
-  description: Secondary source diagnostic screen motion
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRY1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-vfm_trxu:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRXU'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-vfm_trxd:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRXD'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-# vfm_tryuw:
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X06DA-ES-VFM:TRYUW'}
-#   onFailure: buffer
-#   enabled: true
-#   readoutPriority: monitored
-#   readOnly: false
-#   softwareTrigger: false
-# vfm_tryr:
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X06DA-ES-VFM:TRYR'}
-#   onFailure: buffer
-#   enabled: true
-#   readoutPriority: monitored
-#   readOnly: false
-#   softwareTrigger: false
-# vfm_trydw:
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X06DA-ES-VFM:TRYDW'}
-#   onFailure: buffer
-#   enabled: true
-#   readoutPriority: monitored
-#   readOnly: false
-#   softwareTrigger: false
-vfm_pitch:
-  description: KB mirror vertical steering
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:PITCH'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-vfm_yaw:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:YAW'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-vfm_roll:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:ROLL'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-vfm_trx:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRX'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-vfm_try:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-VFM:TRY'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-hfm_trxu:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRXU'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-hfm_trxd:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRXD'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-# hfm_tryur:
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X06DA-ES-HFM:TRYUR'}
-#   onFailure: buffer
-#   enabled: true
-#   readoutPriority: monitored
-#   readOnly: false
-#   softwareTrigger: false
-# hfm_tryw:
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X06DA-ES-HFM:TRYW'}
-#   onFailure: buffer
-#   enabled: true
-#   readoutPriority: monitored
-#   readOnly: false
-#   softwareTrigger: false
-# hfm_trydr:
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X06DA-ES-HFM:TRYDR'}
-#   onFailure: buffer
-#   enabled: true
-#   readoutPriority: monitored
-#   readOnly: false
-#   softwareTrigger: false
-hfm_pitch:
-  description: KB mirror horizontal steering
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:PITCH'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-hfm_yaw:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:YAW'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-hfm_roll:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:ROLL'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-hfm_trx:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRX'}
-  enabled: false
-  onFailure: buffer
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-hfm_try:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-HFM:TRY'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-# xbox_xbpm:
-#   description: Exposure box XBPM
-#   deviceClass: ophyd.EpicsSignalRO
-#   deviceConfig: {read_pv: 'X06DA-ES-XBBPM1:SumAll:MeanValue_RBV'}
-#   onFailure: buffer
-#   enabled: true
-#   readoutPriority: monitored
-#   readOnly: true
-#   softwareTrigger: false
-xbox_fil1:
-  description: Exposure box filter wheel 1
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-FI1:ROZ1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-xbox_fil2:
-  description: Exposure box filter wheel 2
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-FI2:ROZ1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-xbox_fil3:
-  description: Exposure box filter wheel 3
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-FI3:ROZ1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-xbox_fil4:
-  description: Exposure box filter wheel 4
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-FI4:ROZ1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-xbox_diode:
-  description: Exposure box diode
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-DI1:READOUT'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-gonpos:
-  description: Sample sensor distance
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-DF1:CBOX-USER1', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-gonvalid:
-  description: Sample in valid distance
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-DF1:CBOX-CMP1', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-samzoom:
-  description: Sample microscope zoom
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-SAMCAM:ZOOM'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-samcam:
-  description: Sample camera aggregate device
-  deviceClass: pxiii_bec.devices.SamCamDetector
-  deviceConfig: {prefix: 'X06DA-SAMCAM:'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-samstream:
-  description: Sample camera ZMQ stream
-  deviceClass: pxiii_bec.devices.StdDaqPreviewDetector
-  deviceConfig:
-    url: 'tcp://129.129.110.12:9089'
-  deviceTags:
-    - detector
-  enabled: true
-  readoutPriority: async
-  readOnly: false
-  softwareTrigger: false
-# samimg:
-#   description: Sample camera image from EPICS
-#   deviceClass: pxiii_bec.devices.NDArrayPreview
-#   deviceConfig:
-#     prefix: 'X06DA-SAMCAM:image1:'
-#   deviceTags:
-#     - detector
-#   enabled: true
-#   readoutPriority: async
-#   readOnly: false
-#   softwareTrigger: false
-
-
-bstop_pneum:
-  description: Beamstop pneumatic in-out
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X06DA-ES-BS:GET-POS', write_pv: 'X06DA-ES-BS:SET-POS'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-bstop_x:
-  description: Beamstop translation
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-BS:TRX1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-bstop_y:
-  description: Beamstop translation
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-BS:TRY1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-bstop_z:
-  description: Beamstop translation
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-BS:TRZ1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-bstop_pneum:
-  description: Beamstop pneumatic
-  deviceClass: pxiii_bec.devices.PneumaticValve
-  deviceConfig: {read_pv: 'X06DA-ES-BS:GET-POS', write_pv: 'X06DA-ES-BS:SET-POS', kind: 'config', auto_monitor: true, put_complete: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  readOnly: false
-  softwareTrigger: false
-bstop_diode:
-  description: Beamstop diode
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X06DA-ES-BS:READOUT', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: true
-  softwareTrigger: false
-frontlight:
-  description: Microscope frontlight
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X06DA-ES-FL:SET-BRGHT', kind: 'config', put_complete: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-backlight:
-  description: Backlight reflector
-  deviceClass: pxiii_bec.devices.PneumaticValve
-  deviceConfig: {read_pv: 'X06DA-ES-BL:GET-POS', write_pv: 'X06DA-ES-BL:SET-POS', kind: 'config', auto_monitor: true, put_complete: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  readOnly: false
-  softwareTrigger: false
-
-
-
-
-
-gmx:
-  description: ABR horizontal stage
-  deviceClass: pxiii_bec.devices.A3200Axis
-  deviceConfig: {prefix: 'X06DA-ES-DF1:GMX', base_pv: 'X06DA-ES'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-gmy:
-  description: ABR vertical stage
-  deviceClass: pxiii_bec.devices.A3200Axis
-  deviceConfig: {prefix: 'X06DA-ES-DF1:GMY', base_pv: 'X06DA-ES'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-gmz:
-  description: ABR axial stage
-  deviceClass: pxiii_bec.devices.A3200Axis
-  deviceConfig: {prefix: 'X06DA-ES-DF1:GMZ', base_pv: 'X06DA-ES'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-omega:
-  description: ABR rotation stage
-  deviceClass: pxiii_bec.devices.A3200Axis
-  deviceConfig: {prefix: 'X06DA-ES-DF1:OMEGA', base_pv: 'X06DA-ES'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-abr:
-  description: Aerotech ABR motion system
-  deviceClass: pxiii_bec.devices.AerotechAbrStage
-  deviceConfig: {prefix: 'X06DA-ES'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-shx:
-  description: SmarGon X axis
-  deviceClass: pxiii_bec.devices.SmarGonAxisB
-  deviceConfig: {prefix: 'SCS', low_limit: -2, high_limit: 2, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-shy:
-  description: SmarGon Y axis
-  deviceClass: pxiii_bec.devices.SmarGonAxisB
-  deviceConfig: {prefix: 'SCS', low_limit: -2, high_limit: 2, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-shz:
-  description: SmarGon Z axis
-  deviceClass: pxiii_bec.devices.SmarGonAxisB
-  deviceConfig: {prefix: 'SCS', low_limit: 10, high_limit: 22, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-chi:
-  description: SmarGon CHI axis
-  deviceClass: pxiii_bec.devices.SmarGonAxisB
-  deviceConfig: {prefix: 'SCS', low_limit: 0, high_limit: 40, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-phi:
-  description: SmarGon PHI axis
-  deviceClass: pxiii_bec.devices.SmarGonAxisB
-  deviceConfig: {prefix: 'SCS', sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-
-det_y:
-  description: Pilatus height
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-DET:TRY1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-det_z:
-  description: Pilatus translation
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-DET:TRZ1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
@@ -97,10 +97,10 @@ class AerotechAbrStage(PSIDeviceBase, Device):
    # )

    # Status flags for all axes
-    omega_done = Component(EpicsSignalRO, "-DF1:OMEGA-DONE", kind=Kind.normal)
-    gmx_done = Component(EpicsSignalRO, "-DF1:GMX-DONE", kind=Kind.normal)
-    gmy_done = Component(EpicsSignalRO, "-DF1:GMY-DONE", kind=Kind.normal)
-    gmz_done = Component(EpicsSignalRO, "-DF1:GMZ-DONE", kind=Kind.normal)
+    omega_done = Component(EpicsSignalRO, "-DF1:OMEGA-DONE", auto_monitor=True, kind=Kind.normal)
+    gmx_done = Component(EpicsSignalRO, "-DF1:GMX-DONE", auto_monitor=True, kind=Kind.normal)
+    gmy_done = Component(EpicsSignalRO, "-DF1:GMY-DONE", auto_monitor=True, kind=Kind.normal)
+    gmz_done = Component(EpicsSignalRO, "-DF1:GMZ-DONE", auto_monitor=True, kind=Kind.normal)

    # For some reason the task interface is called PSO...
    scan_command = Component(EpicsSignal, "-PSO:CMD", put_complete=True, kind=Kind.omitted)
@@ -128,7 +128,7 @@ class AerotechAbrStage(PSIDeviceBase, Device):
    task2 = Component(EpicsSignalRO, "-AERO:TSK2-DONE", auto_monitor=True)
    task3 = Component(EpicsSignalRO, "-AERO:TSK3-DONE", auto_monitor=True)
    task4 = Component(EpicsSignalRO, "-AERO:TSK4-DONE", auto_monitor=True)
-    scan_done = Component(EpicsSignal, "-GRD:SCAN-DONE", kind=Kind.config)
+    scan_done = Component(EpicsSignal, "-GRD:SCAN-DONE", auto_monitor=True, kind=Kind.config)

    def __init__(
        self,
@@ -1,6 +0,0 @@
-# Macros
-
-This directory is intended to store macros which will be loaded automatically when starting BEC.
-Macros are small functions to make repetitive tasks easier. Functions defined in python files in this directory will be accessible from the BEC console.
-Please do not put any code outside of function definitions here. If you wish for code to be automatically run when starting BEC, see the startup script at pxiii_bec/bec_ipython_client/startup/post_startup.py
-For a guide on writing macros, please see: https://bec.readthedocs.io/en/latest/user/command_line_interface.html#how-to-write-a-macro
@@ -16,8 +16,7 @@ def alignment_fit_and_plot(
    Args:
        history_index (int): scan to fetch, e.g. -1 for the most recent scan
        device_name (str): the device for which to get the monitoring data
-        signal_name (str | None): the signal to plot, if different from the device name.
-        smoothing_sigma (float): the sigma for the Gaussian smoothing filter
+
    """
    # Fetch scan data from the history
    # by default, signal = device name, unless otherwise specified
@@ -30,9 +29,9 @@ def alignment_fit_and_plot(

    # Create a plot and a text box to display results
    dock_area = bec.gui.new()
-    wf = dock_area.new(bec.gui.available_widgets.Waveform)
+    wf = dock_area.new().new(bec.gui.available_widgets.Waveform)
    wf.title = f"Scan {md['scan_number']}: {md['scan_name']} of {motor_name}"
-    text = dock_area.new(bec.gui.available_widgets.TextBox, where="right")
+    text = dock_area.new(position="right").new(widget=bec.gui.available_widgets.TextBox)

    # Calculate some processed data and add everything to the plot
    wf.plot(data, label="Raw data")
@@ -5,18 +5,6 @@
 import time


-def _device_name(device):
-    return device.name if hasattr(device, "name") else str(device)
-
-
-def _get_or_create_scan_window(name="CurrentScan"):
-    window = bec.gui.windows.get(name)
-    if window is None:
-        return bec.gui.new(name)
-    window.delete_all()
-    return window
-
-
 def rock(steps, exp_time, scan_start=None, scan_end=None, datasource=None, visual=True, **kwargs):
    """Demo step scan with plotting

@@ -38,18 +26,22 @@ def rock(steps, exp_time, scan_start=None, scan_end=None, datasource=None, visua
        scan_end = 0.05 / dev.dccm_energy.user_readback.get()

    if visual:
-        # Get or create scan specific window.
-        window = _get_or_create_scan_window("CurrentScan")
-        motor_name = _device_name(motor)
-        datasource_name = _device_name(datasource)
+        # Get or create scan specific window
+        window = None
+        for _, val in bec.gui.windows.items():
+            if val.title == "CurrentScan":
+                window = val.widget
+                window.clear_all()
+        if window is None:
+            window = bec.gui.new("CurrentScan")

-        # Draw a waveform plot in the window.
-        plt1 = window.new(
-            bec.gui.available_widgets.Waveform, object_name=f"ScanDisplay_{motor_name}"
-        )
-        plt1.plot(device_x=motor_name, device_y=datasource_name, dap="LinearModel")
-        plt1.x_label = motor_name
-        plt1.y_label = datasource_name
+        # Draw a simploe plot in the window
+        dock = window.add_dock(f"ScanDisplay {motor}")
+        plt1 = dock.add_widget("BECWaveformWidget")
+        plt1.plot(x_name=motor, y_name=datasource)
+        plt1.set_x_label(motor)
+        plt1.set_y_label(datasource)
+        plt1.add_dap(motor, datasource, dap="LinearModel")
        window.show()

    print("Handing over to 'scans.line_scan'")
@@ -17,13 +17,14 @@ def scan_theta2(scan_start, scan_end, stepno, exp):

    # # Create a plot to display the results
    dock_area = bec.gui.new()
-    wf = dock_area.new(bec.gui.available_widgets.Waveform)
+    wf = dock_area.new().new(bec.gui.available_widgets.Waveform)
    wf.title = f"Scan of DCCM_theta2"
-    wf.plot(device_x="dccm_theta2", device_y="dccm_xbpm", label="dccm_xbpm-dccm_xbpm")
-    dap_xbpm = wf.add_dap_curve(device_label="dccm_xbpm-dccm_xbpm", dap_name="GaussianModel")
+    wf.plot(x_name='dccm_theta2', y_name='dccm_xbpm')
+    wf.add_dap_curve(device_label='dccm_xbpm-dccm_xbpm', dap_name='GaussianModel')
    print(dap_xbpm.dap_params)





+
@@ -6,18 +6,6 @@ def bl_check_beam():
    return True


-def _device_name(device):
-    return device.name if hasattr(device, "name") else str(device)
-
-
-def _get_or_create_scan_window(name="CurrentScan"):
-    window = bec.gui.windows.get(name)
-    if window is None:
-        return bec.gui.new(name)
-    window.delete_all()
-    return window
-
-
 def ascan(
    motor, scan_start, scan_end, steps, exp_time, plot=None, visual=True, relative=False, **kwargs
 ):
@@ -35,18 +23,22 @@ def ascan(
        raise RuntimeError("Beamline is not in ready state")

    if visual:
-        # Get or create scan specific window.
-        window = _get_or_create_scan_window("CurrentScan")
-        motor_name = _device_name(motor)
-        plot_name = _device_name(plot)
+        # Get or create scan specific window
+        window = None
+        for _, val in bec.gui.windows.items():
+            if val.title == "CurrentScan":
+                window = val.widget
+                window.clear_all()
+        if window is None:
+            window = bec.gui.new("CurrentScan")

-        # Draw a waveform plot in the window.
-        plt1 = window.new(
-            bec.gui.available_widgets.Waveform, object_name=f"ScanDisplay_{motor_name}"
-        )
-        plt1.plot(device_x=motor_name, device_y=plot_name, dap="LinearModel")
-        plt1.x_label = motor_name
-        plt1.y_label = plot_name
+        # Draw a simploe plot in the window
+        dock = window.add_dock(f"ScanDisplay {motor}")
+        plt1 = dock.add_widget("BECWaveformWidget")
+        plt1.plot(x_name=motor, y_name=plot)
+        plt1.set_x_label(motor)
+        plt1.set_y_label(plot)
+        plt1.add_dap(motor, plot, dap="LinearModel")
        window.show()

    print("Handing over to 'scans.line_scan'")
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 name = "pxiii_bec"
 version = "0.0.0"
 description = "A plugin repository for BEC"
-requires-python = ">=3.11"
+requires-python = ">=3.10"
 classifiers = [
    "Development Status :: 3 - Alpha",
    "Programming Language :: Python :: 3",
Author	SHA1	Message	Date
Unknown MX Person	a547225af2	BEC AutoUpdate class is not executed, but fixed A3200 status monitoring	2025-06-16 13:44:46 +02:00
Unknown MX Person	44e960062a	Added collimator and 2D auto updates	2025-06-16 11:52:02 +02:00