WIP
This commit is contained in:
@@ -97,4 +97,4 @@ class PlotUpdate(AutoUpdates):
|
||||
# self.run_grid_scan_update(info)
|
||||
# return
|
||||
super().handler(info)
|
||||
self.plot_handler(info)
|
||||
self.plot_handler(info)
|
||||
|
||||
@@ -47,7 +47,7 @@ sldi_sizex:
|
||||
softwareTrigger: false
|
||||
sldi_ceny:
|
||||
description: FE slit-diaphragm vertical center
|
||||
deviceClass: ophyd.EpicsMotor
|
||||
deviceClass: ophyd_devices.EpicsMotorEC
|
||||
deviceConfig: {prefix: 'X06DA-FE-SLDI:CENY'}
|
||||
onFailure: buffer
|
||||
enabled: true
|
||||
|
||||
@@ -13,7 +13,7 @@ def ascan(
|
||||
scan_end,
|
||||
steps,
|
||||
exp_time,
|
||||
datasource=None,
|
||||
plot=None,
|
||||
visual=True,
|
||||
relative=False,
|
||||
**kwargs,
|
||||
@@ -44,10 +44,10 @@ def ascan(
|
||||
# Draw a simploe plot in the window
|
||||
dock = window.add_dock(f"ScanDisplay {motor}")
|
||||
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_y_label(datasource)
|
||||
plt1.add_dap(motor, datasource, dap="LinearModel")
|
||||
plt1.set_y_label(plot)
|
||||
plt1.add_dap(motor, plot, dap="LinearModel")
|
||||
window.show()
|
||||
|
||||
print("Handing over to 'scans.line_scan'")
|
||||
@@ -57,7 +57,7 @@ def ascan(
|
||||
scan_end,
|
||||
steps=steps,
|
||||
exp_time=exp_time,
|
||||
datasource=datasource,
|
||||
plot=plot,
|
||||
relative=relative,
|
||||
**kwargs,
|
||||
)
|
||||
@@ -68,7 +68,7 @@ def ascan(
|
||||
else:
|
||||
# Fitting without GUI
|
||||
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
|
||||
|
||||
@@ -16,6 +16,7 @@ dependencies = [
|
||||
"bec_ipython_client",
|
||||
"bec_lib",
|
||||
"bec_server",
|
||||
"bec_widgets",
|
||||
"ophyd_devices",
|
||||
"std_daq_client",
|
||||
"rich",
|
||||
|
||||
Reference in New Issue
Block a user