This commit is contained in:
2019-12-10 09:29:54 +01:00
parent a1e2b8d128
commit d0f7d2b02f
10 changed files with 101 additions and 33 deletions

View File

@@ -1,35 +1,35 @@
#Fri Nov 22 10:21:53 CET 2019
#Tue Dec 10 09:29:34 CET 2019
autoSaveScanData=true
commandExecutionEvents=false
createSessionFiles=false
dataLayout=default
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
dataProvider=h5
dataScanFlushRecords=false
dataScanPreserveTypes=true
dataScanReleaseRecords=false
dataServerPort=5573
depthDimension=0
generateCommandExecutionEvents=true
hideServerMessages=false
hostName=
instanceName=Dev
logDaysToLive=50
logLevel=Fine
logLevelConsole=Off
logPath={logs}/{date}_{time}
notificationLevel=Off
parallelInitialization=false
saveCommandStatistics=true
scanStreamerPort=5563
serverEnabled=false
serverPort=8080
simulation=false
terminalEnabled=false
terminalPort=0
commandExecutionEvents=false
logDaysToLive=50
userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
userManagement=true
versionTrackingEnabled=false
versionTrackingLogin={context}/svcusr-hlapp_robot
logLevelConsole=Off
scanStreamerPort=5563
parallelInitialization=false
versionTrackingManual=false
hostName=
userManagement=true
instanceName=Dev
dataServerPort=5573
hideServerMessages=false
serverPort=8080
versionTrackingEnabled=true
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
serverEnabled=true
dataScanReleaseRecords=false
depthDimension=0
dataScanPreserveTypes=true
logLevel=Fine
dataScanFlushRecords=false
logPath={logs}/{date}_{time}
dataLayout=default
generateCommandExecutionEvents=true
terminalEnabled=false
notificationLevel=Off
terminalPort=0
createSessionFiles=false
versionTrackingLogin={context}/svcusr-hlapp_robot
versionTrackingRemote=git@git.psi.ch\:pshell_config/dev.git
dataProvider=h5
saveCommandStatistics=true

View File

@@ -64,6 +64,8 @@ sin=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3 true|||true
#average=ch.psi.pshell.device.Averager|sin||2000|
#isin=ch.psi.pshell.epics.ChannelInteger|TESTIOC:TESTSINUS:SinCalc|||true
arr=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF 6 -1 false|||true
histo=ch.psi.pshell.device.HistogramGenerator|sin|||false
histo2=ch.psi.pshell.device.HistogramGenerator|sin 200 NaN NaN 100||3000|false
arr1=ch.psi.pshell.epics.ChannelIntegerArray|TESTIOC:TESTWF2:MyWF -1 false|||
mt=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 2 3 false|||
mt1=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 3 2 False None [i|||

View File

@@ -1,3 +1,4 @@
AthosScreens-1.0.0.jar=disabled
Eiger.java=disabled
AthosCameras.java=disabled
ScreenPanel5.java=disabled

View File

@@ -1,2 +1,2 @@
#Thu Nov 21 16:56:50 CET 2019
FileSequentialNumber=211
#Thu Dec 05 12:46:01 CET 2019
FileSequentialNumber=215

View File

@@ -1,4 +1,4 @@
#Wed Nov 13 09:53:30 CET 2019
#Mon Dec 02 15:28:31 CET 2019
spatialCalOffsetY=-485.427166868422
spatialCalOffsetX=-638.5965043983313
colormapLogarithmic=false

7
devices/histo.properties Normal file
View File

@@ -0,0 +1,7 @@
#Wed Nov 27 17:20:46 CET 2019
bins=100
interval=0
max=150.0
min=80.0
numberOfSamples=1000
precision=-1

Binary file not shown.

View File

@@ -0,0 +1,17 @@
def check():
if caget('TESTIOC:TESTCALCOUT:Output') != 103.9:
raise Exception ("ERROR")
def func():
for i in range(100):
#print i
check()
#func()
print parallelize(func, func, func,func, func, func,func, func, func)

8
script/test/TestHist.py Normal file
View File

@@ -0,0 +1,8 @@
import ch.psi.pshell.device.HistogramGenerator as Hist
h=Hist("hist",pe.readback, 100, 100.0,500.0,100)
h.monitored=True
h.initialize()
show_panel(h)
show_panel(pe)

33
script/test/TestLog.py Normal file
View File

@@ -0,0 +1,33 @@
data = [1e-13,1e-14,1e-15, 1e-20] * 100
#data = [1e30, 1e10, 1e2, 1e-20,1e-22,1e-25, 1e-32, -1e10]
#data= [1e-1,1e-2,1e-3,1e-4]
#data = [1e12,1e13,1e14,1e15]
#ata = [-1e12,-1e13,-1e14,-1e15]
#data = [1e-2,1e-1,1e0,1e1, 1e2]
#Qdata = [-1e2,-1e1,-1e-1,1e-1,1e1, 1e2]
p = plot(data)[0]
ay=p.getAxis(p.AxisId.Y)
#ay.setLogarithmic(True)
ax=p.getAxis(p.AxisId.X)
ax.setLogarithmic(True)
a=p.chart.getXYPlot().getRangeAxis()
"""
p = plot([50, 10,500,1000,5000,1000], xdata = [-10, 0.1,1,10,100,1000, 10000])[0]
p.getAxis(p.AxisId.X).logarithmic = True
p.getAxis(p.AxisId.Y).setRange(1, 100000)
p.getAxis(p.AxisId.Y).logarithmic = True
a=p.chart.getXYPlot().getRangeAxis()
a.setLog10TickLabelsFlag(True)
"""