diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index 84b3596..6c00117 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -31,10 +31,11 @@ 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) +from ImageStats import * +add_device(ImageStats("camtool", simulated_source), True) +camtool.setNumberOfImages(max(number_images,1)) +camtool.enableBackground (use_background) if use_background: laser_off() if not multiple_background: @@ -71,8 +72,7 @@ if not multiple_background: 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 = [avx, avy, avx.variance, avy.variance] + sensors = [camtool.com_x_mean, camtool.com_y_mean, camtool.com_x_stdev, camtool.com_y_stdev] 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)