minor config updates

csaxs_bec/device_configs/bl_optics_hutch.yaml

@@ -68,18 +68,21 @@ ccmx:
   - cSAXS
   - optics
 
-# ccm_energy:
-#   readoutPriority: baseline
-#   deviceClass: ophyd_devices.devices.simple_positioner.PSIPositionerBase
-#     prefix: "X12SA-OP-CCM1:"
-#     override_suffixes:
-#       user_readback: "ENERGY-GET"
-#       user_setpoint: "ENERGY-SET"
-#       velocity: "ROTY:VELO"
-#   deviceTags:
-#   - user motors
-#   enabled: true
-#   readOnly: false
+# TODO: motion does not stop at end of movement. Issue with device class
+ccm_energy:
+  readoutPriority: baseline
+  deviceClass: ophyd_devices.devices.simple_positioner.PSISimplePositioner
+  deviceConfig:
+    prefix: "X12SA-OP-CCM1:"
+    override_suffixes:
+      user_readback: "ENERGY-GET"
+      user_setpoint: "ENERGY-SET"
+      velocity: "ROTY.VELO"
+      motor_done_move: "ROTY.DMOV"
+  deviceTags:
+  - user motors
+  enabled: true
+  readOnly: false
 
 
 

csaxs_bec/device_configs/main.yaml

@@ -1,8 +1,8 @@
 # This is the main configuration file that is
 # commented or uncommented according to the type of experiment
 
-# optics:
-#   - !include ./bl_optics_hutch.yaml
+optics:
+  - !include ./bl_optics_hutch.yaml
 
 # frontend:
 #   - !include ./bl_frontend.yaml
@@ -10,8 +10,8 @@
 endstation:
   - !include ./bl_endstation.yaml
 
-# detectors:
-#   - !include ./bl_detectors.yaml
+detectors:
+  - !include ./bl_detectors.yaml
 
 #sastt:
 #  - !include ./sastt.yaml

csaxs_bec/device_configs/ptycho_flomni.yaml

@@ -534,6 +534,7 @@ omny_panda:
       INENC4.VAL.Max: interf_st_rotx_max
       INENC4.VAL.Mean: interf_st_rotx_mean
       INENC4.VAL.Min: interf_st_rotx_min
+      PCAP.GATE_DURATION.Value: pcap_gate_duration_value
   deviceTags:
     - detector
   enabled: true

csaxs_bec/file_writer/csaxs_nexus.py

@@ -3,6 +3,15 @@ from __future__ import annotations
 import numpy as np
 from bec_server.file_writer.default_writer import DefaultFormat
 
+#there should be entry/sample, sample name not added to entry, this should have the positions
+#start and end time of scan
+#scan command and parameters
+#slit width and rio to config file
+#filter set from filtrans device
+#ptycho entry with sample, scan position, detector data
+#monochromator
+#check enable out of detector
+#funny namings down there
 
 class cSAXSNeXusFormat(DefaultFormat):
     """
@@ -432,7 +441,7 @@ class cSAXSNeXusFormat(DefaultFormat):
         # ── Flomni sample / nano-positioning stage ─────────────────────────────
         flomni = instrument.create_group("flomni_stage")
         flomni.attrs["NX_class"] = "NXpositioner"
-        flomni.attrs["description"] = "Flomni nano-positioning sample stage (OMNYfluoX)"
+        flomni.attrs["description"] = "Flomni nano-positioning sample stage"
         self._safe_dataset(flomni, "x",     "fsamx",   units="mm")
         self._safe_dataset(flomni, "y",     "fsamy",   units="mm")
         self._safe_dataset(flomni, "rot_y", "fsamroy", units="degrees")