Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflicts with dev

Browse Source
This commit is contained in:
lemke_h
2019-05-03 11:46:15 +02:00
parent 86bfaf16dc 691cbf8e86
commit 5c9d57bc2b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eco/bernina/config.py
+1 -1
View File
@@ -138,7 +138,7 @@ components = [
{
"name": "xp",
"args": [],
"kwargs": {"Id": "SAROP21-OPPI103", "evrout": "SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP"},
"kwargs": {"Id": "SAROP21-OPPI103", "IdCTA": "SAR-CCTA-ESB", "evrout": "SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP"},
"z_und": 103,
"desc": "X-ray pulse picker",
"type": "eco.xoptics.pp:Pulsepick"
eco/xoptics/pp.py
+5 -4
View File
@@ -15,15 +15,16 @@ def addMotorRecordToSelf(self, name=None, Id=None):
print("Warning! Could not find motor {name} (Id:{Id})")
class Pulsepick:
def __init__(self, Id=None, evrout=None, name=None):
def __init__(self, Id=None, IdCTA = None, evrout=None, name=None):
self.name = name
self.alias = Alias(name)
self.evrout = evrout
self.Id = Id
self._start = PV(Id + ":seq0Ctrl-Start-I")
self._stop = PV(Id + ":seq0Ctrl-Stop-I")
self._cycles = PV(Id + ":seq0Ctrl-Cycles-I")
self.IdCTA = IdCTA
self._start = PV(self.IdCTA + ":seq0Ctrl-Start-I")
self._stop = PV(self.IdCTA + ":seq0Ctrl-Stop-I")
self._cycles = PV(self.IdCTA + ":seq0Ctrl-Cycles-I")
self._openclose = PV(self.evrout)
addMotorRecordToSelf(self, Id=self.Id + ":MOTOR_X1", name="x")
addMotorRecordToSelf(self, Id=self.Id + ":MOTOR_Y1", name="y")