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

Startup

Browse Source
This commit is contained in:
gobbo_a
2020-03-13 14:03:25 +01:00
parent c4dd79e610
commit ac9c08808a
19 changed files with 109 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
config/config.properties
View File

@@ -1,35 +1,35 @@
#Fri Feb 28 09:31:07 CET 2020
#Fri Mar 13 14:03:18 CET 2020
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=true
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

6
config/devices.properties
View File

@@ -122,8 +122,8 @@ gamma=ch.psi.pshell.device.DummyMotor||||true
eta=ch.psi.pshell.device.DummyMotor||||true
chi=ch.psi.pshell.device.DummyMotor||||true
phi=ch.psi.pshell.device.DummyMotor||||true
sixc=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta chi phi|||
#sixc=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta chi phi|||
fivec=ch.psi.pshell.device.MotorGroupBase|delta gamma eta chi phi|||
fourc=ch.psi.pshell.device.MotorGroupBase|delta eta chi phi|||
fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta|||
#fourc=ch.psi.pshell.device.MotorGroupBase|delta eta chi phi|||
#fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta|||
energy=ch.psi.pshell.device.DummyPositioner||||true

2
config/jcae.properties
View File

@@ -1,4 +1,4 @@
#Thu Sep 19 11:25:15 CEST 2019
#Fri Mar 06 11:41:38 CET 2020
ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
ch.psi.jcae.impl.DefaultChannelService.timeout=500
ch.psi.jcae.ChannelFactory.timeout=200

2
config/settings.properties
View File

@@ -1,4 +1,4 @@
#Thu Feb 27 15:51:16 CET 2020
#Fri Mar 13 14:03:10 CET 2020
test=1
geometry=fourcv
ScanIndex=5

4
config/variables.properties
View File

@@ -1,2 +1,2 @@
#Fri Feb 28 09:22:05 CET 2020
FileSequentialNumber=467
#Wed Mar 11 11:25:15 CET 2020
FileSequentialNumber=1407

1
script/*.scan
View File

@@ -1 +0,0 @@
[ "Time series", [ ], [ [ "CamServer", "http://localhost:8889/simulation_sp1?channel=x_fit_mean", 3, 0.1, null ] ], false, [ ], "", 20, 0.0, 0.1, true, true, true, true, "", "", "Default", "h5", 0, null, null, "Positioner" ]

18
script/local.py
View File

@@ -17,9 +17,9 @@ def on_command_finished(info):
###################################################################################################
# Layout setup
###################################################################################################
import ch.psi.pshell.data.LayoutSF as LayoutSF
#import ch.psi.pshell.data.LayoutSF as LayoutSF
LayoutSF.setExperimentArguments([pv, motor, pe, cv, energy, sin])
#LayoutSF.setExperimentArguments([pv, motor, pe, cv, energy, sin])
@@ -126,8 +126,8 @@ class SimulatedInput(Readable):
sout = SimulatedOutput()
sinp = SimulatedInput()
for m in mu, delta, gamma, eta, chi, phi:
m.setSpeed(m.config.defaultSpeed)
#for m in mu, delta, gamma, eta, chi, phi:
# m.setSpeed(m.config.defaultSpeed)
#Controler Evenrt Listener
@@ -808,8 +808,8 @@ def is_geometry_set():
return get_device("wavelength") is not None
mu.moveAsync(0.0)
eta.moveAsync(0.0)
delta.moveAsync(45.0)
gamma.moveAsync(0.0)
energy.write(9.5)
#mu.moveAsync(0.0)
#eta.moveAsync(0.0)
#delta.moveAsync(45.0)
#gamma.moveAsync(0.0)
#energy.write(9.5)

1
script/queues/q1.que Normal file
View File

@@ -0,0 +1 @@
[ [ [ "Disabled", "test/test.scan", "", "Abort", "" ], [ "File", "test/test2", "\"START\":0,\"STOP\":10, \"STEPS\":10", "Resume", "" ], [ "File", "test/test1.xml", "", "Resume", "" ], [ "File", "test/test1", "", "Resume", "" ], [ "File", "test.scan", "", "Resume", "" ], [ "File", "test/test6", "", "Retry", "" ] ] ]

1
script/queues/q2.que Normal file
View File

@@ -0,0 +1 @@
[ [ [ false, "test/test.scan", "", "Abort", "Disabled" ], [ true, "test/test2", "\"START\":0,\"STOP\":10, \"STEPS\":10", "Resume", "Success" ], [ true, "", "print \"HERE\"", "Resume", "Success" ], [ true, "test/test1.xml", "", "Resume", "Success" ], [ true, "test/test1", "", "Resume", "Success" ], [ true, "test.scan", "", "Resume", "Failure" ], [ true, "test/test6", "", "Retry", "Success" ] ] ]

1
script/queues/q3.que Normal file
View File

@@ -0,0 +1 @@
[ [ [ true, "test.test", "", "Resume", "" ] ] ]

1
script/test/dummy.scan Normal file
View File

@@ -0,0 +1 @@
[ "Linear", [ ], [ ], false, [ ], "", 1, 1.0, 0.0, false, false, true, true, "", "", " ", "", 0, null, null, "Positioner", false, true ]

1
script/test/test10.scan Normal file
View File

@@ -0,0 +1 @@
[ "Continuous", [ [ "Device", "motor", 0.0, 5.0, 0.1 ] ], [ [ "Device", "sin", 2, 0.1, "Enabled" ] ], false, [ ], "", 2, 0.0, 0.1, false, false, true, true, "", "", "Default", "h5", 0, null, null, "Positioner", false, false ]

22
script/test/test17.xml
View File

@@ -3,19 +3,33 @@
<notification>
<recipient error="true" success="false">alexandre.gobbo@psi.ch</recipient>
</notification>
<data fileName="test1"/>
<description>My first test</description>
<data fileName="test3"/>
<description>My third test </description>
<variable name="var1" value="0.0"/>
<scan>
<dimension zigzag="false" dataGroup="false">
<positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinearPositioner" name="TESTIOC:TESTCALCOUT:Input" asynchronous="false" id="id278043">
<start>0.0</start>
<end>31.0</end>
<stepSize>0.01</stepSize>
<stepSize>0.1</stepSize>
</positioner>
<action xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptAction">
<mapping channel="TESTIOC:TESTSINUS:SinCalc" variable="x"/>
<script>import time
def process(x):
time.sleep(0.1)
#print "==&gt;" + str(x.getValue())
</script>
</action>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="TESTIOC:TESTCALCOUT:Output" id="id348623"/>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="TESTIOC:TESTSINUS:SinCalc" id="id367393"/>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="Timestamp" id="id192931"/>
</dimension>
<manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="id173831">
<mapping xsi:type="IDParameterMapping" refid="id367393" variable="v"/>
<script>def process(v):
return v+100.0</script>
</manipulation>
</scan>
<visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id278043" y="id348623 id367393"/>
<visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id192931" y="id348623 id173831"/>
</configuration>

40
script/test/test18.xml
View File

@@ -1,22 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0" numberOfExecution="1" failOnSensorError="true">
<data fileName="test"/>
<notification>
<recipient error="true" success="false">alexandre.gobbo@psi.ch</recipient>
</notification>
<data fileName="test3"/>
<description>My third test </description>
<variable name="var1" value="0.0"/>
<scan>
<dimension zigzag="false" dataGroup="false">
<positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" id="id226053">
<counts>4</counts>
<positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinearPositioner" name="TESTIOC:TESTCALCOUT:Input" asynchronous="false" id="id278043">
<start>0.0</start>
<end>31.0</end>
<stepSize>1.0</stepSize>
</positioner>
<action xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptAction">
<mapping channel="TESTIOC:TESTSINUS:SinCalc" variable="x"/>
<script>import time
def process(x):
time.sleep(0.1)
#print "==&gt;" + str(x.getValue())
</script>
</action>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="TESTIOC:TESTCALCOUT:Output" id="id348623"/>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="TESTIOC:TESTSINUS:SinCalc" id="id367393"/>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="Timestamp" id="id192931"/>
</dimension>
<dimension zigzag="false" dataGroup="false">
<positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="PseudoPositioner" id="id236750">
<counts>4</counts>
</positioner>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="Timestamp" id="id246209"/>
</dimension>
<manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="id575126">
<script>def process():
return 0.0</script>
<postAction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ChannelAction" channel="TESTIOC:TESTCALCOUT:Input" value="100"/>
<manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="id173831">
<mapping xsi:type="IDParameterMapping" refid="id367393" variable="v"/>
<script>def process(v):
return v+100.0</script>
</manipulation>
</scan>
<visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="MatrixPlot" x="id226053" y="id236750" z="id246209"/>
<visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="id192931" y="id348623 id173831"/>
</configuration>

6
script/test/test2.py
View File

@@ -1,7 +1,9 @@
"""
Line Scan with 2 writables and triggering
"""
index=0
def BeforeReadout():
@@ -13,5 +15,5 @@ def BeforeReadout():
caput("TESTIOC:TESTBO:MyBO","Off")
a= lscan((inp), (sin,out,arr), 0, 4, 20, 0.1, before_read=BeforeReadout)
a= lscan((inp), (sin,out,arr), START, STOP, STEPS, 0.1, before_read=BeforeReadout)
set_exec_pars(then="print 'OK'")

2
script/test/test6.py
View File

@@ -24,7 +24,7 @@ class Listener (DeviceListener):
sensor=Sensor()
positioner=Positioner()
listener = Listener()
sin_val=sin.read()
sin.addListener(listener)
try:
a= lscan((inp,positioner),(sin,sensor),(0,0),(40,10),20,0.1)

12
script/test/test7.xml
View File

@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0" numberOfExecution="1" failOnSensorError="true">
<notification>
<recipient>alexandre.gobbo@psi.ch</recipient>
<recipient error="true" success="false">alexandre.gobbo@psi.ch</recipient>
</notification>
<data fileName="test3"/>
<description>My third test</description>
<variable name="var1" value="0.0"/>
<scan>
<dimension>
<positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinearPositioner" name="TESTIOC:TESTCALCOUT:Input" id="id278043">
<dimension zigzag="false" dataGroup="false">
<positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinearPositioner" name="TESTIOC:TESTCALCOUT:Input" asynchronous="false" id="id278043">
<start>0.0</start>
<end>31.0</end>
<stepSize>1.0</stepSize>
<stepSize>0.1</stepSize>
</positioner>
<action xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptAction">
<mapping channel="TESTIOC:TESTSINUS:SinCalc" variable="x"/>
<script>import time
def process(x):
time.sleep(0.1)
#print &quot;==&gt;&quot; + str(x.getValue())
#print "==&gt;" + str(x.getValue())
</script>
</action>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="TESTIOC:TESTCALCOUT:Output" id="id348623"/>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" name="TESTIOC:TESTSINUS:SinCalc" id="id367393"/>
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="Timestamp" id="id192931"/>
</dimension>
<manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" id="id173831">
<manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="id173831">
<mapping xsi:type="IDParameterMapping" refid="id367393" variable="v"/>
<script>def process(v):
return v+100.0</script>

2
script/test/test9.scan
View File

@@ -1 +1 @@
[ "Time series", [ ], [ [ "Device", "sin", 1, 0, "Enabled" ] ], false, [ ], "", 10, 1.0, 0.1, false, false, true, true, "", "", "", "", 0, null, null, "Positioner", false, true ]
[ "Linear", [ ], [ ], false, [ ], "", 1, 1.0, 0.0, false, false, true, true, "", "", " ", "", 0, null, null, "Positioner", false, true ]

2
script/test2.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<configuration xmlns="http://www.psi.ch/~ebner/models/scan/1.0">
<data/>
<data fileName="test2.xml"/>
<scan/>
</configuration>