ECMC virtal energy motors

pxiii_bec/device_configs/x06da_device_config.yaml

@@ -32,7 +32,7 @@ dccm_pitch1:
   softwareTrigger: false
 dccm_energy1:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:ENERGY1'}
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:_ENERGY1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -56,7 +56,7 @@ dccm_pitch2:
   softwareTrigger: false
 dccm_energy2:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-OP-DCCM:ENERGY2'}
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:_ENERGY2'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored

pxiii_bec/devices/aeroA3200.py

@@ -43,7 +43,7 @@ class A3200Axis(PVPositioner):
         # Before moving, ensure we can stop (if a stop_signal is configured).
         if self.stop_signal is not None:
             self.stop_signal.wait_for_connection()
-        status = super(self).move(position=distance, timeout=timeout, moved_cb=moved_cb)
+        status = super().move(position=distance, timeout=timeout, moved_cb=moved_cb)
 
         has_done = self.done is not None
         if not has_done:
@@ -62,7 +62,7 @@ class A3200Axis(PVPositioner):
 
         return status
 
-    def rock(self, distance, counts: int, velocity=None, acceleration=None, wait=True) -> Status:
+    def rock(self, distance, counts: int, velocity=None, wait=True) -> Status:
         """ Repeated single axis zigzag scan I guess PSO should be configured for this"""
 
         self._rock_dist.put(distance)
@@ -73,7 +73,7 @@ class A3200Axis(PVPositioner):
         #    self._rock_accel.put(acceleration)
         self._rock.put(1)
 
-        status = super(PVPositioner, self).move(position=distance)
+        status = super().move(position=distance)
         if wait:
             status.wait()
         return status
@@ -83,4 +83,3 @@ class A3200Axis(PVPositioner):
 if __name__ == "__main__":
     omega = A3200Axis(prefix="X06DA-ES-DF1:OMEGA", name="omega")
     omega.wait_for_connection()
-