diff --git a/script/jitter_scan.py b/script/jitter_scan.py index 0ce1aeb..4e5860f 100644 --- a/script/jitter_scan.py +++ b/script/jitter_scan.py @@ -129,7 +129,7 @@ class all_statistics_data (object): sat = statistics_data() m5 = statistics_data() m10 = statistics_data() -""" + def return_string_amplt(self): # give results back as formatted string for amplt ret_str = "Statistics:\tmin\tmean\tmax\tstdev" @@ -145,7 +145,7 @@ class all_statistics_data (object): ret_str = ret_str + "\n5% out of sat :\t" + "%.3f" % (self.m5.min) + "\t" + "%.3f" % (self.m5.mean) + "\t" + "%.3f" % (self.m5.max) + "\t" + "%.3f" % (self.m5.stdev) ret_str = ret_str + "\n10% out of sat:\t" + "%.3f" % (self.m10.min) + "\t" + "%.3f" % (self.m10.mean) + "\t" + "%.3f" % (self.m10.max) + "\t" + "%.3f" % (self.m10.stdev) return ret_str -""" + def statistics_calc(data_in): @@ -202,7 +202,6 @@ vsum_jit_phase = all_statistics_calc(scan_result.getReadable(9)) # adjust plot ranges for the color bar -""" (p0,p1,p2,p3,p4,p5,p6,p7,p8,p9) = get_plots(”Jitter Scan”) # get_plots() return the plots of the default panel a_lim = 2.0e-4 p_lim = 0.004 @@ -216,7 +215,7 @@ p6.setColorScale(0.0, a_lim) p7.setColorScale(0.0, p_lim) p8.setColorScale(0.0, a_lim) p9.setColorScale(0.0, p_lim) -""" + #Setting attributes to the scan group path = get_context().group @@ -243,7 +242,6 @@ set_attribute(path, "HVPS", hvps) # ELOG msg = "HVPS command = " + str(hvps)[:6] + "V)" -""" msg = msg + "\n---------------------------------------------------------" msg = msg + "\nREF amplt\n" + ref_jit_amplt.return_string_amplt() msg = msg + "\n\nREF phase\n" + ref_jit_phase.return_string_phase() @@ -259,7 +257,6 @@ msg = msg + "\n\nKLY phase\n" + kly_jit_phase.return_string_phase() msg = msg + "\n---------------------------------------------------------" msg = msg + "\nVSUM amplt\n" + vsum_jit_amplt.return_string_amplt() msg = msg + "\n\nVSUM phase\n" + vsum_jit_phase.return_string_phase() -""" msg = msg + "\n---------------------------------------------------------" msg = msg + "\n\nPlots axis: X-axis = Three amplitude setpoints from left to right: 10% below sat / 5% below sat / sat" msg = msg + "\nY-axis = Readback phase (with feedback closed = setpoint phase)"