A few more fixes

ophyd_devices/epics/DeviceFactory.py

@@ -9,6 +9,7 @@ import os
 import yaml
 from ophyd.ophydobj import OphydObject
 from ophyd import EpicsSignal, EpicsSignalRO, EpicsMotor
+from ophyd.sim import SynAxis, SynSignal, SynPeriodicSignal
 from ophyd.quadem import QuadEM
 import pathlib
 
@@ -23,9 +24,9 @@ from proxies import *
 fp = open(f"{path}/db/test_database.yml", "r")
 lut_db = yaml.load(fp, Loader=yaml.Loader)
 
-# Load SLS common database
+# Load SLS common database (already in DB)
-fp = open(f"{path}/db/machine_database.yml", "r")
+#fp = open(f"{path}/db/machine_database.yml", "r")
-lut_db = yaml.load(fp, Loader=yaml.Loader)
+#lut_db = yaml.load(fp, Loader=yaml.Loader)
 
 # Load beamline specific database
 bl = os.getenv('BEAMLINE_XNAME', "X12SA")
@@ -61,7 +62,10 @@ def createProxy(name: str, connect=True) -> OphydObject:
 
 
 if __name__ == "__main__":
-    pass
+    for key in lut_db:
+        print(key)
+        dut = createProxy(str(key))
+
 
 
 

ophyd_devices/epics/db/x12sa_database.yml

@@ -43,7 +43,7 @@ di2trx:
 di2try:
   desc: 'FrontEnd diaphragm 2 vertical movement'
   acquisition: {schedule: sync}
-  config: {name: di2try, prefix: 'X12SA-FE-BM2:TRY1'}
+  config: {name: di2try, prefix: 'X12SA-FE-DI2:TRY1'}
   deviceGroup: beamlineMotor
   status: {enabled: true}
   type: EpicsMotor
@@ -194,24 +194,24 @@ mopush2:
   deviceGroup: beamlineMotor
   status: {enabled: true}
   type: EpicsMotor
-monot:
+#monot:
-  desc: 'Monochromator temperature'
+#  desc: 'Monochromator temperature'
-  acquisition: {schedule: sync}
+#  acquisition: {schedule: sync}
-  config: {name: monot, read_pv: 'X12SA-OP-MO:TC3'}
+#  config: {name: monot, read_pv: 'X12SA-OP-MO:TC3'}
-  deviceGroup: monitor
+#  deviceGroup: monitor
-  status: {enabled: true}
+#  status: {enabled: true}
-  type: EpicsSignalRO
+#  type: EpicsSignalRO
 moyaw2:
   desc: 'Monochromator crystal 2 yaw movement'
   acquisition: {schedule: sync}
-  config: {name: moyaw2, prefix: 'X12SA-OP-MO:ROTY2'}
+  config: {name: moyaw2, prefix: 'X12SA-OP-MO:ROY2'}
   deviceGroup: beamlineMotor
   status: {enabled: true}
   type: EpicsMotor
 moroll2:
   desc: 'Monochromator crystal 2 roll movement'
   acquisition: {schedule: sync}
-  config: {name: moroll2, prefix: 'X12SA-OP-MO:ROTZ2'}
+  config: {name: moroll2, prefix: 'X12SA-OP-MO:ROZ2'}
   deviceGroup: beamlineMotor
   status: {enabled: true}
   type: EpicsMotor