From 0898cbc27d193a5377ffbbe609dac6a5ee5be14a Mon Sep 17 00:00:00 2001 From: kalt_r Date: Fri, 1 Jul 2016 14:43:49 +0200 Subject: [PATCH] Script execution --- script/jitter_scan.py | 46 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/script/jitter_scan.py b/script/jitter_scan.py index 09eba61..6634e08 100644 --- a/script/jitter_scan.py +++ b/script/jitter_scan.py @@ -141,18 +141,20 @@ class all_statistics_data (object): m5 = statistics_data() m10 = statistics_data() - def return_string(self, fmt_type): - # give results back as formatted string - # fmt_type 1 = phase / 0 = amplt + def return_string_amplt(self): + # give results back as formatted string for amplt ret_str = "Statistics:\tmin\tmean\tmax\tstdev" - if fmt_type = 1: - ret_str = ret_str + "\nSaturation :\t" + "%.3e" % (self.sat.min) + "\t" + "%.3e" % (self.sat.mean) + "\t" + "%.3e" % (self.sat.max) + "\t" + "%.3e" % (self.sat.stdev) - ret_str = ret_str + "\n5% out of sat :\t" + "%.3e" % (self.m5.min) + "\t" + "%.3e" % (self.m5.mean) + "\t" + "%.3e" % (self.m5.max) + "\t" + "%.3e" % (self.m5.stdev) - ret_str = ret_str + "\n10% out of sat:\t" + "%.3e" % (self.m10.min) + "\t" + "%.3e" % (self.m10.mean) + "\t" + "%.3e" % (self.m10.max) + "\t" + "%.3e" % (self.m10.stdev) - else - ret_str = ret_str + "\nSaturation :\t" + "%.3f" % (self.sat.min) + "\t" + "%.3f" % (self.sat.mean) + "\t" + "%.3f" % (self.sat.max) + "\t" + "%.3f" % (self.sat.stdev) - 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) + ret_str = ret_str + "\nSaturation :\t" + "%.3e" % (self.sat.min) + "\t" + "%.3e" % (self.sat.mean) + "\t" + "%.3e" % (self.sat.max) + "\t" + "%.3e" % (self.sat.stdev) + ret_str = ret_str + "\n5% out of sat :\t" + "%.3e" % (self.m5.min) + "\t" + "%.3e" % (self.m5.mean) + "\t" + "%.3e" % (self.m5.max) + "\t" + "%.3e" % (self.m5.stdev) + ret_str = ret_str + "\n10% out of sat:\t" + "%.3e" % (self.m10.min) + "\t" + "%.3e" % (self.m10.mean) + "\t" + "%.3e" % (self.m10.max) + "\t" + "%.3e" % (self.m10.stdev) + return ret_str + + def return_string_phase(self): + # give results back as formatted string for phase + ret_str = "Statistics:\tmin\tmean\tmax\tstdev" + ret_str = ret_str + "\nSaturation :\t" + "%.3f" % (self.sat.min) + "\t" + "%.3f" % (self.sat.mean) + "\t" + "%.3f" % (self.sat.max) + "\t" + "%.3f" % (self.sat.stdev) + 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 @@ -194,7 +196,7 @@ vsum_jit_amplt = all_statistics_data() vsum_jit_phase = all_statistics_data() # calculate statistics -ref_jit_amplt = all_statistics_calc(scan_result.getReadable(self,0)) +ref_jit_amplt = all_statistics_calc(scan_result.getReadable(0)) ref_jit_phase = all_statistics_calc(scan_result.getReadable(1)) iqm_jit_amplt = all_statistics_calc(scan_result.getReadable(2)) @@ -252,20 +254,20 @@ set_attribute(path, "HVPS", hvps) msg = "HVPS command = " + str(hvps)[:6] + "V)" msg = msg + "\n---------------------------------------------------------" -msg = msg + "\nREF amplt\n" + ref_jit_amplt.return_string(1) -msg = msg + "\n\nREF phase\n" + ref_jit_phase.return_string(0) +msg = msg + "\nREF amplt\n" + ref_jit_amplt.return_string_amplt() +msg = msg + "\n\nREF phase\n" + ref_jit_phase.return_string_phase() msg = msg + "\n---------------------------------------------------------" -msg = msg + "\nIQM amplt\n" + iqm_jit_amplt.return_string(1) -msg = msg + "\n\nIQM phase\n" + iqm_jit_phase.return_string(0) +msg = msg + "\nIQM amplt\n" + iqm_jit_amplt.return_string_amplt() +msg = msg + "\n\nIQM phase\n" + iqm_jit_phase.return_string_phase() msg = msg + "\n---------------------------------------------------------" -msg = msg + "\nPRE amplt\n" + pre_jit_amplt.return_string(1) -msg = msg + "\n\nPRE phase\n" + pre_jit_phase.return_string(0) +msg = msg + "\nPRE amplt\n" + pre_jit_amplt.return_string_amplt() +msg = msg + "\n\nPRE phase\n" + pre_jit_phase.return_string_phase() msg = msg + "\n---------------------------------------------------------" -msg = msg + "\nKLY amplt\n" + kly_jit_amplt.return_string(1) -msg = msg + "\n\nKLY phase\n" + kly_jit_phase.return_string(0) +msg = msg + "\nKLY amplt\n" + kly_jit_amplt.return_string_amplt() +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(1) -msg = msg + "\n\nVSUM phase\n" + vsum_jit_phase.return_string(0) +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)"