Closedown
This commit is contained in:
@@ -32,9 +32,9 @@ print "Parameters: ", I1, I2, dI, settling_time, plot_image, number_images, use_
|
||||
plot_name = datetime.datetime.fromtimestamp(time.time()).strftime('%H%M%S')
|
||||
|
||||
|
||||
add_device(CamTool("camtool") , True)
|
||||
camtool.setNumberOfImages(max(number_images,1))
|
||||
camtool.enableBackground (use_background)
|
||||
#add_device(CamTool("camtool") , True)
|
||||
#camtool.setNumberOfImages(max(number_images,1))
|
||||
#camtool.enableBackground (use_background)
|
||||
if use_background:
|
||||
laser_off()
|
||||
if not multiple_background:
|
||||
@@ -68,9 +68,11 @@ def after_sample():
|
||||
r = None
|
||||
if not multiple_background:
|
||||
laser_on()
|
||||
|
||||
try:
|
||||
#sensors = [camtool.com_x, camtool.com_y]
|
||||
sensors = [camtool.com_x_mean, camtool.com_y_mean, camtool.com_x_stdev, camtool.com_y_stdev]
|
||||
#sensors = [camtool.com_x_mean, camtool.com_y_mean, camtool.com_x_stdev, camtool.com_y_stdev]
|
||||
sensors = [avx, avy, avx.variance, avy.variance]
|
||||
if plot_image:
|
||||
sensors.append(camtool.image)
|
||||
r = lscan(gun_solenoid, sensors , I1, I2, dI, settling_time, before_read = before_sample, after_read = after_sample)
|
||||
|
||||
Reference in New Issue
Block a user