This commit is contained in:
2020-03-13 14:03:25 +01:00
parent c4dd79e610
commit ac9c08808a
19 changed files with 109 additions and 75 deletions

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 ]

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>

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>

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'")

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)

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>

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 ]