bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

Flaking

Browse Source
This commit is contained in:
Mohacsi Istvan 2022-11-18 16:24:23 +01:00
parent 6c2ae5c166
commit 7bb9c11249
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ophyd_devices/epics/DeviceFactory.py
View File

@ -23,17 +23,16 @@ lut_db = yaml.load(fp, Loader=yaml.Loader)
# Load beamline specific database # Load beamline specific database
bl = os.getenv("BEAMLINE_XNAME", "TESTENV") bl = os.getenv("BEAMLINE_XNAME", "TESTENV")
if bl!="TESTENV": if bl != "TESTENV":
fp = open(f"{path}/db/{bl.lower()}_database.yml", "r") fp = open(f"{path}/db/{bl.lower()}_database.yml", "r")
lut_db.update(yaml.load(fp, Loader=yaml.Loader)) lut_db.update(yaml.load(fp, Loader=yaml.Loader))
def createProxy(name: str, connect=True) -> OphydObject: def createProxy(name: str, connect=True) -> OphydObject:
""" Create an ophyd device from its alias """Create an ophyd device from its alias
Factory routine that uses the beamline database to instantiate Factory routine that uses the beamline database to instantiate
instantiate ophyd devices from their alias and pre-defined ophyd devices from their alias and pre-defined configuration.
configuration parameters.
Does nothing if the device is already an OphydObject! Does nothing if the device is already an OphydObject!
""" """
if issubclass(type(name), OphydObject): if issubclass(type(name), OphydObject):
@ -42,7 +41,7 @@ def createProxy(name: str, connect=True) -> OphydObject:
entry = lut_db[name] entry = lut_db[name]
# Yeah, using global namespace # Yeah, using global namespace
cls_candidate = globals()[entry["type"]] cls_candidate = globals()[entry["type"]]
#print(f"Class candidate: {cls_candidate}") # print(f"Class candidate: {cls_candidate}")
if issubclass(cls_candidate, OphydObject): if issubclass(cls_candidate, OphydObject):
ret = cls_candidate(**entry["config"]) ret = cls_candidate(**entry["config"])
@ -57,11 +56,7 @@ if __name__ == "__main__":
for key in lut_db: for key in lut_db:
try: try:
dut = createProxy(str(key)) dut = createProxy(str(key))
#print(f"{key}\t: {type(dut)}\t{dut.read()}") # print(f"{key}\t: {type(dut)}\t{dut.read()}")
print(f"{key}\t: {type(dut)}") print(f"{key}\t: {type(dut)}")
except Exception as ex: except Exception as ex:
print(ex) print(ex)

1
ophyd_devices/epics/devices/__init__.py
View File

@ -8,4 +8,3 @@ from .InsertionDevice import InsertionDevice
from ophyd import EpicsSignal, EpicsSignalRO, EpicsMotor from ophyd import EpicsSignal, EpicsSignalRO, EpicsMotor
from ophyd.sim import SynAxis, SynSignal, SynPeriodicSignal from ophyd.sim import SynAxis, SynSignal, SynPeriodicSignal
from ophyd.quadem import QuadEM from ophyd.quadem import QuadEM