This commit is contained in:
gac-x06da
2025-03-14 16:10:16 +01:00
parent 74521da7b3
commit 29ae5c196b
4 changed files with 9 additions and 8 deletions

View File

@@ -97,4 +97,4 @@ class PlotUpdate(AutoUpdates):
# self.run_grid_scan_update(info) # self.run_grid_scan_update(info)
# return # return
super().handler(info) super().handler(info)
self.plot_handler(info) self.plot_handler(info)

View File

@@ -47,7 +47,7 @@ sldi_sizex:
softwareTrigger: false softwareTrigger: false
sldi_ceny: sldi_ceny:
description: FE slit-diaphragm vertical center description: FE slit-diaphragm vertical center
deviceClass: ophyd.EpicsMotor deviceClass: ophyd_devices.EpicsMotorEC
deviceConfig: {prefix: 'X06DA-FE-SLDI:CENY'} deviceConfig: {prefix: 'X06DA-FE-SLDI:CENY'}
onFailure: buffer onFailure: buffer
enabled: true enabled: true

View File

@@ -13,7 +13,7 @@ def ascan(
scan_end, scan_end,
steps, steps,
exp_time, exp_time,
datasource=None, plot=None,
visual=True, visual=True,
relative=False, relative=False,
**kwargs, **kwargs,
@@ -44,10 +44,10 @@ def ascan(
# Draw a simploe plot in the window # Draw a simploe plot in the window
dock = window.add_dock(f"ScanDisplay {motor}") dock = window.add_dock(f"ScanDisplay {motor}")
plt1 = dock.add_widget("BECWaveformWidget") plt1 = dock.add_widget("BECWaveformWidget")
plt1.plot(x_name=motor, y_name=datasource) plt1.plot(x_name=motor, y_name=plot)
plt1.set_x_label(motor) plt1.set_x_label(motor)
plt1.set_y_label(datasource) plt1.set_y_label(plot)
plt1.add_dap(motor, datasource, dap="LinearModel") plt1.add_dap(motor, plot, dap="LinearModel")
window.show() window.show()
print("Handing over to 'scans.line_scan'") print("Handing over to 'scans.line_scan'")
@@ -57,7 +57,7 @@ def ascan(
scan_end, scan_end,
steps=steps, steps=steps,
exp_time=exp_time, exp_time=exp_time,
datasource=datasource, plot=plot,
relative=relative, relative=relative,
**kwargs, **kwargs,
) )
@@ -68,7 +68,7 @@ def ascan(
else: else:
# Fitting without GUI # Fitting without GUI
firt_par = bec.dap.LinearModel.fit( firt_par = bec.dap.LinearModel.fit(
s, motor.name, motor.name, datasource.name, datasource.name s, motor.name, motor.name, plot.name, plot.name
) )
# # Some basic fit # # Some basic fit

View File

@@ -16,6 +16,7 @@ dependencies = [
"bec_ipython_client", "bec_ipython_client",
"bec_lib", "bec_lib",
"bec_server", "bec_server",
"bec_widgets",
"ophyd_devices", "ophyd_devices",
"std_daq_client", "std_daq_client",
"rich", "rich",