diff --git a/script/jitter_scan.py b/script/jitter_scan.py index 6b80e51..25cad79 100644 --- a/script/jitter_scan.py +++ b/script/jitter_scan.py @@ -273,14 +273,32 @@ set_attribute(path, "Saturation Power", satpower) pya.setStyle(pya.Style.ErrorY) pya.setLegendVisible(True) -sy1 = LinePlotErrorSeries("saturated") -pya.addSeries(sy1) -sy1.setLinesVisible(False) -sy1.appendData(1.0, ref_jit_amplt.sat.mean, ref_jit_amplt.sat.min, ref_jit_amplt.sat.max) -sy1.appendData(2.0, iqm_jit_amplt.sat.mean, iqm_jit_amplt.sat.min, iqm_jit_amplt.sat.max) -sy1.appendData(3.0, pre_jit_amplt.sat.mean, pre_jit_amplt.sat.min, pre_jit_amplt.sat.max) -sy1.appendData(4.0, kly_jit_amplt.sat.mean, kly_jit_amplt.sat.min, kly_jit_amplt.sat.max) -sy1.appendData(5.0, vsum_jit_amplt.sat.mean, vsum_jit_amplt.sat.min, vsum_jit_amplt.sat.max) +sy1s = LinePlotErrorSeries("saturated") +pya.addSeries(sy1s) +sy1s.setLinesVisible(False) +sy1s.appendData(1.0, ref_jit_amplt.sat.mean, ref_jit_amplt.sat.min, ref_jit_amplt.sat.max) +sy1s.appendData(2.0, iqm_jit_amplt.sat.mean, iqm_jit_amplt.sat.min, iqm_jit_amplt.sat.max) +sy1s.appendData(3.0, pre_jit_amplt.sat.mean, pre_jit_amplt.sat.min, pre_jit_amplt.sat.max) +sy1s.appendData(4.0, kly_jit_amplt.sat.mean, kly_jit_amplt.sat.min, kly_jit_amplt.sat.max) +sy1s.appendData(5.0, vsum_jit_amplt.sat.mean, vsum_jit_amplt.sat.min, vsum_jit_amplt.sat.max) + +sy1m5 = LinePlotErrorSeries("drive 5% below") +pya.addSeries(sy1m5) +sy1m5.setLinesVisible(False) +sy1m5.appendData(1.1, ref_jit_amplt.m5.mean, ref_jit_amplt.m5.min, ref_jit_amplt.m5.max) +sy1m5.appendData(2.1, iqm_jit_amplt.m5.mean, iqm_jit_amplt.m5.min, iqm_jit_amplt.m5.max) +sy1m5.appendData(3.1, pre_jit_amplt.m5.mean, pre_jit_amplt.m5.min, pre_jit_amplt.m5.max) +sy1m5.appendData(4.1, kly_jit_amplt.m5.mean, kly_jit_amplt.m5.min, kly_jit_amplt.m5.max) +sy1m5.appendData(5.1, vsum_jit_amplt.m5.mean, vsum_jit_amplt.m5.min, vsum_jit_amplt.m5.max) + +sy1m10 = LinePlotErrorSeries("drive 10% below") +pya.addSeries(sy1m10) +sy1m10.setLinesVisible(False) +sy1m10.appendData(1.2, ref_jit_amplt.m10.mean, ref_jit_amplt.m10.min, ref_jit_amplt.m10.max) +sy1m10.appendData(2.2, iqm_jit_amplt.m10.mean, iqm_jit_amplt.m10.min, iqm_jit_amplt.m10.max) +sy1m10.appendData(3.2, pre_jit_amplt.m10.mean, pre_jit_amplt.m10.min, pre_jit_amplt.m10.max) +sy1m10.appendData(4.2, kly_jit_amplt.m10.mean, kly_jit_amplt.m10.min, kly_jit_amplt.m10.max) +sy1m10.appendData(5.2, vsum_jit_amplt.m10.mean, vsum_jit_amplt.m10.min, vsum_jit_amplt.m10.max) m=pya.addMarker(1.0, pya.AxisId.X, "REF",pya.background) @@ -299,14 +317,32 @@ m.setLabelPaint(Color.BLACK) pyp.setStyle(pyp.Style.ErrorY) pyp.setLegendVisible(True) -sy2 = LinePlotErrorSeries("saturated") -pyp.addSeries(sy2) -sy2.setLinesVisible(False) -sy2.appendData(1.0, ref_jit_phase.sat.mean, ref_jit_phase.sat.min, ref_jit_phase.sat.max) -sy2.appendData(2.0, iqm_jit_phase.sat.mean, iqm_jit_phase.sat.min, iqm_jit_phase.sat.max) -sy2.appendData(3.0, pre_jit_phase.sat.mean, pre_jit_phase.sat.min, pre_jit_phase.sat.max) -sy2.appendData(4.0, kly_jit_phase.sat.mean, kly_jit_phase.sat.min, kly_jit_phase.sat.max) -sy2.appendData(5.0, vsum_jit_phase.sat.mean, vsum_jit_phase.sat.min, vsum_jit_phase.sat.max) +sy2s = LinePlotErrorSeries("saturated") +pyp.addSeries(sy2s) +sy2s.setLinesVisible(False) +sy2s.appendData(1.0, ref_jit_phase.sat.mean, ref_jit_phase.sat.min, ref_jit_phase.sat.max) +sy2s.appendData(2.0, iqm_jit_phase.sat.mean, iqm_jit_phase.sat.min, iqm_jit_phase.sat.max) +sy2s.appendData(3.0, pre_jit_phase.sat.mean, pre_jit_phase.sat.min, pre_jit_phase.sat.max) +sy2s.appendData(4.0, kly_jit_phase.sat.mean, kly_jit_phase.sat.min, kly_jit_phase.sat.max) +sy2s.appendData(5.0, vsum_jit_phase.sat.mean, vsum_jit_phase.sat.min, vsum_jit_phase.sat.max) + +sy2m5 = LinePlotErrorSeries("drive 5% below") +pyp.addSeries(sy2m5) +sy2m5.setLinesVisible(False) +sy2m5.appendData(1.1, ref_jit_phase.m5.mean, ref_jit_phase.m5.min, ref_jit_phase.m5.max) +sy2m5.appendData(2.1, iqm_jit_phase.m5.mean, iqm_jit_phase.m5.min, iqm_jit_phase.m5.max) +sy2m5.appendData(3.1, pre_jit_phase.m5.mean, pre_jit_phase.m5.min, pre_jit_phase.m5.max) +sy2m5.appendData(4.1, kly_jit_phase.m5.mean, kly_jit_phase.m5.min, kly_jit_phase.m5.max) +sy2m5.appendData(5.1, vsum_jit_phase.m5.mean, vsum_jit_phase.m5.min, vsum_jit_phase.m5.max) + +sy2m10 = LinePlotErrorSeries("drive 10% below") +pyp.addSeries(sy2m10) +sy2m10.setLinesVisible(False) +sy2m10.appendData(1.2, ref_jit_phase.m10.mean, ref_jit_phase.m10.min, ref_jit_phase.m10.max) +sy2m10.appendData(2.2, iqm_jit_phase.m10.mean, iqm_jit_phase.m10.min, iqm_jit_phase.m10.max) +sy2m10.appendData(3.2, pre_jit_phase.m10.mean, pre_jit_phase.m10.min, pre_jit_phase.m10.max) +sy2m10.appendData(4.2, kly_jit_phase.m10.mean, kly_jit_phase.m10.min, kly_jit_phase.m10.max) +sy2m10.appendData(5.2, vsum_jit_phase.m10.mean, vsum_jit_phase.m10.min, vsum_jit_phase.m10.max) m=pyp.addMarker(1.0, pyp.AxisId.X, "REF",pyp.background) m.setLabelPaint(Color.BLACK) @@ -352,8 +388,8 @@ print msg # save the entry in the logbook # need some sleep before and after to allow plots to be updated and to be stored to disk time.sleep(1.0) -plot_files1 = get_plot_snapshots("Jitter Scan") -plot_files2 = get_plot_snapshots("Results Overview Jitter") +plot_files1 = get_plot_snapshots("Jitter Scan","png") +plot_files2 = get_plot_snapshots("Results Overview Jitter","png") plot_files = plot_files2 + plot_files1 time.sleep(1.0) elogllrf("Jitter Scan (HVPS="+str(hvps)[:6]+"V / "+str(rfrate)[:6]+" Hz)", msg,"Measurement", "RF Stability", SECTION, plot_files) diff --git a/script/local.py b/script/local.py index cc3856b..f3bbfd0 100755 --- a/script/local.py +++ b/script/local.py @@ -121,7 +121,7 @@ def elogllrf(subject, message, system, subsystem, section, attachments = []): print out -def get_plot_snapshots(title = None, file_type = "jpg", temp_path = controller.setup.getContextPath()): +def get_plot_snapshots(title = None, file_type = "png", temp_path = controller.setup.getContextPath()): """ Returns list with file names of plots snapshots from a plotting context. """