From f25f92eb0b7d847c98887c9435d935f65604be2c Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 7 Sep 2016 14:57:19 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 1 + devices/CurrentCamera.properties | 2 +- plugins/Cameras.java | 3 ++- script/SchottkyICT.py | 5 +++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 1f6bf0d..23801a9 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,3 +1,4 @@ +SINEG01-DBPM340:Q=ch.psi.pshell.device.Averager|SINEG01-DBPM340:Q|||true gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSYS:GET-BEAM-PHASE|||true #SINSB01_phase=ch.psi.pshell.epics.Positioner|VA-SINSB01-RSYS100:SET-BEAM-PHASE VA-SINSB01-RSYS100:GET-BEAM-PHASE|||true diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 9a1854b..a38762f 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Mon Sep 05 17:37:11 CEST 2016 +#Wed Sep 07 14:25:45 CEST 2016 colormap=Temperature colormapAutomatic=true colormapMax=2475.851 diff --git a/plugins/Cameras.java b/plugins/Cameras.java index d1383b1..0d0493e 100644 --- a/plugins/Cameras.java +++ b/plugins/Cameras.java @@ -306,6 +306,7 @@ public class Cameras extends Panel { int[] y = new int[x.length]; for (int i = 0; i < x.length; i++) { y[i] = (int) (img.getHeight() - 1 - (((double) fit[i]) / 255 / factor)/2); +System.out.println("x=" + x[i] , "y=" + y[i], "f=" + fit[i]); } vpoly = new Overlays.Polyline(fitPen, x, y); } @@ -354,7 +355,7 @@ double[] fitGaussianScript(int[] y, int[] x){ if ((ret!=null) && (ret.size()==1)&& (ret.get(0) instanceof List) && (((List)(ret.get(0))).size()==3)){ double norm = (Double) ((List)ret.get(0)).get(0); double mean = (Double) ((List)ret.get(0)).get(1); - double sigma = (Double) ((List)ret.get(0)).get(2); + double sigma = (Double) ((List)ret.get(0)).get(2); System.out.println("! " + norm + " " + mean + " " + sigma) ; return new double[]{norm, mean, sigma}; } diff --git a/script/SchottkyICT.py b/script/SchottkyICT.py index b15d327..f119958 100644 --- a/script/SchottkyICT.py +++ b/script/SchottkyICT.py @@ -10,11 +10,12 @@ import datetime -knob = Channel("SINeg01-RSYS:SET-BEAM-PHASE", 'd', alias = "RF phase") +knob = Channel("SINEG01-RSYS:SET-BEAM-PHASE", 'd', alias = "RF phase") instrument = Channel("SINEG01-DICT215:CHARGE", 'd', alias = "Bunch Charge (ICT)") -lscan(knob, [instrument], -120., 60., 10.,0.1) +lscan(knob, [instrument], -120., 60., 10.,2.0) +#elog("Title", "" , get_plot_snapshots()) #use_bpm = True #