pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
sfop
2016-09-07 14:57:19 +02:00
parent c125d5222c
commit f25f92eb0b
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+1
View File
@@ -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
devices/CurrentCamera.properties
+1 -1
View File
@@ -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
plugins/Cameras.java
+2 -1
View File
@@ -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};
}
script/SchottkyICT.py
+3 -2
View File
@@ -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
#