add minor cahnges to simulated devices

beamlinetools/BEAMLINE_CONFIG/beamline.py

@@ -94,22 +94,22 @@ from beamlinetools.devices.mca_old import xMap
 
 from .base import RE
 from ophyd_async.core import DeviceCollector
-from secop_ophyd.SECoPDevices import SECoP_Node_Device
+from secop_ophyd.SECoPDevices import SECoPNodeDevice
 import asyncio
 from beamlinetools.devices.genNodeClass import Reactor_cell, Gas_dosing
 from pprint import pprint
 
 # relative path to directory where generated Module should be stored
-genCodeDir = "beamlinetools/devices"
+#genCodeDir = "/opt/bluesky/beamlinetools/devices"
 
 #  # Connect to Gas Dosing SEC Node and generate ophyd device trees
-gas_d = SECoP_Node_Device.create('localhost','10800',RE.loop)
+gas_d = SECoPNodeDevice.create('localhost','10800',RE.loop)
 
 # # Connect to Reactor Cell SEC Node and generate ophyd device tree
-reactor_c = SECoP_Node_Device.create('localhost','10801',RE.loop)
+reactor_c = SECoPNodeDevice.create('localhost','10801',RE.loop)
 
-gas_d.class_from_instance(genCodeDir)
-reactor_c.class_from_instance(genCodeDir)
+gas_d.class_from_instance()
+reactor_c.class_from_instance()
 
 reactor_c:Reactor_cell = reactor_c 
 gas_d:Gas_dosing = gas_d

beamlinetools/devices/genNodeClass.py

-from secop_ophyd.SECoPDevices import SECoP_CMD_Device, SECoPReadableDevice, SECoPMoveableDevice, SECoP_Node_Device 
+from secop_ophyd.SECoPDevices import SECoPCMDDevice, SECoPReadableDevice, SECoPMoveableDevice, SECoPNodeDevice 
 from ophyd_async.core.signal import SignalR, SignalRW 
 
 
@@ -14,8 +14,8 @@ class MassflowController(SECoPMoveableDevice):
     ramp: SignalRW
     gastype: SignalR
     tolerance: SignalR
-    stop_CMD: SECoP_CMD_Device
-    test_cmd_CMD: SECoP_CMD_Device
+    stop_CMD: SECoPCMDDevice
+    test_cmd_CMD: SECoPCMDDevice
 
 
 class PressureController(SECoPMoveableDevice):
@@ -29,7 +29,7 @@ class PressureController(SECoPMoveableDevice):
     target: SignalRW
     ramp: SignalRW
     tolerance: SignalR
-    stop_CMD: SECoP_CMD_Device
+    stop_CMD: SECoPCMDDevice
 
 
 class TemperatureController(SECoPMoveableDevice):
@@ -43,7 +43,7 @@ class TemperatureController(SECoPMoveableDevice):
     target: SignalRW
     ramp: SignalRW
     tolerance: SignalR
-    stop_CMD: SECoP_CMD_Device
+    stop_CMD: SECoPCMDDevice
 
 
 class TemperatureSensor(SECoPReadableDevice):
@@ -55,10 +55,10 @@ class TemperatureSensor(SECoPReadableDevice):
     features: SignalR
     value: SignalR
     heat_flux: SignalRW
-    stop_CMD: SECoP_CMD_Device
+    stop_CMD: SECoPCMDDevice
 
 
-class Gas_dosing(SECoP_Node_Device):
+class Gas_dosing(SECoPNodeDevice):
     equipment_id: SignalR
     firmware: SignalR
     version: SignalR
@@ -70,7 +70,7 @@ class Gas_dosing(SECoP_Node_Device):
     backpressure_contr1: PressureController
 
 
-class Reactor_cell(SECoP_Node_Device):
+class Reactor_cell(SECoPNodeDevice):
     equipment_id: SignalR
     firmware: SignalR
     version: SignalR