fda/ch.psi.fda
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed asynchronous/nowait confusion

Browse Source
This commit is contained in:
ebner
2013-07-30 15:37:06 +02:00
parent 6fedd86d23
commit 26f2897a7e
8 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ch.psi.fda/pom.xml
View File

@@ -9,7 +9,7 @@
<dependency>
<groupId>ch.psi</groupId>
<artifactId>jcae</artifactId>
<version>2.1.10</version>
<version>2.1.11</version>
</dependency>
<!-- Plotting library -->
<dependency>

3
ch.psi.fda/src/main/java/ch/psi/fda/aq/ng/ScanMapperNG.java
View File

@@ -222,7 +222,6 @@ public class ScanMapperNG {
script.append(indentation + var+"_positions="+b.toString()+"\n");
}
else if(positioner instanceof FunctionPositioner){
FunctionPositioner fpositioner = (FunctionPositioner) positioner;
// TODO take variable mappings into account !
}
else if(positioner instanceof PseudoPositioner){
@@ -307,7 +306,7 @@ public class ScanMapperNG {
}
break;
case "putq":
script.append(var+".setValueAsync("+getPythonValue(ca.getValue(), type)+")\n");
script.append(var+".setValueNoWait("+getPythonValue(ca.getValue(), type)+")\n");
break;
case "wait":
script.append(var+".waitForValue("+getPythonValue(ca.getValue(), type)+", "+waitTimeout+")\n");

2
ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessPut.java
View File

@@ -105,7 +105,7 @@ public class ChannelAccessPut<E> implements Action {
logger.finest("Put to channel: "+channel.getName()+ " asynchronous: "+asynchronous);
try{
if(asynchronous){
channel.setValueAsync(value);
channel.setValueNoWait(value);
}
else{
if(timeout==null){

2
ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessFunctionActuator.java
View File

@@ -217,7 +217,7 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
}
}
else{
channel.setValueAsync(fvalue);
channel.setValueNoWait(fvalue);
}
if(doneChannel != null){

2
ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessLinearActuator.java
View File

@@ -198,7 +198,7 @@ public class ChannelAccessLinearActuator<T> implements Actor {
}
}
else{
channel.setValueAsync(value);
channel.setValueNoWait(value);
}
if(doneChannel != null){

2
ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessTableActuator.java
View File

@@ -183,7 +183,7 @@ public class ChannelAccessTableActuator<T> implements Actor {
}
}
else{
channel.setValueAsync(table[count]);
channel.setValueNoWait(table[count]);
}

2
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/OTFBean.java
View File

@@ -175,7 +175,7 @@ public class OTFBean {
this.command.setValue(Command.STOP.ordinal());
// Do not wait for put to return
this.running.setValueAsync(false);
this.running.setValueNoWait(false);
}
catch(Exception e){
throw new RuntimeException("Unable to abort OTF logic" ,e);

2
ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java
View File

@@ -116,7 +116,7 @@ public class ParallelCrlogicTest {
ParallelCrlogic pcrlogic = new ParallelCrlogic(crlogic, scrlogic);
logger.info("Start scaler");
scalertemplate.getCommand().setValueAsync(VSC16ScalerChannelsTemplate.Command.Count.ordinal());
scalertemplate.getCommand().setValueNoWait(VSC16ScalerChannelsTemplate.Command.Count.ordinal());
pcrlogic.prepare();
pcrlogic.execute();