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

Added to ini files

Browse Source
This commit is contained in:
Mohacsi Istvan 2022-11-29 17:10:31 +01:00
parent f3a14ab8b4
commit 60708d54cb
5 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ophyd_devices/epics/__init__.py
View File

@ -7,6 +7,7 @@ from .devices.DelayGeneratorDG645 import DelayGeneratorDG645
from .devices.InsertionDevice import InsertionDevice from .devices.InsertionDevice import InsertionDevice
from .devices.slits import SlitH, SlitV from .devices.slits import SlitH, SlitV
from .devices.specMotors import ( from .devices.specMotors import (
Bpm4i,
EnergyKev, EnergyKev,
GirderMotorPITCH, GirderMotorPITCH,
GirderMotorROLL, GirderMotorROLL,

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

@ -3,20 +3,20 @@ from .slits import SlitH, SlitV
from .XbpmBase import XbpmBase, XbpmCsaxsOp from .XbpmBase import XbpmBase, XbpmCsaxsOp
from .SpmBase import SpmBase from .SpmBase import SpmBase
from .InsertionDevice import InsertionDevice from .InsertionDevice import InsertionDevice
from .specMotors import ( from .devices.specMotors import (
PmMonoBender, Bpm4i,
PmDetectorRotation, EnergyKev,
GirderMotorPITCH,
GirderMotorROLL,
GirderMotorX1, GirderMotorX1,
GirderMotorY1, GirderMotorY1,
GirderMotorROLL,
GirderMotorYAW, GirderMotorYAW,
GirderMotorPITCH,
MonoTheta1, MonoTheta1,
MonoTheta2, MonoTheta2,
EnergyKev, PmDetectorRotation,
PmMonoBender,
) )
# Standard ophyd classes # Standard ophyd classes
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

14
ophyd_devices/epics/devices/specMotors.py
View File

@ -20,11 +20,9 @@ from ophyd import (
Device, Device,
Signal, Signal,
Component, Component,
DynamicDeviceComponent,
Kind, Kind,
) )
from ophyd.pseudopos import pseudo_position_argument, real_position_argument from ophyd.pseudopos import pseudo_position_argument, real_position_argument
from ophyd.utils.epics_pvs import data_type
class PmMonoBender(PseudoPositioner): class PmMonoBender(PseudoPositioner):
@ -149,12 +147,6 @@ class VirtualEpicsSignalRO(EpicsSignalRO):
raw = super().get(*args, **kwargs) raw = super().get(*args, **kwargs)
return self.calc(raw) return self.calc(raw)
# def describe(self):
# val = self.get()
# d = super().describe()
# d[self.name]["dtype"] = data_type(val)
# return d
class MonoTheta1(VirtualEpicsSignalRO): class MonoTheta1(VirtualEpicsSignalRO):
"""Converts the pusher motor position to theta angle""" """Converts the pusher motor position to theta angle"""
@ -237,7 +229,11 @@ class Bpm4i(Device):
ch2 = Component(EpicsSignalRO, "S3", auto_monitor=True, kind=Kind.omitted, name="ch2") ch2 = Component(EpicsSignalRO, "S3", auto_monitor=True, kind=Kind.omitted, name="ch2")
ch3 = Component(EpicsSignalRO, "S4", auto_monitor=True, kind=Kind.omitted, name="ch3") ch3 = Component(EpicsSignalRO, "S4", auto_monitor=True, kind=Kind.omitted, name="ch3")
ch4 = Component(EpicsSignalRO, "S5", auto_monitor=True, kind=Kind.omitted, name="ch4") ch4 = Component(EpicsSignalRO, "S5", auto_monitor=True, kind=Kind.omitted, name="ch4")
sum = Component(CurrentSum, kind=Kind.hinted, name="sum",) sum = Component(
CurrentSum,
kind=Kind.hinted,
name="sum",
)
if __name__ == "__main__": if __name__ == "__main__":