forked from zietzm/Helmholtz_Test_Bench
Added compensate field checkbox, minor adaptation
This commit is contained in:
@@ -71,6 +71,8 @@ class ExecCSVThread(Thread):
|
||||
all_connected = (parent.xy_override.get() or g.CAGE_DEVICE.psu1 is not None) and\
|
||||
(parent.z_override.get() or g.CAGE_DEVICE.psu2 is not None) and\
|
||||
(parent.arduino_override.get() or g.CAGE_DEVICE.arduino is not None)
|
||||
compensate_field = parent.compensated_field_var.get()
|
||||
|
||||
# True or False depending on devices status, checks for some devices may be overridden by user
|
||||
if not all_connected:
|
||||
ui_print("Required devices are not present, sequence aborted.")
|
||||
@@ -96,8 +98,10 @@ class ExecCSVThread(Thread):
|
||||
field_vec[1] * 1e6,
|
||||
field_vec[2] * 1e6,
|
||||
target_t))
|
||||
self.cage_dev.set_field_compensated(field_vec) # send field vector to test bench
|
||||
|
||||
if compensate_field:
|
||||
self.cage_dev.set_field_compensated(field_vec) # send field vector to test bench
|
||||
else:
|
||||
self.cage_dev.set_field_raw(field_vec) # send field vector to test bench
|
||||
# log change to the log file if user has selected event logging in the Configure Logging window
|
||||
logger = controller.pages[ui.ConfigureLogging] # get object of logging configurator
|
||||
if logger.event_logging: # data should be logged when test bench is commanded
|
||||
|
||||
Reference in New Issue
Block a user