pshell_config/dev
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gobbo_a
2018-08-15 17:04:21 +02:00
parent 1de8ced3d5
commit 3e41debde1
55 changed files with 1015 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Mon Mar 26 14:15:56 CEST 2018 #Thu Aug 02 10:45:31 CEST 2018
autoSaveScanData=true autoSaveScanData=true
createSessionFiles=true createSessionFiles=true
dataLayout=default dataLayout=default
config/devices.properties
+3 -1
View File
@@ -1,5 +1,6 @@
dispatcher=ch.psi.pshell.bs.Provider|tcp://localhost:9999||| dispatcher=ch.psi.pshell.bs.Provider|tcp://localhost:9999|||
cam_server=ch.psi.pshell.bs.PipelineServer|localhost:8889|||true cam_server_local=ch.psi.pshell.bs.PipelineServer|localhost:8889|||true
cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889|||true
#stream=ch.psi.pshell.bs.Stream|<dispatcher> #false:boolean||| #stream=ch.psi.pshell.bs.Stream|<dispatcher> #false:boolean|||
#scalar=ch.psi.pshell.bs.Scalar|stream Int8Scalar||| #scalar=ch.psi.pshell.bs.Scalar|stream Int8Scalar|||
#cam=ch.psi.pshell.bs.StreamCamera|"tcp://gfa-lc6-64:10100" 1|||true #cam=ch.psi.pshell.bs.StreamCamera|"tcp://gfa-lc6-64:10100" 1|||true
@@ -108,4 +109,5 @@ phi=ch.psi.pshell.device.DummyMotor||||true
sixc=ch.psi.pshell.device.MotorGroupBase|mu delta gam eta chi phi||| sixc=ch.psi.pshell.device.MotorGroupBase|mu delta gam eta chi phi|||
fivec=ch.psi.pshell.device.MotorGroupBase|delta gam eta chi phi||| fivec=ch.psi.pshell.device.MotorGroupBase|delta gam eta chi phi|||
fourc=ch.psi.pshell.device.MotorGroupBase|delta eta chi phi||| fourc=ch.psi.pshell.device.MotorGroupBase|delta eta chi phi|||
fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gam eta|||
en=ch.psi.pshell.device.DummyPositioner||||true en=ch.psi.pshell.device.DummyPositioner||||true
config/plugins.properties
+2
View File
@@ -1,3 +1,5 @@
ScreenPanel3.java=disabled
Tomaz.java=disabled
ScreenPanel2.java=disabled ScreenPanel2.java=disabled
Correlation2.java=disabled Correlation2.java=disabled
Correlation.java=disabled Correlation.java=disabled
devices/CurrentCamera.properties
+6 -5
View File
@@ -1,6 +1,7 @@
#Wed May 16 15:31:51 CEST 2018 #Thu Aug 09 15:37:16 CEST 2018
colormap=Flame colormap=Flame
colormapAutomatic=true colormapAutomatic=true
colormapLogarithmic=false
colormapMax=25300.0 colormapMax=25300.0
colormapMin=0.0 colormapMin=0.0
custom=12345 custom=12345
@@ -22,9 +23,9 @@ rotation=0.0
rotationCrop=false rotationCrop=false
scale=1.0 scale=1.0
serverURL=http\://gfa-lc6-64\:8889 serverURL=http\://gfa-lc6-64\:8889
spatialCalOffsetX=-634.4956973840979 spatialCalOffsetX=-131.47810112809645
spatialCalOffsetY=-509.5307480984911 spatialCalOffsetY=-114.68674851532894
spatialCalScaleX=-26.954178679632527 spatialCalScaleX=-26.95417819057938
spatialCalScaleY=-35.8422927936001 spatialCalScaleY=-35.84229324524661
spatialCalUnits=mm spatialCalUnits=mm
transpose=false transpose=false
devices/PiezoRoll1.properties
+9 -8
View File
@@ -1,8 +1,9 @@
#Thu Feb 16 13:51:32 CET 2017 #Tue Jun 19 17:19:36 CEST 2018
maxValue=1000.0 maxValue=1000.0
minValue=0.0 minValue=0.0
offset=0.0 offset=0.0
precision=5 precision=5
resolution=NaN resolution=NaN
scale=1.0 scale=1.0
unit=mm sign_bit=0
unit=mm
devices/Time.properties
+10 -9
View File
@@ -1,9 +1,10 @@
#Fri Jun 16 17:47:37 CEST 2017 #Wed Jul 25 10:47:11 CEST 2018
maxValue=NaN maxValue=NaN
minValue=NaN minValue=NaN
offset=0.0 offset=0.0
precision=-1 precision=-1
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
unit=null sign_bit=0
unit=null
devices/cam_server.properties
+8 -6
View File
@@ -1,12 +1,14 @@
#Thu Mar 22 10:22:45 CET 2018 #Thu Aug 09 15:41:34 CEST 2018
colormap=Flame colormap=Temperature
colormapAutomatic=true colormapAutomatic=true
colormapLogarithmic=false
colormapMax=NaN colormapMax=NaN
colormapMin=NaN colormapMin=NaN
flipHorizontally=false flipHorizontally=false
flipVertically=false flipVertically=false
grayscale=false grayscale=false
invert=false invert=false
logarithmic=true
rescaleFactor=1.0 rescaleFactor=1.0
rescaleOffset=0.0 rescaleOffset=0.0
roiHeight=-1 roiHeight=-1
@@ -16,9 +18,9 @@ roiY=0
rotation=0.0 rotation=0.0
rotationCrop=false rotationCrop=false
scale=1.0 scale=1.0
spatialCalOffsetX=0.0 spatialCalOffsetX=-50.048875855327466
spatialCalOffsetY=0.0 spatialCalOffsetY=-50.048875855327466
spatialCalScaleX=1.0 spatialCalScaleX=-1.0
spatialCalScaleY=1.0 spatialCalScaleY=-1.0
spatialCalUnits=mm spatialCalUnits=mm
transpose=false transpose=false
devices/cam_server_local.properties
+25
View File
@@ -0,0 +1,25 @@
#Thu Aug 09 15:38:40 CEST 2018
colormap=Grayscale
colormapAutomatic=false
colormapLogarithmic=false
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=NaN
spatialCalOffsetY=NaN
spatialCalScaleX=NaN
spatialCalScaleY=NaN
spatialCalUnits=mm
transpose=false
devices/chi.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:03:01 CEST 2018 #Tue Jun 19 17:19:37 CEST 2018
defaultSpeed=10.0 defaultSpeed=10.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=10.0 maxSpeed=10.0
@@ -10,5 +10,6 @@ precision=2
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
startRetries=1 startRetries=1
unit=mm unit=mm
devices/cv.properties
+10 -9
View File
@@ -1,9 +1,10 @@
#Fri Mar 24 15:08:15 CET 2017 #Tue Jun 19 17:19:36 CEST 2018
accessType=ReadWrite accessType=ReadWrite
maxValue=1000.0 maxValue=1000.0
minValue=-1000.0 minValue=-1000.0
offset=0.0 offset=0.0
precision=3 precision=3
resolution=1.0 resolution=1.0
scale=1.0 scale=1.0
unit=C sign_bit=0
unit=C
devices/delta.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Mon Apr 16 17:23:26 CEST 2018 #Tue Jun 19 17:19:36 CEST 2018
defaultSpeed=50.0 defaultSpeed=50.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=50.0 maxSpeed=50.0
@@ -10,5 +10,6 @@ precision=2
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
startRetries=1 startRetries=1
unit=mm unit=mm
devices/en.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Mon Apr 16 16:57:32 CEST 2018 #Tue Jun 19 17:19:37 CEST 2018
maxValue=100.0 maxValue=100.0
minValue=0.0 minValue=0.0
offset=0.0 offset=0.0
@@ -6,4 +6,5 @@ precision=4
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
unit=kEv unit=kEv
devices/eta.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:02:49 CEST 2018 #Tue Jun 19 17:19:37 CEST 2018
defaultSpeed=10.0 defaultSpeed=10.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=10.0 maxSpeed=10.0
@@ -10,5 +10,6 @@ precision=2
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
startRetries=1 startRetries=1
unit=mm unit=mm
devices/gam.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:02:41 CEST 2018 #Tue Jun 19 17:19:37 CEST 2018
defaultSpeed=10.0 defaultSpeed=10.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=10.0 maxSpeed=10.0
@@ -10,5 +10,6 @@ precision=2
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
startRetries=1 startRetries=1
unit=mm unit=mm
devices/h.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:38:15 CEST 2018 #Wed Aug 15 09:55:09 CEST 2018
maxValue=10.0 maxValue=10.0
minValue=-10.0 minValue=-10.0
offset=0.0 offset=0.0
@@ -6,4 +6,5 @@ precision=4
resolution=0.01 resolution=0.01
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
unit=deg unit=deg
devices/k.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:38:04 CEST 2018 #Wed Aug 15 09:55:09 CEST 2018
maxValue=10.0 maxValue=10.0
minValue=-10.0 minValue=-10.0
offset=0.0 offset=0.0
@@ -6,4 +6,5 @@ precision=4
resolution=0.01 resolution=0.01
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
unit=deg unit=deg
devices/l.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:37:53 CEST 2018 #Wed Aug 15 09:55:09 CEST 2018
maxValue=10.0 maxValue=10.0
minValue=-10.0 minValue=-10.0
offset=0.0 offset=0.0
@@ -6,4 +6,5 @@ precision=4
resolution=0.01 resolution=0.01
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
unit=deg unit=deg
devices/m1.properties
+15 -14
View File
@@ -1,14 +1,15 @@
#Wed Oct 18 16:49:39 CEST 2017 #Mon Aug 06 08:57:31 CEST 2018
defaultSpeed=1.0 defaultSpeed=1.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=10.0 maxSpeed=10.0
maxValue=10.0 maxValue=10.0
minSpeed=0.1 minSpeed=0.1
minValue=-10.0 minValue=-10.0
offset=0.0 offset=0.0
precision=2 precision=2
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
startRetries=1 sign_bit=0
unit=mm startRetries=1
unit=mm
devices/m2.properties
+16 -15
View File
@@ -1,15 +1,16 @@
#Wed Oct 18 16:49:39 CEST 2017 #Mon Aug 06 08:57:31 CEST 2018
accessType=ReadWrite accessType=ReadWrite
defaultSpeed=1.0 defaultSpeed=1.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=10.0 maxSpeed=10.0
maxValue=10.0 maxValue=10.0
minSpeed=0.1 minSpeed=0.1
minValue=-10.0 minValue=-10.0
offset=0.0 offset=0.0
precision=4 precision=4
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
startRetries=1 sign_bit=0
unit=mm startRetries=1
unit=mm
devices/motor.properties
+2 -5
View File
@@ -1,10 +1,7 @@
#Wed Mar 28 11:52:13 CEST 2018 #Fri Jun 22 08:53:29 CEST 2018
accessType=ReadWrite
channel=MTEST-GOBBO\:MOT1
defaultSpeed=1.0 defaultSpeed=1.0
estbilizationDelay=0 estbilizationDelay=0
hasEnable=true hasEnable=true
homingDirection=Backward
homingType=Backward homingType=Backward
maxSpeed=20.0 maxSpeed=20.0
maxValue=75.0 maxValue=75.0
@@ -15,6 +12,6 @@ precision=4
resolution=0.00125 resolution=0.00125
rotation=false rotation=false
scale=1.0 scale=1.0
simulation=false sign_bit=0
startRetries=2 startRetries=2
unit=mm unit=mm
devices/motor2.properties
+21 -20
View File
@@ -1,20 +1,21 @@
#Fri Sep 22 09:54:50 CEST 2017 #Tue Jun 19 17:19:36 CEST 2018
accessType=ReadWrite accessType=ReadWrite
channel=MTEST-GOBBO\:MOT2 channel=MTEST-GOBBO\:MOT2
defaultSpeed=0.2 defaultSpeed=0.2
estbilizationDelay=0 estbilizationDelay=0
hasEnable=true hasEnable=true
homingDirection=Backward homingDirection=Backward
homingType=Backward homingType=Backward
maxSpeed=100.0 maxSpeed=100.0
maxValue=2.0 maxValue=2.0
minSpeed=0.001 minSpeed=0.001
minValue=-2.0 minValue=-2.0
offset=10.0 offset=10.0
precision=3 precision=3
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=2.0 scale=2.0
simulation=false sign_bit=0
startRetries=1 simulation=false
unit=null startRetries=1
unit=null
devices/mu.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:02:07 CEST 2018 #Tue Jun 19 17:19:36 CEST 2018
defaultSpeed=10.0 defaultSpeed=10.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=10.0 maxSpeed=10.0
@@ -10,5 +10,6 @@ precision=2
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
startRetries=1 startRetries=1
unit=mm unit=mm
devices/mycv.properties
+2 -1
View File
@@ -1,8 +1,9 @@
#Thu Feb 15 17:19:47 CET 2018 #Tue Jun 19 17:19:36 CEST 2018
maxValue=100.0 maxValue=100.0
minValue=-100.0 minValue=-100.0
offset=0.0 offset=0.0
precision=2 precision=2
resolution=0.1 resolution=0.1
scale=1.0 scale=1.0
sign_bit=0
unit=mm unit=mm
devices/mymot.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Feb 15 17:16:13 CET 2018 #Tue Jun 19 17:19:36 CEST 2018
defaultSpeed=1.0 defaultSpeed=1.0
estbilizationDelay=0 estbilizationDelay=0
hasEnable=false hasEnable=false
@@ -12,5 +12,6 @@ precision=2
resolution=0.1 resolution=0.1
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
startRetries=1 startRetries=1
unit=mm unit=mm
devices/mypos.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Feb 15 17:17:18 CET 2018 #Tue Jun 19 17:19:36 CEST 2018
maxValue=100.0 maxValue=100.0
minValue=100.0 minValue=100.0
offset=0.0 offset=0.0
@@ -6,4 +6,5 @@ precision=2
resolution=0.1 resolution=0.1
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
unit=mm unit=mm
devices/p1.properties
+10 -9
View File
@@ -1,9 +1,10 @@
#Fri Jun 16 17:46:24 CEST 2017 #Mon Aug 06 08:57:31 CEST 2018
maxValue=NaN maxValue=NaN
minValue=NaN minValue=NaN
offset=0.0 offset=0.0
precision=-1 precision=-1
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
unit=null sign_bit=0
unit=null
devices/pe.properties
+11 -10
View File
@@ -1,10 +1,11 @@
#Mon Jun 12 18:25:49 CEST 2017 #Tue Jun 19 17:19:36 CEST 2018
accessType=ReadWrite accessType=ReadWrite
maxValue=1000.0 maxValue=1000.0
minValue=0.0 minValue=0.0
offset=0.0 offset=0.0
precision=5 precision=5
resolution=NaN resolution=NaN
rotation=true rotation=true
scale=1.0 scale=1.0
unit=mm sign_bit=0
unit=mm
devices/phi.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Thu Apr 12 11:03:09 CEST 2018 #Tue Jun 19 17:19:37 CEST 2018
defaultSpeed=10.0 defaultSpeed=10.0
estbilizationDelay=0 estbilizationDelay=0
maxSpeed=10.0 maxSpeed=10.0
@@ -10,5 +10,6 @@ precision=2
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
startRetries=1 startRetries=1
unit=mm unit=mm
devices/pv.properties
+12 -11
View File
@@ -1,11 +1,12 @@
#Mon Jun 12 18:07:43 CEST 2017 #Tue Jun 19 17:19:36 CEST 2018
accessType=ReadWrite accessType=ReadWrite
channel=TESTIOC\:TESTCALCOUT\:Input channel=TESTIOC\:TESTCALCOUT\:Input
maxValue=180.0 maxValue=180.0
minValue=-180.0 minValue=-180.0
offset=1.0 offset=1.0
precision=5 precision=5
resolution=-1.0 resolution=-1.0
scale=2.0 scale=2.0
simulation=false sign_bit=0
unit=mm simulation=false
unit=mm
devices/scanner.properties
+2 -1
View File
@@ -1,4 +1,4 @@
#Tue Feb 06 14:46:43 CET 2018 #Thu Aug 02 17:12:34 CEST 2018
maxValue=NaN maxValue=NaN
minValue=NaN minValue=NaN
offset=0.0 offset=0.0
@@ -6,4 +6,5 @@ precision=-1
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
sign_bit=0
unit=null unit=null
devices/src1.properties
+33 -32
View File
@@ -1,32 +1,33 @@
#Wed Mar 22 10:57:46 CET 2017 #Mon Aug 06 10:26:59 CEST 2018
calOffsetX=NaN calOffsetX=NaN
calOffsetY=NaN calOffsetY=NaN
calScaleX=NaN calScaleX=NaN
calScaleY=NaN calScaleY=NaN
colormap=Temperature colormap=Temperature
colormapAutomatic=true colormapAutomatic=true
colormapMax=255.0 colormapLogarithmic=false
colormapMin=0.0 colormapMax=255.0
dataMonitoring=false colormapMin=0.0
dataPolling=100 dataMonitoring=false
flipHorizontally=true dataPolling=100
flipVertically=false flipHorizontally=true
grayscale=false flipVertically=false
invert=false grayscale=false
pollingBackground=false invert=false
pollingInterval=0 pollingBackground=false
rescaleFactor=1.0 pollingInterval=0
rescaleOffset=0.0 rescaleFactor=1.0
roiHeight=-1 rescaleOffset=0.0
roiWidth=-1 roiHeight=-1
roiX=0 roiWidth=-1
roiY=0 roiX=0
rotation=0.0 roiY=0
rotationCrop=false rotation=0.0
scale=1.0 rotationCrop=false
spatialCalOffsetX=NaN scale=1.0
spatialCalOffsetY=NaN spatialCalOffsetX=NaN
spatialCalScaleX=NaN spatialCalOffsetY=NaN
spatialCalScaleY=NaN spatialCalScaleX=NaN
spatialCalUnits=mm spatialCalScaleY=NaN
transpose=false spatialCalUnits=mm
transpose=false
devices/src2.properties
+33 -32
View File
@@ -1,32 +1,33 @@
#Tue Jan 17 11:08:33 CET 2017 #Mon Aug 06 10:26:59 CEST 2018
calOffsetX=NaN calOffsetX=NaN
calOffsetY=NaN calOffsetY=NaN
calScaleX=NaN calScaleX=NaN
calScaleY=NaN calScaleY=NaN
colormap=Grayscale colormap=Grayscale
colormapAutomatic=true colormapAutomatic=true
colormapMax=255.0 colormapLogarithmic=false
colormapMin=0.0 colormapMax=255.0
dataMonitoring=false colormapMin=0.0
dataPolling=100 dataMonitoring=false
flipHorizontally=false dataPolling=100
flipVertically=false flipHorizontally=false
grayscale=false flipVertically=false
invert=false grayscale=false
pollingBackground=false invert=false
pollingInterval=0 pollingBackground=false
rescaleFactor=1.0 pollingInterval=0
rescaleOffset=0.0 rescaleFactor=1.0
roiHeight=-1 rescaleOffset=0.0
roiWidth=-1 roiHeight=-1
roiX=0 roiWidth=-1
roiY=0 roiX=0
rotation=0.0 roiY=0
rotationCrop=false rotation=0.0
scale=1.0 rotationCrop=false
spatialCalOffsetX=NaN scale=1.0
spatialCalOffsetY=NaN spatialCalOffsetX=NaN
spatialCalScaleX=NaN spatialCalOffsetY=NaN
spatialCalScaleY=NaN spatialCalScaleX=NaN
spatialCalUnits=mm spatialCalScaleY=NaN
transpose=false spatialCalUnits=mm
transpose=false
devices/test_cfg.properties
+5
View File
@@ -0,0 +1,5 @@
#Fri Jun 22 09:13:00 CEST 2018
b=false
d=1.0
i=5
s=Test5
devices/testd.properties
+10 -9
View File
@@ -1,9 +1,10 @@
#Mon Jun 12 17:34:43 CEST 2017 #Tue Jun 19 17:19:36 CEST 2018
maxValue=NaN maxValue=NaN
minValue=NaN minValue=NaN
offset=0.0 offset=0.0
precision=-1 precision=-1
resolution=NaN resolution=NaN
rotation=false rotation=false
scale=1.0 scale=1.0
unit=null sign_bit=0
unit=null
plugins/MXSC-1.10.0.jar
BIN
View File
Binary file not shown.
plugins/Nilson.form
+13 -1
View File
@@ -24,6 +24,11 @@
</Group> </Group>
<EmptySpace pref="467" max="32767" attributes="0"/> <EmptySpace pref="467" max="32767" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Component id="jCheckBox1" min="-2" pref="167" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="141" max="-2" attributes="0"/>
</Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
@@ -33,7 +38,9 @@
<Component id="buttonRun" min="-2" max="-2" attributes="0"/> <Component id="buttonRun" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="buttonAbort" min="-2" max="-2" attributes="0"/> <Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="151" max="32767" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jCheckBox1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="110" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@@ -55,5 +62,10 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="jCheckBox1">
<Properties>
<Property name="horizontalAlignment" type="int" value="0"/>
</Properties>
</Component>
</SubComponents> </SubComponents>
</Form> </Form>
plugins/Nilson.java
+11 -1
View File
@@ -44,6 +44,7 @@ buttonRun.setEnabled(state==State.Ready);
buttonRun = new javax.swing.JButton(); buttonRun = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton(); buttonAbort = new javax.swing.JButton();
jCheckBox1 = new javax.swing.JCheckBox();
buttonRun.setText("Run"); buttonRun.setText("Run");
buttonRun.addActionListener(new java.awt.event.ActionListener() { buttonRun.addActionListener(new java.awt.event.ActionListener() {
@@ -59,6 +60,8 @@ buttonRun.setEnabled(state==State.Ready);
} }
}); });
jCheckBox1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
@@ -69,6 +72,10 @@ buttonRun.setEnabled(state==State.Ready);
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonRun, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(buttonRun, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(467, Short.MAX_VALUE)) .addContainerGap(467, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jCheckBox1, javax.swing.GroupLayout.PREFERRED_SIZE, 167, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(141, 141, 141))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -77,7 +84,9 @@ buttonRun.setEnabled(state==State.Ready);
.addComponent(buttonRun) .addComponent(buttonRun)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(buttonAbort) .addComponent(buttonAbort)
.addContainerGap(151, Short.MAX_VALUE)) .addGap(18, 18, 18)
.addComponent(jCheckBox1)
.addContainerGap(110, Short.MAX_VALUE))
); );
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
@@ -100,5 +109,6 @@ buttonRun.setEnabled(state==State.Ready);
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonAbort; private javax.swing.JButton buttonAbort;
private javax.swing.JButton buttonRun; private javax.swing.JButton buttonRun;
private javax.swing.JCheckBox jCheckBox1;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }
plugins/ScreenPanel3.java
+30 -25
View File
@@ -3428,30 +3428,33 @@ public class ScreenPanel3 extends Panel {
ChannelInteger setpoint = null; ChannelInteger setpoint = null;
try { try {
int index = comboScreen.getSelectedIndex(); int index = comboScreen.getSelectedIndex();
if (cameraName.contains("DSRM")) { if (index>=0){
setpoint = new ChannelInteger(null, cameraName + ":POSITION_SP"); if (cameraName.contains("DSRM")) {
} else { setpoint = new ChannelInteger(null, cameraName + ":POSITION_SP");
setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS"); } else {
setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS");
}
setpoint.initialize();
Integer readback = setpoint.read();
if ((readback==null) || (setpoint.read() != index)) {
setpoint.write(index);
//Must be threaded to control the laser because of sleep in setLaserState
/*
boolean laserOn = getLaserState();
if (laserOn) {
setLaserState(false);
}
try {
setpoint.write(index);
} finally {
if (laserOn) {
setLaserState(true);
}
}
*/
}
screen.read();
} }
setpoint.initialize();
if (setpoint.read() != index) {
setpoint.write(index);
//Must be threaded to control the laser because of sleep in setLaserState
/*
boolean laserOn = getLaserState();
if (laserOn) {
setLaserState(false);
}
try {
setpoint.write(index);
} finally {
if (laserOn) {
setLaserState(true);
}
}
*/
}
screen.read();
} catch (Exception ex) { } catch (Exception ex) {
showException(ex); showException(ex);
} finally { } finally {
@@ -3467,8 +3470,10 @@ public class ScreenPanel3 extends Panel {
private void comboFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboFilterActionPerformed private void comboFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboFilterActionPerformed
try { try {
String setpoint = (String) comboFilter.getSelectedItem(); String setpoint = (String) comboFilter.getSelectedItem();
if (!setpoint.equals(filter.read())) { if (setpoint!=null){
filter.write(setpoint); if (!setpoint.equals(filter.read())) {
filter.write(setpoint);
}
} }
} catch (Exception ex) { } catch (Exception ex) {
showException(ex); showException(ex);
plugins/Tomaz.form
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="133" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="219" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="70" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
<Property name="text" type="java.lang.String" value="jButton1"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Form>
plugins/Tomaz.java
+112
View File
@@ -0,0 +1,112 @@
/*
* Copyright (c) 2014-2018 Paul Scherrer Institute. All rights reserved.
*/
import ch.psi.pshell.bs.ProviderConfig;
import ch.psi.pshell.ui.Console;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.Config;
import ch.psi.utils.State;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
*/
public class Tomaz extends Panel {
final Console console;
public Tomaz() {
initComponents();
console = new Console() {
protected void onConsoleCommand(String name, String[] pars, String trimming) throws Exception {
switch (name) {
case "test":
System.out.println("OK");
break;
}
}
};
}
@Override
public void onStart() {
super.onStart();
console.start();
}
@Override
public void onStop() {
super.onStart();
console.stop();
}
//Overridable callbacks
@Override
public void onInitialize(int runCount) {
}
@Override
public void onStateChange(State state, State former) {
}
@Override
public void onExecutedFile(String fileName, Object result) {
}
//Callback to perform update - in event thread
@Override
protected void doUpdate() {
}
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
jButton1 = new javax.swing.JButton();
jButton1.setText("jButton1");
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGap(133, 133, 133)
.addComponent(jButton1)
.addContainerGap(219, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGap(38, 38, 38)
.addComponent(jButton1)
.addContainerGap(70, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
//showSettingsEditor(false);
//showSettingsEditor(true);
Config cfg = new ProviderConfig();
try {
cfg.load("~/test.cfg");
} catch (IOException ex) {
Logger.getLogger(Tomaz.class.getName()).log(Level.SEVERE, null, ex);
}
showConfigEditor(cfg, true);
}//GEN-LAST:event_jButton1ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
// End of variables declaration//GEN-END:variables
}
script/TestRet.py
+2 -1
View File
@@ -3,7 +3,7 @@
is_panel = get_exec_pars().source != CommandSource.ui #Must be checked before callin "run" is_panel = get_exec_pars().source != CommandSource.ui #Must be checked before callin "run"
#time.sleep(4)
print is_panel, get_exec_pars().source print is_panel, get_exec_pars().source
ret = [] ret = []
@@ -11,4 +11,5 @@ for i in range(10):
ret.extend([i]) ret.extend([i])
print "OK" print "OK"
#raise Exception("test ex")
set_return(ret) set_return(ret)
script/cpython/wrapper.py
-1
View File
@@ -1,6 +1,5 @@
from jeputils import * from jeputils import *
def gfitoff(x, y, off=None, amp=None, com=None, sigma=None): def gfitoff(x, y, off=None, amp=None, com=None, sigma=None):
ret = call_jep("cpython/GaussFit", "gfitoff", [to_npa(x), to_npa(y), off, amp, com, sigma]) ret = call_jep("cpython/GaussFit", "gfitoff", [to_npa(x), to_npa(y), off, amp, com, sigma])
return ret if ret is None or is_list(ret) else ret.data return ret if ret is None or is_list(ret) else ret.data
script/diffcalc/diffutils.py
+17 -32
View File
@@ -15,7 +15,7 @@
# Library loading and Hardware setup # Library loading and Hardware setup
################################################################################################### ###################################################################################################
#1- Create a MontorGroup with the diffractometer motors #1- Create a MotorGroup with the diffractometer motors
# e.g. 'sixc', containing mu, delta, gam, eta, chi, phi motors (gam = nu) # e.g. 'sixc', containing mu, delta, gam, eta, chi, phi motors (gam = nu)
# or 'fivec', containing delta, gam, eta, chi, phi motors # or 'fivec', containing delta, gam, eta, chi, phi motors
# or 'fourc', containing delta, eta, chi, phi motors # or 'fourc', containing delta, eta, chi, phi motors
@@ -35,7 +35,7 @@ if not diffcalc_path in sys.path:
import diffcalc import diffcalc
from diffcalc import settings from diffcalc import settings
from diffcalc.hkl.you.geometry import SixCircle, FiveCircle, FourCircle from diffcalc.hkl.you.geometry import YouGeometry,SixCircle, FiveCircle, FourCircle, YouPosition
from diffcalc.hardware import HardwareAdapter from diffcalc.hardware import HardwareAdapter
from diffcalc.ub.persistence import UbCalculationNonPersister from diffcalc.ub.persistence import UbCalculationNonPersister
from diffcalc.gdasupport.minigda.scannable import ScannableBase, ScannableGroup from diffcalc.gdasupport.minigda.scannable import ScannableBase, ScannableGroup
@@ -80,31 +80,13 @@ class PositionerScannable(ScannableBase):
class PositionerScannableGroup(ScannableGroup): class PositionerScannableGroup(ScannableGroup):
def __init__(self, name, motors): def __init__(self, name, motors):
self.name = name self.name = name
if len(motors)==6: print self.getInputNames()
[mu, delta, gam, eta, chi, phi] = motors positioners = []
self.mu = PositionerScannable(mu, "mu") for m in motors:
self.delta = PositionerScannable(delta, "delta") exec('self.' + m.name + ' = PositionerScannable(' + m.name + ', "' + m.name + '")')
self.gam = PositionerScannable(gam, "gam") exec('positioners.append(self.' + m.name + ')' )
self.eta = PositionerScannable(eta, "eta") ScannableGroup.__init__(self, self.name, positioners)
self.chi = PositionerScannable(chi, "chi")
self.phi = PositionerScannable(phi, "phi")
ScannableGroup.__init__(self, self.name, [self.mu, self.delta, self.gam, self.eta, self.chi, self.phi])
elif len(motors)==5:
[delta, gam, eta, chi, phi] = motors
self.delta = PositionerScannable(delta, "delta")
self.gam = PositionerScannable(gam, "gam")
self.eta = PositionerScannable(eta, "eta")
self.chi = PositionerScannable(chi, "chi")
self.phi = PositionerScannable(phi, "phi")
ScannableGroup.__init__(self, self.name, [self.delta, self.gam, self.eta, self.chi, self.phi])
elif len(motors)==4:
[delta, eta, chi, phi] = motors
self.delta = PositionerScannable(delta, "delta")
self.eta = PositionerScannable(eta, "eta")
self.chi = PositionerScannable(chi, "chi")
self.phi = PositionerScannable(phi, "phi")
ScannableGroup.__init__(self, self.name, [self.delta, self.eta, self.chi, self.phi])
class MotorGroupScannable(PositionerScannableGroup): class MotorGroupScannable(PositionerScannableGroup):
def __init__(self, motor_group): def __init__(self, motor_group):
self.motor_group = motor_group self.motor_group = motor_group
@@ -223,18 +205,21 @@ class HklGroup(RegisterBase, Register.RegisterArray):
you = None you = None
dc, ub, hardware, hkl = None, None, None, None dc, ub, hardware, hkl = None, None, None, None
_motor_group = None _motor_group = None
def setup_diff(diffractometer, energy): def setup_diff(diffractometer, energy, geometry=None):
""" """
diffractometer: Motor group containing: diffractometer: Motor group containing:
- mu, delta, gam, eta, chi, phi (six circle) or - mu, delta, gam, eta, chi, phi (six circle) or
- delta, gam, eta, chi, phi (ficve circle) or - delta, gam, eta, chi, phi (ficve circle) or
- delta, eta, chi, phi (four circle) - delta, eta, chi, phi (four circle)
energy: Positioner having energy in kev energy: Positioner having energy in kev
geometry: YouGeometry extension. If none, uses default
""" """
global you, dc, ub, hardware, hkl, _motor_group global you, dc, ub, hardware, hkl, _motor_group
_motor_group = diffractometer _motor_group = diffractometer
you =None you = None
if len(diffractometer.motors) == 6: if geometry is not None:
settings.geometry = geometry
elif len(diffractometer.motors) == 6:
settings.geometry = SixCircle() settings.geometry = SixCircle()
elif len(diffractometer.motors) == 5: elif len(diffractometer.motors) == 5:
settings.geometry = FiveCircle() settings.geometry = FiveCircle()
@@ -348,14 +333,14 @@ def hklscan(vector, readables,latency = 0.0, passes = 1, **pars):
return scan.result return scan.result
def test_difcalc(): def test_diffcalc():
en.move(20.0) en.move(20.0)
delta.config.maxSpeed = 50.0 delta.config.maxSpeed = 50.0
delta.speed = 50.0 delta.speed = 50.0
delta.move(1.0) delta.move(1.0)
#Setup #Setup
setup_sixc(sixc, en) setup_diff(sixc, en)
setup_axis('gam', 0, 179) setup_axis('gam', 0, 179)
setup_axis('delta', 0, 179) setup_axis('delta', 0, 179)
setup_axis('delta', min=0) setup_axis('delta', min=0)
script/diffcalc/testsixc.py
+1
View File
@@ -77,6 +77,7 @@ hkl_group.sim([0.0,1.0,1.0])
hkl_group.write([0.0,1.0,1.0]) hkl_group.write([0.0,1.0,1.0])
###################################################################################################\ ###################################################################################################\
#Scans #Scans
################################################################################################### ###################################################################################################
script/test/TestCfg.py
+16
View File
@@ -0,0 +1,16 @@
"""
class DevConfig(DeviceConfig):
def __init__(self):
self.i = 1
self.d = 1.0
self.b = True
self.s = "Test"
"""
class Dev(DeviceBase):
def __init__(self, name):
#DeviceBase.__init__(self, name, DevConfig())
DeviceBase.__init__(self, name, DeviceConfig({"i":1, "d":1.0, "b":True, "s": "Test"}))
raise Exception("test ex")
add_device(Dev("test_cfg"), True)
script/test/WireScanMock.py
+3 -3
View File
@@ -1,6 +1,6 @@
import traceback import traceback
is_panel = get_exec_pars().source != CommandSource.ui #Must be checked before callin "run" is_panel = False #get_exec_pars().source != CommandSource.ui #Must be checked before callin "run"
#set_exec_pars(provider="txt") #set_exec_pars(provider="txt")
@@ -10,8 +10,8 @@ BPM_SENSORS = [("x","X1"), ("y","Y1"), ("q","Q1")] #(logic name sufix, channel s
prefix = args[0] if is_panel else "S30CB09-DWSC440" #"SINDI01-DWSC090" prefix = args[0] if is_panel else "S30CB09-DWSC440" #"SINDI01-DWSC090"
scan_type = args[1] if is_panel else "X1" scan_type = args[1] if is_panel else "X1"
scan_range = args[2] if is_panel else [-200, 200, -200, 200] scan_range = args[2] if is_panel else [-200, 200, -200, 200]
cycles = args[3] if is_panel else 3 cycles = args[3] if is_panel else 1
velocity = args[4] if is_panel else 200 velocity = args[4] if is_panel else 400
bpms = args[5] if is_panel else ["BPM1", "BPM2"] bpms = args[5] if is_panel else ["BPM1", "BPM2"]
blms = args[6] if is_panel else ["BLM1", "BLM2"] blms = args[6] if is_panel else ["BLM1", "BLM2"]
bkgrd = args[7] if is_panel else 10 bkgrd = args[7] if is_panel else 10
script/test/averager.py
+3 -3
View File
@@ -6,11 +6,11 @@
#iavg = create_averager("ca://TESTIOC:TESTSINUS:SinCalc", 3, interval = -1) iavg = create_averager("ca://TESTIOC:TESTSINUS:SinCalc", 3, interval = -1)
iavg = create_averager("bs://Int8Scalar", 3, interval = 0.1) #iavg = create_averager("bs://Int8Scalar", 3, interval = 0.1)
tscan (iavg, 10, 0.5) tscan (iavg, 10, 0.2, layout = "sf", domain_axis = "Time")
#$iavg.close() #$iavg.close()
script/test/test_binary.py
+23
View File
@@ -0,0 +1,23 @@
###################################################################################################
# Example of using ImageJ functionalities through ijutils.
###################################################################################################
from ijutils import *
import java.awt.Color as Color
#Image Loading
ip = load_image("images/img.png", title="Image")
aux = grayscale(ip, in_place = False)
bin = ip.duplicate()
ip_bin = auto_threshold(aux, in_place=False)
create_stack([ ip_bin,
#binary_fill_holes(ip_bin, in_place=False),
#binary_outline(ip_bin, in_place=False),
#binary_outline(binary_fill_holes(ip_bin, in_place=False)),
binary_dilate(ip_bin, in_place=False),
binary_erode(ip_bin, in_place=False),
binary_open(ip_bin, in_place=False),
binary_close(ip_bin, in_place=False),
binary_skeletonize(ip_bin, in_place=False)], title = "Binarization").show()
script/test/testmain.py
+7
View File
@@ -0,0 +1,7 @@
def add(a1, a2):
return a1+a2
if __name__ == "__main__":
print add(4,3)
script/testfourcv.py
+114
View File
@@ -0,0 +1,114 @@
en.move(20.0)
delta.config.maxSpeed = 50.0
delta.speed = 50.0
delta.move(1.0)
run("diffcalc/diffutils")
###################################################################################################\
#Setup
###################################################################################################
class FourCircleX04SA_V(YouGeometry):
"""For a diffractometer with angles:
mu, delta, nu, eta
"""
def __init__(self):
YouGeometry.__init__(self, 'fourcv', {'phi': 0, 'chi': 0})
def physical_angles_to_internal_position(self, physical_angle_tuple):
# mu, delta, nu, eta, chi, phi
mu, delta, nu, eta = physical_angle_tuple
return YouPosition(mu, delta, nu, eta, 0, 0)
def internal_position_to_physical_angles(self, internal_position):
mu, delta, nu, eta, _, _ = internal_position.totuple()
return mu, delta, nu, eta
###################################################################################################\
#Setup
###################################################################################################
#alp, del, gam, ov
FourCircleX04SA_V()
setup_diff(fourcv, en, FourCircleX04SA_V())
# Set some limits
setup_axis('delta', 0, 90)
setup_axis('delta', min=0)
#setup_axis('gam', 0, 180)
#setup_axis('eta', cut=-180.0)
print_axis_setup()
###################################################################################################\
#Orientation
###################################################################################################
help(ub.ub)
ub.listub()
# Create a new ub calculation and set lattice parameters
ub.newub('test')
ub.setlat('cubic', 1, 1, 1, 90, 90, 90)
# Add 1st reflection (demonstrating the hardware adapter)
settings.hardware.wavelength = 1
ub.c2th([1, 0, 0]) # energy from hardware
settings.hardware.position = 0, 60, 0, 30, 0, 0
ub.addref([1, 0, 0])# energy and position from hardware
# Add 2nd reflection (this time without the harware adapter)
ub.c2th([0, 1, 0], 12.39842)
ub.addref([0, 1, 0], [60, 30, 0, 90], 12.39842)
# check the state
ub.ub()
ub.checkub()
###################################################################################################\
#Constraints
###################################################################################################
help(hkl.con)
hkl.con('a_eq_b')
###################################################################################################\
#Motion
###################################################################################################
print angles_to_hkl((0.0, 60., 0.0, 30.))
print hkl_to_angles(1, 0, 0)
fourc.write([60, 30, 90, 0])
print "fourc=" , fourc.position
wl.write(1.0)
print "wl = ", wl.read()
# Load the last ub calculation used
ub.lastub()
ub.setu ([[1, 0, 0], [0, 1, 0], [0, 0, 1]])
ub.showref()
ub.swapref(1,2)
#print you.hkl
#pos(get_hkl())
hkl_group.read()
#you.hkl.simulateMoveTo([0,1,1])
#sim(get_hkl(), [0,1,1])
hkl_group.sim([0.0,1.0,1.0])
#pos(get_hkl(), [0,1,1])
hkl_group.write([0.0,1.0,1.0])
###################################################################################################\
#Scans
###################################################################################################
lscan(l, [sin], 0.5, 1.0, 0.1)
ascan([k,l], [sin], [1.0, 1.0], [1.2, 1.3], [0.1, 0.1], latency=0.5, zigzag=True, parallel_positioning = False)
vector = [[1.0,1.0,1.0], [1.0,1.0,1.1], [1.0,1.0,1.2], [1.0,1.0,1.4]]
hklscan(vector, [sin, arr])
script/testmain.py
+8
View File
@@ -0,0 +1,8 @@
def add(a1, a2):
print __name__
return a1+a2
if __name__ == "__main__":
print add(4,3)
script/testws.py
+8
View File
@@ -0,0 +1,8 @@
def testwsm():
from startup import run, get_return
ret = run ("test/WireScanMock")
print "Ret:", ret
script/testws2.py
+3
View File
@@ -0,0 +1,3 @@
from testws import testwsm
testwsm()
script/tools/findrecord.py
+314
View File
@@ -0,0 +1,314 @@
#!/usr/bin/env python
# ----------------------------------------------------------------------
# Find IOCs providing an EPICS record using a web service
#
# $Id: findrecord.py,v 1.25 2016/07/01 12:15:30 lauk Exp $
# ----------------------------------------------------------------------
import getopt
import os
import socket
import sys
import urllib
import urllib2
import xml.sax
PROGRAM = os.path.basename(sys.argv[0])
CVS_REVISION = "$Revision: 1.25 $"
__version__ = CVS_REVISION
WS_URL = 'http://epics-boot-info.psi.ch/find-channel.aspx'
TIMEOUT = 15 # seconds
HEADER_FIELDS = {
'active': (('RECORD', 40, 'Channel'),
('RECORD TYPE', 16, 'RecordType'),
('DESCRIPTION', 40, 'Description'),
('IOC', 25, 'IOC'),
('FACILITY', 8, 'Facility')),
'deleted': (('RECORD', 40, 'Channel'),
('RECORD TYPE', 16, 'RecordType'),
('DESCRIPTION', 40, 'Description'),
('IOC', 25, 'IOC'),
('FACILITY', 8, 'Facility'),
('LAST SEEN', 19, 'LastSeenOn'),
('DELETED ON', 19, 'DeletedOn'))
}
class FindChannelHandler(xml.sax.ContentHandler):
"""
SAX handler for parsing the XML of the find-channel.aspx web service.
"""
attr_names = ('Channel', 'RecordType', 'Description', 'IOC', 'Facility', 'LastSeenOn', 'DeletedOn')
def __init__(self, channel_callback):
self._channel_callback = channel_callback
def startElement(self, name, attrs):
if name == 'entry':
d = {}
for a in FindChannelHandler.attr_names:
d[a] = attrs.get(a, None)
self._channel_callback(d)
class OutputProcessor:
"""
A base class for processing results to output. This class defines the common interface.
"""
def __init__(self, out):
"""
Create a new instance.
:param out: A stream to write to (any object with a ``write`` method, that takes a string).
"""
self.__out = out
def write(self, s):
"""
Write ``s`` to this processors stream.
:param s: The ``string`` to write.
"""
self.__out.write(s.encode('utf-8'))
def print_header(self):
"""
API for printing a header.
"""
pass
def print_channel(self, channel):
"""
API for handling a single result entry.
:param channel: A ``dict`` with keys set from the XML handler.
"""
pass
def print_footer(self):
"""
API for printing a footer
"""
pass
class TableOutputProcessor(OutputProcessor):
"""
An output processor that generates ASCII tables
"""
def __init__(self, out, field_separator, header_labels, field_lengths, field_names):
"""
Create a new instance.
:param out: The stream to ``write`` to.
:param field_separator: The field separator, separating columns from each other.
:param header_labels: The labels for displaying a header line.
:param field_lengths: The width of each column.
"""
OutputProcessor.__init__(self, out)
self._header_labels = dict(zip(field_names, header_labels))
self._header_lines = dict(zip(field_names, tuple(['-' * x for x in field_lengths])))
self._format = field_separator.join(['%%(%s)-%ds' % (f, n) for (f, n) in zip(field_names, field_lengths)]) + "\n"
def print_header(self):
self.write(self._format % self._header_labels)
self.write(self._format % self._header_lines)
def print_channel(self, channel):
self.write(self._format % channel)
class ListPVsOutputProcessor(OutputProcessor):
def __init__(self, out):
OutputProcessor.__init__(self, out)
def print_channel(self, channelDict):
self.write(channelDict['Channel'])
self.write('\n')
class Counter:
"""
A simple counter, because for closures to work, Python needs an object, not a primitive.
"""
def __init__(self, start_from=0):
self.count = start_from
def increment(self, amount=1):
self.count += amount
def main():
opts, args = getopt.getopt(sys.argv[1:], 'df:hi:lrt:u:vx',
['deleted', 'exact-search', 'facility=', 'help', 'ioc=', 'limit=', 'listpvs', 'regex',
'timeout=', 'url=', 'version'])
url = WS_URL
timeout = TIMEOUT
search_opts = {'source': 'active', 'limit': 100}
display_opts = {'outputmode': 'table',
'header_fields': HEADER_FIELDS['active'],
'field_separator': ' '
}
for o, a in opts:
if o in ('-d', '--deleted'):
search_opts['source'] = 'deleted'
timeout = 60
if o in ('-f', '--facility'):
search_opts['facility'] = a
if o in ('-h', '--help'):
usage(sys.stdout)
return 0
if o in ('-i', '--ioc'):
search_opts['ioc'] = a
if o in ('-l', '--listpvs'):
display_opts['outputmode'] = 'listpvs'
if o in ('--limit',):
search_opts['limit'] = int(a)
timeout = 60
if o in ('-r', '--regex'):
search_opts['match'] = 'regex'
if o in ('-t', '--timeout'):
timeout = float(a)
if o in ('-u', '--url'):
url = a
if o in ('-v', '--version'):
sys.stdout.write('%s - %s\n' % (PROGRAM, __version__))
return 0
if o in ('-x', '--exact-search'):
search_opts['match'] = 'exact'
if len(args) == 0:
raise RuntimeError('No search pattern given. Try -h for help.')
if len(args) > 1:
raise RuntimeError('Too many arguments. Try -h for help.')
display_opts['header_fields'] = HEADER_FIELDS[search_opts['source']]
output_processor = create_output_processor(sys.stdout, display_opts)
output_processor.print_header()
pattern = args[0]
num_results = Counter() # need instance, because of closure
def channel_callback(channel):
num_results.increment()
output_processor.print_channel(channel)
search(url, pattern, search_opts, timeout, FindChannelHandler(channel_callback))
output_processor.print_footer()
if num_results.count and num_results.count == search_opts['limit']:
sys.stderr.write('%s: WARNING! Number of search results exactly matches limit. Maybe there is more data...\n'
% PROGRAM)
def usage(out):
out.write('''
Usage: findrecord [OPTIONS] PVSEARCH
OPTIONS:
-d, --deleted Search for deleted records
-f FACILITY, --facility FACILITY Limit search to FACILITY
-h, --help Display instructions and exit
-i IOC, --ioc IOC Limit search to IOC
-l, --listpvs Display only PV names (one per line)
--limit COUNT Limit number of results to COUNT
(default: 100, 0=no limit)
-r, --regex Treat PATTERN as a regular expression
-t SEC, --timeout SEC Timeout in seconds (default = 15)
-u URL, --url URL Set base URL of web service.
-v, --version Display version and exit
-x, --exact-search Disable wildcard searches
NOTE: PVSEARCH must be preceded with '--' if PVSEARCH itself starts
with a '-' (see examples below).
EXAMPLES:
1. Search for all PVs that contain 'VME' anywhere in the name
(implicit wildcard search):
findrecord VME
2. Search for all PVs that start with 'ARIDI-PCT':
findrecord ARIDI-PCT%
findrecord -r '^ARIDI-PCT'
3. Search for all PVs ending in ':CURRENT':
findrecord %:CURRENT
findrecord -r ':CURRENT$'
4. Search for all PVs containing '-PCT' (note the '--'):
findrecord -- -PCT
5. Search for all PVs starting with 'ARIDI' and ending in ':CURRENT'
(note that no implicit prefix and suffix % are added for you):
findrecord ARIDI%:CURRENT
findrecord -r '^ARIDI.*:CURRENT$'
6. Search for all PVs with 'ARIDI' anywhere in the name, followed by
':CURRENT' anywhere behind that (note the exmplicit prefix and
suffix % around the search term):
findrecord %ARIDI%:CURRENT%
findrecord -r 'ARIDI.*:CURRENT'
''')
def create_output_processor(out, display_opts):
if display_opts['outputmode'] == 'table':
labels, widths, field_names = zip(*display_opts['header_fields'])
result = TableOutputProcessor(out, display_opts['field_separator'], labels, widths, field_names)
elif display_opts['outputmode'] == 'listpvs':
result = ListPVsOutputProcessor(out)
else:
raise RuntimeError('Unsupported output mode: %s' % display_opts['outputmode'])
return result
def search(url, pattern, search_opts, timeout, xml_handler):
"""
Search the webservice at `url` for `pattern`.
:param url: The URL to the web service.
:param pattern: The pattern to search for.
:param ioc: Limit search to this IOC
:param timeout: The number of seconds to wait for an HTTP connection.
:param xml_handler: The SAX content handler to use when parsing the HTTP response.
"""
# Workaround for https://tracker.psi.ch/jira/browse/CTRLIT-3391
if pattern[-1] == ':':
if 'match' not in search_opts:
pattern = '%' + pattern + '%'
elif search_opts['match'] == 'regex':
pattern = pattern + '.*'
elif search_opts['match'] == 'exact':
raise ValueError('Unfortunately you found a known bug. Your search pattern must not end in ":" when using the exact matching mode.')
query = search_opts.copy()
query['format'] = 'xml'
full_url = '%s/%s?%s' % (url, urllib.quote(pattern), urllib.urlencode(query))
# In Python 2.4 (SL5), `urlopen` does not have a `timeout` parameter.
# We have to use the timeout mechanism of the `socket` module.
socket.setdefaulttimeout(timeout)
try:
f = urllib2.urlopen(full_url)
try:
parser = xml.sax.make_parser()
parser.setContentHandler(xml_handler)
parser.parse(f)
finally:
f.close()
except urllib2.HTTPError, e:
if e.code == 500: # internal server error
raise RuntimeError('The web service encountered an error. Please inform Controls IT.')
if e.code == 503: # service not available
raise RuntimeError('The web service is currently not available. Try again in a few minutes.')
raise e # nothing special; just raise it again
if __name__ == '__main__':
print "a"
sys.argv = ["findrecord.py", "AVG"]
main()
script/tstinject.py
+14
View File
@@ -0,0 +1,14 @@
from startup import inject, set_return
def test():
#from startup import lscan
#print lscan
inject()
global motor
print motor
motor=1
print motor
inject()
print motor
set_return("VIVA")