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

Browse Source
This commit is contained in:
root
2017-12-14 16:35:05 +01:00
parent a2928d0eb3
commit 84ba6b2878
8 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+1 -1
View File
@@ -5,7 +5,7 @@ virtual_accelerator_read=ch.psi.pshell.epics.ChannelDouble|VA-SINBC01-DBPM100:X1
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
stream=ch.psi.pshell.bs.Stream|dispatcher|||true
stream=ch.psi.pshell.bs.Stream||||true
#ref10=ch.psi.pshell.bs.Scalar|stream SINEG01-RLLE-REF10:SIG-PHASE-AVG 10|||
#ref20=ch.psi.pshell.bs.Scalar|stream SINEG01-RLLE-REF20:SIG-PHASE-AVG 10|||
#pup10=ch.psi.pshell.bs.Scalar|stream SINEG01-RGUN-PUP10:SIG-AMPLT-AVG 10|||
devices/Beam phase.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Mon Dec 04 09:50:29 CET 2017
#Fri Dec 08 14:08:46 CET 2017
maxValue=360.0
minValue=-360.0
offset=0.0
devices/CurrentCamera.properties
+13 -12
View File
@@ -1,19 +1,19 @@
#Mon Dec 04 19:58:20 CET 2017
#Thu Dec 14 13:16:37 CET 2017
\u0000\u0000\u0000\u0000=
\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000=
\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000=
colormap=Flame
colormapAutomatic=false
colormapMax=3909.451
colormapAutomatic=true
colormapMax=2098.0
colormapMin=0.0
flipHorizontally=false
flipVertically=false
grayscale=false
imageHeight=494
imageWidth=659
imageHeight=2160
imageWidth=2560
invert=false
regionStartX=0
regionStartY=0
regionStartX=1
regionStartY=1
rescaleFactor=1.0
rescaleOffset=0.0
roiHeight=-1
@@ -24,9 +24,10 @@ rotation=0.0
rotationCrop=false
scale=1.0
serverURL=localhost\:10000
spatialCalOffsetX=-385.58509787098683
spatialCalOffsetY=-249.50507086514602
spatialCalScaleX=-14.362775530133929
spatialCalScaleY=-11.5606939536321
spatialCalUnits=
spat=
spatialCalOffsetX=-152.54092616500228
spatialCalOffsetY=-487.4298187797324
spatialCalScaleX=-8.737659603675489
spatialCalScaleY=-8.834898016879965
spatialCalUnits=null
transpose=false
devices/c.properties
+24
View File
@@ -0,0 +1,24 @@
#Wed Dec 13 12:04:31 CET 2017
colormap=Grayscale
colormapAutomatic=true
colormapMax=NaN
colormapMin=NaN
flipHorizontally=false
flipVertically=false
grayscale=false
invert=false
rescaleFactor=1.0
rescaleOffset=0.0
roiHeight=-1
roiWidth=-1
roiX=0
roiY=0
rotation=0.0
rotationCrop=false
scale=1.0
spatialCalOffsetX=-677.5082585941401
spatialCalOffsetY=-627.4707187276099
spatialCalScaleX=-8.737659534534535
spatialCalScaleY=-8.834897886167417
spatialCalUnits=mm
transpose=false
devices/cam_server.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Mon Dec 04 09:40:04 CET 2017
#Thu Dec 14 08:06:46 CET 2017
colormap=Flame
colormapAutomatic=true
colormapMax=NaN
plugins/ScreenPanel.java
+17 -4
View File
@@ -123,6 +123,7 @@ public class ScreenPanel extends Panel {
boolean goodRegion;
boolean slicing;
String serverUrl;
String camServerUrl;
String instanceName;
Double getServerDouble(String name) {
@@ -271,6 +272,11 @@ public class ScreenPanel extends Panel {
serverUrl = App.getArgumentValue("srv_url");
}
if (App.hasArgument("cam_srv_url")) {
camServerUrl = App.getArgumentValue("cam_srv_url");
}
if (App.hasArgument("calc")) {
useServerStats = false;
}
@@ -546,7 +552,14 @@ public class ScreenPanel extends Panel {
final Object lockOverlays = new Object();
void manageFit(BufferedImage bi, Data data) {
Overlay[][] fo = ((bi == null) || ((!showFit && !showProfile))) ? null : getFitOverlays(data);
Overlay[][] fo = null;
if ((showFit && showProfile)){
try{
fo=getFitOverlays(data);
} catch (Exception ex){
System.err.println(ex);
}
}
synchronized (lockOverlays) {
fo = (fo == null) ? new Overlay[][]{null, null} : fo;
renderer.updateOverlays(fo[0], profileOv);
@@ -1048,7 +1061,7 @@ public class ScreenPanel extends Panel {
int width = data.getWidth();
PointDouble[] sliceCenters = null;
//Double xCom=null, yCom=null;
if (data != null) {
if (data != null) {
int profileSize = renderer.getProfileSize();
if ((useServerStats) && (server != null)) {
try {
@@ -2815,8 +2828,8 @@ public class ScreenPanel extends Panel {
try {
if (camera != null) {
String cameraConfigJson = null;
if (usingServer) {
String cameraServerUrl = server.getUrl().substring(0, server.getUrl().length() - 1) + "8";
if (usingServer) {
String cameraServerUrl = (camServerUrl==null) ? server.getUrl().substring(0, server.getUrl().length() - 1) + "8": camServerUrl;
try (CameraServer srv = new CameraServer("CamServer", cameraServerUrl)) {
srv.initialize();
//TODO: replace into encodeMultiline
plugins/WireScan.java
+1 -2
View File
@@ -302,8 +302,7 @@ public class WireScan extends Panel {
dev.setMonitored(true);
dev.initialize();
DeviceValueChart chart = new DeviceValueChart();
JDialog dlg = SwingUtils.showDialog((Window)this.getTopLevel(), blm, new Dimension(600,400), chart);
chart = null;
JDialog dlg = SwingUtils.showDialog((Window)this.getTopLevel(), blm, new Dimension(600,400), chart);
chart.setDevice(dev);
dlg.addWindowListener(new WindowAdapter() {
@Override
script/RFscan/GunEnergyScanSet.py
+2 -2
View File
@@ -8,9 +8,9 @@ else:
bph_ref_user = args[0]
plt = args[1]
phase_offset_old = caget("SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE")
phase_offset_new = 90 - bph_ref_user + phaseOffset_old
phase_offset_new = 90 - bph_ref_user + phase_offset_old
if not dry_run:
caput("SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE", phaseOffset_new)
caput("SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE", phase_offset_new)
caput("SINEG01-RSYS:CMD-LOAD-CALIB-BEAM", 1)
if do_elog:
log_msg = "SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE: %0.2f" % phase_offset_new + " deg (was %0.2f" % phase_offset_old + " deg)\n"