Reassigned XFM stages to PVs used on SRX control system

Setup zebra to send pulses for xs4 on TTL4
NSLS-II-SRX · Dec 4, 2019 · ef9d070 · ef9d070
1 parent de60a6e
commit ef9d070
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/startup/07-tempstages.py b/startup/07-tempstages.py
@@ -10,4 +10,5 @@ class XFMstage(Device):
     z = Cpt(EpicsMotor, 'Z}Mtr')
 
 
-stage = XFMstage('XF:05IDD-ES:1{Stg:XFM1-Ax:', name='stage')
+# stage = XFMstage('XF:05IDD-ES:1{Stg:XFM1-Ax:', name='stage')
+stage = XFMstage('XF:05IDD-ES:1{Mscp:1-Ax:', name='stage')
diff --git a/startup/91-flyscans.py b/startup/91-flyscans.py
@@ -132,9 +132,9 @@ def __init__(self, encoder, dets, sclr1, fast_axis, *, reg=db.reg, **kwargs):
         # this is for the merlin
         self.stage_sigs[self._encoder.output2.ttl.addr] = 53
         # this is for the dexela
-        self.stage_sigs[self._encoder.output4.ttl.addr] = 55
+        # self.stage_sigs[self._encoder.output4.ttl.addr] = 55
         # this is for the xs2
-        # self.stage_sigs[self._encoder.output4.ttl.addr] = 31
+        self.stage_sigs[self._encoder.output4.ttl.addr] = 31
 
         self.stage_sigs[self._encoder.pc.enc_pos1_sync] = 1
         self.stage_sigs[self._encoder.pc.enc_pos2_sync] = 1