From 26f2897a7e827d02fcc8cdc82062fe247dd68c6d Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Tue, 30 Jul 2013 15:37:06 +0200
Subject: [PATCH] Fixed asynchronous/nowait confusion

---
 ch.psi.fda/pom.xml                                             | 2 +-
 ch.psi.fda/src/main/java/ch/psi/fda/aq/ng/ScanMapperNG.java    | 3 +--
 .../main/java/ch/psi/fda/core/actions/ChannelAccessPut.java    | 2 +-
 .../ch/psi/fda/core/actors/ChannelAccessFunctionActuator.java  | 2 +-
 .../ch/psi/fda/core/actors/ChannelAccessLinearActuator.java    | 2 +-
 .../ch/psi/fda/core/actors/ChannelAccessTableActuator.java     | 2 +-
 ch.psi.fda/src/main/java/ch/psi/fda/core/loops/OTFBean.java    | 2 +-
 .../java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java     | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index 24d7835..11b2e01 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -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>
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/ng/ScanMapperNG.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/ng/ScanMapperNG.java
index bfeac41..5fe21e8 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/ng/ScanMapperNG.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/ng/ScanMapperNG.java
@@ -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");
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessPut.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessPut.java
index 809b4c0..60b6387 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessPut.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessPut.java
@@ -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){
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessFunctionActuator.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessFunctionActuator.java
index 719492c..74f6a8b 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessFunctionActuator.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessFunctionActuator.java
@@ -217,7 +217,7 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
 				}
 			}
 			else{
-				channel.setValueAsync(fvalue);
+				channel.setValueNoWait(fvalue);
 			}
 			
 			if(doneChannel != null){
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessLinearActuator.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessLinearActuator.java
index ea42a55..7f108b8 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessLinearActuator.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessLinearActuator.java
@@ -198,7 +198,7 @@ public class ChannelAccessLinearActuator<T> implements Actor {
 				}
 			}
 			else{
-				channel.setValueAsync(value);
+				channel.setValueNoWait(value);
 			}
 			
 			if(doneChannel != null){
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessTableActuator.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessTableActuator.java
index 2d849d4..b167451 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessTableActuator.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/actors/ChannelAccessTableActuator.java
@@ -183,7 +183,7 @@ public class ChannelAccessTableActuator<T> implements Actor {
 				}
 			}
 			else{
-				channel.setValueAsync(table[count]);
+				channel.setValueNoWait(table[count]);
 			}
 			
 			
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/OTFBean.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/OTFBean.java
index 9bd99d6..825496b 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/OTFBean.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/OTFBean.java
@@ -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);
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java
index f96f818..ff3ae6a 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ParallelCrlogicTest.java
@@ -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();