diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index c55924e..4a22b79 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -72,13 +72,19 @@ r = None if not multiple_background: laser_on() -try: +try: if mode != "camtool": sensors = [image_stats.com_x_mean, image_stats.com_y_mean, image_stats.com_x_stdev, image_stats.com_y_stdev] else: - sensors = [CamtoolValue("gr_x_fit_mean"), CamtoolValue("gr_y_fit_mean"), CamtoolValue("gr_x_fit_standard_deviation"), CamtoolValue("gr_y_fit_standard_deviation")] + #sensors = [CamtoolValue("gr_x_fit_mean"), CamtoolValue("gr_y_fit_mean"), CamtoolValue("gr_x_fit_standard_deviation"), CamtoolValue("gr_y_fit_standard_deviation")] + sensors = [] + for ident in ["gr_x_fit_mean", "gr_y_fit_mean", "gr_x_fit_standard_deviation", "gr_y_fit_standard_deviation"]: + child = s.getChild(ident) + av = create_averager(child, number_images, -1) + av.monitored = True + sensors.append(av) if plot_image and (mode == "camtool"): - sensors.append(CamtoolImage()) + sensors.append(camtool.getDataMatrix()) #sensors.append(CamtoolImage()) r = lscan(gun_solenoid, sensors , I1, I2, dI, settling_time, before_read = before_sample, after_read = after_sample) finally: #laser_off()