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-11-04 11:42:56 +01:00
parent caaaebde8d
commit 995f1738ed
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/jcae.properties
View File

@@ -1,8 +1,8 @@
#Fri Sep 09 17:52:49 CEST 2016
#Fri Nov 04 11:42:44 CET 2016
ch.psi.jcae.ContextFactory.addressList=172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.120.255
ch.psi.jcae.ContextFactory.maxArrayBytes=50000000
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ChannelFactory.timeout=500
ch.psi.jcae.ChannelFactory.timeout=1000
ch.psi.jcae.impl.DefaultChannelService.retries=4
ch.psi.jcae.impl.DefaultChannelService.timeout=1000
ch.psi.jcae.ContextFactory.serverPort=

4
devices/CurrentCamera.properties
View File

@@ -1,10 +1,10 @@
#Fri Nov 04 11:28:30 CET 2016
#Fri Nov 04 11:36:17 CET 2016
colormap=Temperature
colormapAutomatic=true
colormapMax=0.0
colormapMin=0.0
flipHorizontally=false
flipVertically=true
flipVertically=false
grayscale=false
imageHeight=1200
imageWidth=1246

2
plugins/ScreenPanel.java
View File

@@ -716,7 +716,7 @@ public class ScreenPanel extends Panel {
buttonPauseActionPerformed(null);
}
if (renderer.getShowReticle() != buttonReticle.isSelected()) {
buttonReticle.setSelected(renderer.getShowReticle());
//buttonReticle.setSelected(renderer.getShowReticle());
}
if ((renderer.getMarker() == null) && buttonMarker.isSelected()) {
buttonMarker.setSelected(false);

2
script/test/averager.py
View File

@@ -1,2 +1,2 @@
av = create_averager(center_x, 5, 0.1)
av = create_averager(gun_phase.readback, 5, 0.1)
res= tscan(av, 10, 0.1)