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

Moved to newest jcae

Browse Source
This commit is contained in:
ebner
2013-07-25 08:22:24 +02:00
parent 93cd7668b6
commit 1d05d36b5c
44 changed files with 1299 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ch.psi.fda/.classpath
View File

@@ -28,6 +28,10 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

6
ch.psi.fda/.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,5 +1,5 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.7

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

@@ -9,7 +9,7 @@
<dependency>
<groupId>ch.psi</groupId>
<artifactId>jcae</artifactId>
<version>1.0.30</version>
<version>2.1.8</version>
</dependency>
<!-- Plotting library -->
<dependency>
@@ -58,12 +58,24 @@
<artifactId>freehep-xdr</artifactId>
<version>2.0.4</version>
</dependency>
<!-- JUnit test library -->
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
</dependency>
<dependency>
<scope>test</scope>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
<version>4.11</version>
</dependency>
</dependencies>
@@ -73,8 +85,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<!-- Generate Javadoc Jar -->

97
ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java
View File

@@ -19,8 +19,6 @@
package ch.psi.fda.aq;
import gov.aps.jca.CAException;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
@@ -118,7 +116,8 @@ import ch.psi.fda.model.v1.Variable;
import ch.psi.fda.model.v1.VariableParameterMapping;
import ch.psi.fda.notification.NotificationAgent;
import ch.psi.fda.serializer.DataSerializerTXT;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Data acquisition engine for performing scans
@@ -146,6 +145,8 @@ public class Acquisition {
private Handler logHandler = null;
private ChannelService cservice;
/**
* Name of the datafile
*/
@@ -181,7 +182,9 @@ public class Acquisition {
* @throws InterruptedException
*/
public DataQueue initalize(Configuration smodel, boolean getQueue) {
cservice = new DefaultChannelService();
// Create notification agent with globally configured recipients
notificationAgent = new NotificationAgent(configuration.getSmptServer(), "fda.notification@psi.ch");
@@ -367,11 +370,9 @@ public class Acquisition {
// Destroy the CA context
try {
logger.fine("Destroy Channel Access context");
ChannelBeanFactory.getFactory().getChannelFactory().destroyContext();
cservice.destroy();
} catch (IllegalStateException e) {
logger.log(Level.SEVERE, "Unable to destroy channel access context", e);
} catch (CAException e) {
logger.log(Level.SEVERE, "Unable to destroy channel access context", e);
}
logger.fine("Context destroyed");
@@ -509,7 +510,7 @@ public class Acquisition {
}
}
JythonManipulation manipulation = new JythonManipulation(sm.getId(), sm.getScript(), mapping, sm.isReturnArray());
JythonManipulation manipulation = new JythonManipulation(cservice, sm.getId(), sm.getScript(), mapping, sm.isReturnArray());
this.manipulations.add(manipulation);
}
}
@@ -535,24 +536,24 @@ public class Acquisition {
timeout = Math.round(ca.getTimeout()*1000);
}
if(type.equals("String")){
alist.add(new ChannelAccessPut<String>(ca.getChannel(), ca.getValue(), false, timeout));
alist.add(new ChannelAccessPut<String>(cservice, ca.getChannel(), ca.getValue(), false, timeout));
}
else if(type.equals("Integer")){
alist.add(new ChannelAccessPut<Integer>(ca.getChannel(), new Integer(ca.getValue()), false, timeout));
alist.add(new ChannelAccessPut<Integer>(cservice, ca.getChannel(), new Integer(ca.getValue()), false, timeout));
}
else if(type.equals("Double")){
alist.add(new ChannelAccessPut<Double>(ca.getChannel(), new Double(ca.getValue()), false, timeout));
alist.add(new ChannelAccessPut<Double>(cservice, ca.getChannel(), new Double(ca.getValue()), false, timeout));
}
}
else if(operation.equals("putq")){
if(type.equals("String")){
alist.add(new ChannelAccessPut<String>(ca.getChannel(), ca.getValue(), true, null));
alist.add(new ChannelAccessPut<String>(cservice, ca.getChannel(), ca.getValue(), true, null));
}
else if(type.equals("Integer")){
alist.add(new ChannelAccessPut<Integer>(ca.getChannel(), new Integer(ca.getValue()), true, null));
alist.add(new ChannelAccessPut<Integer>(cservice, ca.getChannel(), new Integer(ca.getValue()), true, null));
}
else if(type.equals("Double")){
alist.add(new ChannelAccessPut<Double>(ca.getChannel(), new Double(ca.getValue()), true, null));
alist.add(new ChannelAccessPut<Double>(cservice, ca.getChannel(), new Double(ca.getValue()), true, null));
}
}
else if(operation.equals("wait")){
@@ -561,13 +562,13 @@ public class Acquisition {
timeout = Math.round(ca.getTimeout()*1000);
}
if(type.equals("String")){
alist.add(new ChannelAccessCondition<String>(ca.getChannel(), ca.getValue(), timeout));
alist.add(new ChannelAccessCondition<String>(cservice, ca.getChannel(), ca.getValue(), timeout));
}
else if(type.equals("Integer")){
alist.add(new ChannelAccessCondition<Integer>(ca.getChannel(), new Integer(ca.getValue()), timeout));
alist.add(new ChannelAccessCondition<Integer>(cservice, ca.getChannel(), new Integer(ca.getValue()), timeout));
}
else if(type.equals("Double")){
alist.add(new ChannelAccessCondition<Double>(ca.getChannel(), new Double(ca.getValue()), timeout));
alist.add(new ChannelAccessCondition<Double>(cservice, ca.getChannel(), new Double(ca.getValue()), timeout));
}
}
else if(operation.equals("waitREGEX")){
@@ -576,7 +577,7 @@ public class Acquisition {
timeout = Math.round(ca.getTimeout()*1000);
}
if(type.equals("String")){
alist.add(new ChannelAccessConditionRegex<String>(ca.getChannel(), ca.getValue(), timeout));
alist.add(new ChannelAccessConditionRegex<String>(cservice, ca.getChannel(), ca.getValue(), timeout));
}
else{
logger.warning("Operation "+operation+" wity type "+type+" for action is not supported");
@@ -589,7 +590,7 @@ public class Acquisition {
}
if(type.equals("Integer")){
alist.add(new ChannelAccessConditionOr<Integer>(ca.getChannel(), new Integer(ca.getValue()), timeout));
alist.add(new ChannelAccessConditionOr<Integer>(cservice, ca.getChannel(), new Integer(ca.getValue()), timeout));
}
else{
logger.warning("Operation "+operation+" wity type "+type+" for action is not supported");
@@ -601,7 +602,7 @@ public class Acquisition {
timeout = Math.round(ca.getTimeout()*1000);
}
if(type.equals("Integer")){
alist.add(new ChannelAccessConditionAnd<Integer>(ca.getChannel(), new Integer(ca.getValue()), timeout));
alist.add(new ChannelAccessConditionAnd<Integer>(cservice, ca.getChannel(), new Integer(ca.getValue()), timeout));
}
else {
logger.warning("Operation "+operation+" wity type "+type+" for action is not supported");
@@ -645,7 +646,7 @@ public class Acquisition {
logger.warning("Channel type ["+ma.getType()+"] is not supported for mapping");
}
}
alist.add(new ch.psi.fda.core.actions.JythonAction(sa.getScript(), mapping));
alist.add(new ch.psi.fda.core.actions.JythonAction(cservice, sa.getScript(), mapping));
}
}
return(alist);
@@ -678,14 +679,14 @@ public class Acquisition {
LinearPositioner lp =(LinearPositioner) p;
ChannelAccessLinearActuator<?> a;
if(lp.getType().equals("String")){
a = new ChannelAccessLinearActuator<String>(lp.getName(), lp.getDone(), lp.getDoneValue(), lp.getDoneDelay(), lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
a = new ChannelAccessLinearActuator<String>(cservice, lp.getName(), lp.getDone(), lp.getDoneValue(), lp.getDoneDelay(), lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
}
else if(lp.getType().equals("Double")){
a = new ChannelAccessLinearActuator<Double>(lp.getName(), lp.getDone(), Double.parseDouble(lp.getDoneValue()), lp.getDoneDelay(), lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
a = new ChannelAccessLinearActuator<Double>(cservice, lp.getName(), lp.getDone(), Double.parseDouble(lp.getDoneValue()), lp.getDoneDelay(), lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
}
else{
// Default
a = new ChannelAccessLinearActuator<Integer>(lp.getName(), lp.getDone(), Integer.parseInt(lp.getDoneValue()), lp.getDoneDelay(), lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
a = new ChannelAccessLinearActuator<Integer>(cservice, lp.getName(), lp.getDone(), Integer.parseInt(lp.getDoneValue()), lp.getDoneDelay(), lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
}
a.setAsynchronous(lp.isAsynchronous());
@@ -698,7 +699,7 @@ public class Acquisition {
if(name==null){
name = lp.getName();
}
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(lp.getId(), name);
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(cservice, lp.getId(), name);
aLoop.getSensors().add(sensor);
}
else if(p instanceof FunctionPositioner){
@@ -711,14 +712,14 @@ public class Acquisition {
// Create actuator
ChannelAccessFunctionActuator<?> a;
if(lp.getType().equals("String")){
a = new ChannelAccessFunctionActuator<String>(lp.getName(), lp.getDone(), lp.getDoneValue(), lp.getDoneDelay(), function, lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
a = new ChannelAccessFunctionActuator<String>(cservice, lp.getName(), lp.getDone(), lp.getDoneValue(), lp.getDoneDelay(), function, lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
}
else if(lp.getType().equals("Double")){
a = new ChannelAccessFunctionActuator<Double>(lp.getName(), lp.getDone(), Double.parseDouble(lp.getDoneValue()), lp.getDoneDelay(), function, lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
a = new ChannelAccessFunctionActuator<Double>(cservice, lp.getName(), lp.getDone(), Double.parseDouble(lp.getDoneValue()), lp.getDoneDelay(), function, lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
}
else{
// Default
a = new ChannelAccessFunctionActuator<Integer>(lp.getName(), lp.getDone(), Integer.parseInt(lp.getDoneValue()), lp.getDoneDelay(), function, lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
a = new ChannelAccessFunctionActuator<Integer>(cservice, lp.getName(), lp.getDone(), Integer.parseInt(lp.getDoneValue()), lp.getDoneDelay(), function, lp.getStart(), lp.getEnd(), lp.getStepSize(), moveTimeout);
}
a.setAsynchronous(lp.isAsynchronous());
@@ -731,7 +732,7 @@ public class Acquisition {
if(name==null){
name = lp.getName();
}
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(lp.getId(), name);
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(cservice, lp.getId(), name);
aLoop.getSensors().add(sensor);
}
else if (p instanceof ArrayPositioner){
@@ -744,14 +745,14 @@ public class Acquisition {
ChannelAccessTableActuator<?> a;
if(p.getType().equals("String")){
a = new ChannelAccessTableActuator<String>(p.getName(), p.getDone(), p.getDoneValue(), p.getDoneDelay(), table, moveTimeout);
a = new ChannelAccessTableActuator<String>(cservice, p.getName(), p.getDone(), p.getDoneValue(), p.getDoneDelay(), table, moveTimeout);
}
else if(p.getType().equals("Double")){
a = new ChannelAccessTableActuator<Double>(p.getName(), p.getDone(), Double.parseDouble(p.getDoneValue()), p.getDoneDelay(), table, moveTimeout);
a = new ChannelAccessTableActuator<Double>(cservice, p.getName(), p.getDone(), Double.parseDouble(p.getDoneValue()), p.getDoneDelay(), table, moveTimeout);
}
else{
// Default
a = new ChannelAccessTableActuator<Integer>(p.getName(), p.getDone(), Integer.parseInt(p.getDoneValue()), p.getDoneDelay(), table, moveTimeout);
a = new ChannelAccessTableActuator<Integer>(cservice, p.getName(), p.getDone(), Integer.parseInt(p.getDoneValue()), p.getDoneDelay(), table, moveTimeout);
}
a.setAsynchronous(p.isAsynchronous());
@@ -764,7 +765,7 @@ public class Acquisition {
if(name==null){
name = ap.getName();
}
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(ap.getId(), name);
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(cservice, ap.getId(), name);
aLoop.getSensors().add(sensor);
}
else if (p instanceof RegionPositioner){
@@ -797,14 +798,14 @@ public class Acquisition {
// Create actuator
ChannelAccessLinearActuator<?> act;
if(rp.getType().equals("String")){
act = new ChannelAccessLinearActuator<String>(rp.getName(), rp.getDone(), rp.getDoneValue(), rp.getDoneDelay(), start, r.getEnd(), r.getStepSize(), moveTimeout);
act = new ChannelAccessLinearActuator<String>(cservice, rp.getName(), rp.getDone(), rp.getDoneValue(), rp.getDoneDelay(), start, r.getEnd(), r.getStepSize(), moveTimeout);
}
else if(rp.getType().equals("Double")){
act = new ChannelAccessLinearActuator<Double>(rp.getName(), rp.getDone(), Double.parseDouble(rp.getDoneValue()), rp.getDoneDelay(), start, r.getEnd(), r.getStepSize(), moveTimeout);
act = new ChannelAccessLinearActuator<Double>(cservice, rp.getName(), rp.getDone(), Double.parseDouble(rp.getDoneValue()), rp.getDoneDelay(), start, r.getEnd(), r.getStepSize(), moveTimeout);
}
else{
// Default
act = new ChannelAccessLinearActuator<Integer>(rp.getName(), rp.getDone(), Integer.parseInt(rp.getDoneValue()), rp.getDoneDelay(), start, r.getEnd(), r.getStepSize(), moveTimeout);
act = new ChannelAccessLinearActuator<Integer>(cservice, rp.getName(), rp.getDone(), Integer.parseInt(rp.getDoneValue()), rp.getDoneDelay(), start, r.getEnd(), r.getStepSize(), moveTimeout);
}
act.setAsynchronous(rp.isAsynchronous());
@@ -825,14 +826,14 @@ public class Acquisition {
JythonFunction function = mapFunction(r.getFunction());
ChannelAccessFunctionActuator<?> act;
if(rp.getType().equals("String")){
act = new ChannelAccessFunctionActuator<String>(rp.getName(), rp.getDone(), rp.getDoneValue(), rp.getDoneDelay(), function, r.getStart(), r.getEnd(), r.getStepSize(), moveTimeout);
act = new ChannelAccessFunctionActuator<String>(cservice, rp.getName(), rp.getDone(), rp.getDoneValue(), rp.getDoneDelay(), function, r.getStart(), r.getEnd(), r.getStepSize(), moveTimeout);
}
else if(rp.getType().equals("Double")){
act = new ChannelAccessFunctionActuator<Double>(rp.getName(), rp.getDone(), Double.parseDouble(rp.getDoneValue()), rp.getDoneDelay(), function, r.getStart(), r.getEnd(), r.getStepSize(), moveTimeout);
act = new ChannelAccessFunctionActuator<Double>(cservice, rp.getName(), rp.getDone(), Double.parseDouble(rp.getDoneValue()), rp.getDoneDelay(), function, r.getStart(), r.getEnd(), r.getStepSize(), moveTimeout);
}
else{
// Default
act = new ChannelAccessFunctionActuator<Integer>(rp.getName(), rp.getDone(), Integer.parseInt(rp.getDoneValue()), rp.getDoneDelay(), function, r.getStart(), r.getEnd(), r.getStepSize(), moveTimeout);
act = new ChannelAccessFunctionActuator<Integer>(cservice, rp.getName(), rp.getDone(), Integer.parseInt(rp.getDoneValue()), rp.getDoneDelay(), function, r.getStart(), r.getEnd(), r.getStepSize(), moveTimeout);
}
act.setAsynchronous(rp.isAsynchronous());
@@ -852,7 +853,7 @@ public class Acquisition {
if(name==null){
name = rp.getName();
}
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(rp.getId(), name);
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(cservice, rp.getId(), name);
aLoop.getSensors().add(sensor);
}
else if(p instanceof PseudoPositioner){
@@ -899,7 +900,7 @@ public class Acquisition {
value = con.getValue();
}
conditions.add(new ChannelAccessGuardCondition(con.getChannel(), value));
conditions.add(new ChannelAccessGuardCondition(cservice, con.getChannel(), value));
}
// Create guard and add to loop
ChannelAccessGuard guard = new ChannelAccessGuard(conditions);
@@ -950,10 +951,10 @@ public class Acquisition {
// Add sensor
Sensor sensor;
if(sd.getType().equals("String")){
sensor = new ChannelAccessStringSensor(sd.getId(), sd.getName());
sensor = new ChannelAccessStringSensor(cservice, sd.getId(), sd.getName());
}
else{
sensor = new ChannelAccessDoubleSensor(sd.getId(), sd.getName());
sensor = new ChannelAccessDoubleSensor(cservice, sd.getId(), sd.getName());
}
aLoop.getSensors().add(sensor);
@@ -965,7 +966,7 @@ public class Acquisition {
aLoop.getPreSensorActions().addAll(mapActions(ad.getPreAction()));
// Ad sensor
ChannelAccessDoubleArraySensor sensor = new ChannelAccessDoubleArraySensor(ad.getId(), ad.getName(), ad.getArraySize());
ChannelAccessDoubleArraySensor sensor = new ChannelAccessDoubleArraySensor(cservice, ad.getId(), ad.getName(), ad.getArraySize());
aLoop.getSensors().add(sensor);
}
else if (detector instanceof DetectorOfDetectors){
@@ -1008,7 +1009,7 @@ public class Acquisition {
// Create loop
boolean zigZag = dimension.isZigzag(); // default value is false
OTFLoop actionLoop = new OTFLoop(configuration.getOtfChannelPrefix(), configuration.getOtfNfsServer(), configuration.getOtfNfsShare(), configuration.getOtfSmbShare(), zigZag);
OTFLoop actionLoop = new OTFLoop(cservice, configuration.getOtfChannelPrefix(), configuration.getOtfNfsServer(), configuration.getOtfNfsShare(), configuration.getOtfSmbShare(), zigZag);
actionLoop.getPreActions().addAll(mapActions(dimension.getPreAction()));
@@ -1067,7 +1068,7 @@ public class Acquisition {
// Create loop
boolean zigZag = dimension.isZigzag(); // default value is false
CrlogicLoop actionLoop = new CrlogicLoop(configuration.getOtfCrlogicPrefix(), configuration.getOtfNfsServer(), configuration.getOtfNfsShare(), configuration.getOtfSmbShare(), zigZag);
CrlogicLoop actionLoop = new CrlogicLoop(cservice, configuration.getOtfCrlogicPrefix(), configuration.getOtfNfsServer(), configuration.getOtfNfsShare(), configuration.getOtfSmbShare(), zigZag);
actionLoop.setKeepTmpFiles(configuration.isOtfCrlogicKeepTmpFiles());
actionLoop.getPreActions().addAll(mapActions(dimension.getPreAction()));
@@ -1113,11 +1114,11 @@ public class Acquisition {
List<Sensor> sensors = new ArrayList<Sensor>();
for(SimpleScalarDetector detector: dimension.getDetector()){
if(detector.isScr()){
sensors.add(new ChannelAccessDoubleSensor(detector.getId(), detector.getName()));
sensors.add(new ChannelAccessDoubleSensor(cservice, detector.getId(), detector.getName()));
}
}
// Create soft(ware) based crlogic
ScrlogicLoop scrlogic = new ScrlogicLoop(sensors);
ScrlogicLoop scrlogic = new ScrlogicLoop(cservice, sensors);
// Create parallel logic
ParallelCrlogic pcrlogic = new ParallelCrlogic(actionLoop, scrlogic);

151
ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessCondition.java
View File

@@ -2,15 +2,15 @@
*
* Copyright 2010 Paul Scherrer Institute. All rights reserved.
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This code is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation, either version 3 of the License, or (at your option) any
* later version.
*
* This code is distributed in the hope that it will be useful,
* but without any warranty; without even the implied warranty of
* merchantability or fitness for a particular purpose. See the
* GNU Lesser General Public License for more details.
* This code is distributed in the hope that it will be useful, but without any
* warranty; without even the implied warranty of merchantability or fitness for
* a particular purpose. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this code. If not, see <http://www.gnu.org/licenses/>.
@@ -19,124 +19,145 @@
package ch.psi.fda.core.actions;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.Action;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Perform a put on the specified Channel Access channel. The put can be done synchronous or
* asynchronously.
* Perform a put on the specified Channel Access channel. The put can be done
* synchronous or asynchronously.
*
* @author ebner
*
*
*/
public class ChannelAccessCondition<E> implements Action {
// Get Logger
private static Logger logger = Logger.getLogger(ChannelAccessCondition.class.getName());
/**
* Channel to set
*/
private final ChannelBean<E> channel;
private final Channel<E> channel;
/**
* Value to wait for
*/
private final E expectedValue;
private final Long timeout;
private Long timeout;
private volatile boolean abort = false;
private volatile Thread waitT = null;
/**
* Constructor
* @param channelName Name of the channel to set the value
* @param expectedValue Value to wait for
* @param timeout Timeout of the condition in milliseconds (null accepted - will take default wait timeout for channels ch.psi.jcae.ChannelBeanFactory.waitTimeout)
*
* @throws IllegalArgumentException Unable to initialize channel,
* Timeout specified is not >=0
* @param channelName
* Name of the channel to set the value
* @param expectedValue
* Value to wait for
* @param timeout
* Timeout of the condition in milliseconds (null accepted - will
* take default wait timeout for channels
* ch.psi.jcae.ChannelBeanFactory.waitTimeout)
*
* @throws IllegalArgumentException
* Unable to initialize channel, Timeout specified is not >=0
*/
@SuppressWarnings("unchecked")
public ChannelAccessCondition(String channelName, E expectedValue, Long timeout){
public ChannelAccessCondition(ChannelService s, String channelName, E expectedValue, Long timeout) {
if(timeout !=null && timeout<=0){
if (timeout != null && timeout <= 0) {
throw new IllegalArgumentException("Timeout must be > 0");
}
try {
this.channel = (ChannelBean<E>) ChannelBeanFactory.getFactory().createChannelBean( (Class<E>) expectedValue.getClass(), channelName, false);
} catch (CAException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
this.channel = (Channel<E>) s.createChannel(new ChannelDescriptor<>(expectedValue.getClass(), channelName, false));
} catch (ChannelException | TimeoutException e) {
throw new IllegalArgumentException("Unable to initialize actuator channel [name:" + channelName + "]", e);
} catch (InterruptedException e) {
throw new RuntimeException("Unable to initialize actuator channel [name:"+channelName+"]",e);
throw new RuntimeException("Unable to initialize actuator channel [name:" + channelName + "]", e);
}
this.expectedValue = expectedValue;
if(timeout==null){
this.timeout = channel.getWaitTimeout();
}
else{
if (timeout == null) {
// this.timeout = channel.get.getWaitTimeout();
this.timeout=1L;
} else {
this.timeout = timeout;
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see ch.psi.fda.core.Action#execute()
*/
/**
* @throws InterruptedException
* @throws RuntimeException Channel value did not reach expected value (within the specified timeout period)
* @throws InterruptedException
* @throws RuntimeException
* Channel value did not reach expected value (within the
* specified timeout period)
*/
@Override
public void execute() throws InterruptedException {
abort=false;
logger.finest("Checking channel "+channel.getName()+" for value "+expectedValue+" [timeout: "+timeout+"]" );
try{
abort = false;
logger.finest("Checking channel " + channel.getName() + " for value " + expectedValue + " [timeout: " + timeout + "]");
try {
waitT = Thread.currentThread();
channel.waitForValue(expectedValue, timeout); // Workaround use 10seconds default set timeout to check several times whether the channel has reached the value
} catch (CAException e) {
throw new RuntimeException("Channel [name:"+channel.getName()+"] did not reach expected value "+expectedValue+" ", e);
} catch(InterruptedException e){
if(!abort){
channel.waitForValueAsync(expectedValue).get(timeout, TimeUnit.MILLISECONDS); // Workaround use
// 10seconds default
// set timeout to
// check several
// times whether the
// channel has
// reached the value
} catch (InterruptedException e) {
if (!abort) {
throw e;
}
}
finally{
waitT=null;
} catch (ExecutionException | TimeoutException | ChannelException e) {
throw new RuntimeException("Channel [name:" + channel.getName() + "] did not reach expected value " + expectedValue + " ", e);
} finally {
waitT = null;
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see ch.psi.fda.core.Action#abort()
*/
@Override
public void abort() {
abort=true;
if(waitT!=null){
abort = true;
if (waitT != null) {
waitT.interrupt();
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see ch.psi.fda.core.Action#destroy()
*/
@Override
public void destroy() {
// Destroy channel
try {
logger.finest("Destroy action channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
logger.finest("Destroy action channel: " + channel.getName());
try {
channel.destroy();
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel [" + channel.getName() + "]", e);
}
}
}

24
ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessConditionAnd.java
View File

@@ -20,12 +20,15 @@
package ch.psi.fda.core.actions;
import java.util.Comparator;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.Action;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Perform a put on the specified Channel Access channel. The put can be done synchronous or
@@ -41,7 +44,7 @@ public class ChannelAccessConditionAnd<E extends Integer> implements Action {
/**
* Channel to set
*/
private final ChannelBean<E> channel;
private final Channel<E> channel;
/**
* Value to wait for
*/
@@ -62,15 +65,15 @@ public class ChannelAccessConditionAnd<E extends Integer> implements Action {
* Timeout specified is not >=0
*/
@SuppressWarnings("unchecked")
public ChannelAccessConditionAnd(String channelName, E expectedValue, Long timeout){
public ChannelAccessConditionAnd(ChannelService s, String channelName, E expectedValue, Long timeout){
if(timeout !=null && timeout<=0){
throw new IllegalArgumentException("Timeout must be > 0");
}
try {
this.channel = (ChannelBean<E>) ChannelBeanFactory.getFactory().createChannelBean( (Class<E>) expectedValue.getClass(), channelName, false);
} catch (CAException e) {
this.channel = s.createChannel(new ChannelDescriptor<>( (Class<E>) expectedValue.getClass(), channelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -80,7 +83,8 @@ public class ChannelAccessConditionAnd<E extends Integer> implements Action {
this.expectedValue = expectedValue;
if(timeout==null){
this.timeout = channel.getWaitTimeout();
// this.timeout = channel.getWaitTimeout();
this.timeout = 0L;
}
else{
this.timeout = timeout;
@@ -114,7 +118,7 @@ public class ChannelAccessConditionAnd<E extends Integer> implements Action {
}
}
, timeout); // Workaround use 10seconds default set timeout to check several times whether the channel has reached the value
} catch (CAException e) {
} catch (ChannelException | ExecutionException e) {
throw new RuntimeException("Channel [name:"+channel.getName()+"] did not reach expected value "+expectedValue+" ", e);
} catch(InterruptedException e){
if(!abort){
@@ -147,7 +151,7 @@ public class ChannelAccessConditionAnd<E extends Integer> implements Action {
try {
logger.finest("Destroy action channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

24
ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessConditionOr.java
View File

@@ -20,12 +20,15 @@
package ch.psi.fda.core.actions;
import java.util.Comparator;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.Action;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Perform a put on the specified Channel Access channel. The put can be done synchronous or
@@ -41,7 +44,7 @@ public class ChannelAccessConditionOr<E extends Integer> implements Action {
/**
* Channel to set
*/
private final ChannelBean<E> channel;
private final Channel<E> channel;
/**
* Value to wait for
*/
@@ -62,15 +65,15 @@ public class ChannelAccessConditionOr<E extends Integer> implements Action {
* Timeout specified is not >=0
*/
@SuppressWarnings("unchecked")
public ChannelAccessConditionOr(String channelName, E expectedValue, Long timeout){
public ChannelAccessConditionOr(ChannelService s, String channelName, E expectedValue, Long timeout){
if(timeout !=null && timeout<=0){
throw new IllegalArgumentException("Timeout must be > 0");
}
try {
this.channel = (ChannelBean<E>) ChannelBeanFactory.getFactory().createChannelBean( (Class<E>) expectedValue.getClass(), channelName, false);
} catch (CAException e) {
this.channel = s.createChannel(new ChannelDescriptor<>( (Class<E>) expectedValue.getClass(), channelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -80,7 +83,8 @@ public class ChannelAccessConditionOr<E extends Integer> implements Action {
this.expectedValue = expectedValue;
if(timeout==null){
this.timeout = channel.getWaitTimeout();
// this.timeout = channel.getWaitTimeout();
this.timeout = 0L;
}
else{
this.timeout = timeout;
@@ -114,7 +118,7 @@ public class ChannelAccessConditionOr<E extends Integer> implements Action {
}
}
, timeout); // Workaround use 10seconds default set timeout to check several times whether the channel has reached the value
} catch (CAException e) {
} catch (ChannelException | ExecutionException e) {
throw new RuntimeException("Channel [name:"+channel.getName()+"] did not reach expected value "+expectedValue+" ", e);
} catch(InterruptedException e){
if(!abort){
@@ -147,7 +151,7 @@ public class ChannelAccessConditionOr<E extends Integer> implements Action {
try {
logger.finest("Destroy action channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

24
ch.psi.fda/src/main/java/ch/psi/fda/core/actions/ChannelAccessConditionRegex.java
View File

@@ -20,12 +20,15 @@
package ch.psi.fda.core.actions;
import java.util.Comparator;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.Action;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Perform a put on the specified Channel Access channel. The put can be done synchronous or
@@ -41,7 +44,7 @@ public class ChannelAccessConditionRegex<E extends String> implements Action {
/**
* Channel to set
*/
private final ChannelBean<E> channel;
private final Channel<E> channel;
/**
* Value to wait for
*/
@@ -62,15 +65,15 @@ public class ChannelAccessConditionRegex<E extends String> implements Action {
* Timeout specified is not >=0
*/
@SuppressWarnings("unchecked")
public ChannelAccessConditionRegex(String channelName, E expectedValue, Long timeout){
public ChannelAccessConditionRegex(ChannelService s, String channelName, E expectedValue, Long timeout){
if(timeout !=null && timeout<=0){
throw new IllegalArgumentException("Timeout must be > 0");
}
try {
this.channel = (ChannelBean<E>) ChannelBeanFactory.getFactory().createChannelBean( (Class<E>) expectedValue.getClass(), channelName, false);
} catch (CAException e) {
this.channel = s.createChannel(new ChannelDescriptor<>( (Class<E>) expectedValue.getClass(), channelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -80,7 +83,8 @@ public class ChannelAccessConditionRegex<E extends String> implements Action {
this.expectedValue = expectedValue;
if(timeout==null){
this.timeout = channel.getWaitTimeout();
// this.timeout = channel.getWaitTimeout();
this.timeout = 0L;
}
else{
this.timeout = timeout;
@@ -108,7 +112,7 @@ public class ChannelAccessConditionRegex<E extends String> implements Action {
return o1.matches(o2) ? 0:1;
}
}, timeout); // Workaround use 10seconds default set timeout to check several times whether the channel has reached the value
} catch (CAException e) {
} catch (ChannelException | ExecutionException e) {
throw new RuntimeException("Channel [name:"+channel.getName()+"] did not reach expected value "+expectedValue+" ", e);
} catch(InterruptedException e){
if(!abort){
@@ -141,7 +145,7 @@ public class ChannelAccessConditionRegex<E extends String> implements Action {
try {
logger.finest("Destroy action channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

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

@@ -19,12 +19,16 @@
package ch.psi.fda.core.actions;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.Action;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Perform a put on the specified Channel Access channel. The put can be done synchronous or
@@ -40,7 +44,7 @@ public class ChannelAccessPut<E> implements Action {
/**
* Channel to set
*/
private final ChannelBean<E> channel;
private final Channel<E> channel;
/**
* Value to set
*/
@@ -62,11 +66,11 @@ public class ChannelAccessPut<E> implements Action {
* @throws IllegalArgumentException Unable to initialize channel
*/
@SuppressWarnings("unchecked")
public ChannelAccessPut(String channelName, E value, boolean asynchronous, Long timeout){
public ChannelAccessPut(ChannelService s, String channelName, E value, boolean asynchronous, Long timeout){
try {
this.channel = ChannelBeanFactory.getFactory().createChannelBean((Class<E>)value.getClass(), channelName, false);
} catch (CAException e) {
this.channel = s.createChannel(new ChannelDescriptor<>((Class<E>)value.getClass(), channelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -85,8 +89,8 @@ public class ChannelAccessPut<E> implements Action {
*
* @throws RuntimeException Unable to initialize channel
*/
public ChannelAccessPut(String channelName, E value){
this(channelName, value, false, null);
public ChannelAccessPut(ChannelService s, String channelName, E value){
this(s, channelName, value, false, null);
}
/* (non-Javadoc)
@@ -101,17 +105,17 @@ public class ChannelAccessPut<E> implements Action {
logger.finest("Put to channel: "+channel.getName()+ " asynchronous: "+asynchronous);
try{
if(asynchronous){
channel.setValueNoWait(value);
channel.setValueAsync(value);
}
else{
if(timeout==null){
channel.setValue(value);
}
else{
channel.setValue(value, timeout);
channel.setValueAsync(value).get(timeout, TimeUnit.MILLISECONDS);
}
}
} catch (CAException e) {
} catch (ChannelException | ExecutionException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new RuntimeException("Unable to set channel [name:"+channel.getName()+"] to value "+value, e);
}
@@ -134,7 +138,7 @@ public class ChannelAccessPut<E> implements Action {
try {
logger.finest("Destroy action channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

17
ch.psi.fda/src/main/java/ch/psi/fda/core/actions/JythonAction.java
View File

@@ -19,9 +19,8 @@
package ch.psi.fda.core.actions;
import gov.aps.jca.CAException;
import java.util.List;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -33,8 +32,10 @@ import javax.script.ScriptException;
import ch.psi.fda.core.Action;
import ch.psi.fda.core.scripting.JythonParameterMapping;
import ch.psi.fda.core.scripting.JythonParameterMappingChannel;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* @author ebner
@@ -61,7 +62,7 @@ public class JythonAction implements Action {
*/
private String jythonCall;
public JythonAction(String script, List<JythonParameterMappingChannel> mapping){
public JythonAction(ChannelService s, String script, List<JythonParameterMappingChannel> mapping){
// Workaround for Jython memory leak
// http://blog.hillbrecht.de/2009/07/11/jython-memory-leakout-of-memory-problem/
@@ -116,10 +117,10 @@ public class JythonAction implements Action {
for(JythonParameterMappingChannel b: mapping){
// Create channel
ChannelBean<?> cb;
Channel<?> cb;
try {
cb = ChannelBeanFactory.getFactory().createChannelBean(b.getType(), b.getChannel(), true);
} catch (CAException e) {
cb = s.createChannel(new ChannelDescriptor<>(b.getType(), b.getChannel(), true));
} catch (TimeoutException | ChannelException e) {
throw new IllegalArgumentException("Unable to establish channel: "+b.getChannel(), e);
} catch (InterruptedException e) {
throw new RuntimeException("Unable to establish channel: "+b.getChannel(), e);

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

@@ -19,14 +19,17 @@
package ch.psi.fda.core.actors;
import gov.aps.jca.CAException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import ch.psi.fda.core.Actor;
import ch.psi.fda.core.EngineConfiguration;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* This actuator sets an Channel Access channel from a start to an end value by doing discrete steps.
@@ -86,12 +89,12 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
/**
* Channel Access channel of the actuator
*/
private ChannelBean<Double> channel;
private Channel<Double> channel;
/**
* Channel Access channel of the actuator
*/
private ChannelBean<T> doneChannel = null;
private Channel<T> doneChannel = null;
private final T doneValue;
private final long doneDelay;
@@ -116,8 +119,8 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
* @param stepSize
* @param timeout Maximum move time (in milliseconds)
*/
public ChannelAccessFunctionActuator(String channelName, Function function, double start, double end, double stepSize, Long timeout){
this(channelName, null, null, 0, function, start, end, stepSize, timeout);
public ChannelAccessFunctionActuator(ChannelService s, String channelName, Function function, double start, double end, double stepSize, Long timeout){
this(s, channelName, null, null, 0, function, start, end, stepSize, timeout);
}
/**
@@ -132,7 +135,7 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
* @param timeout Maximum move time (in milliseconds)
*/
@SuppressWarnings("unchecked")
public ChannelAccessFunctionActuator(String channelName, String doneChannelName, T doneValue, double doneDelay, Function function, double start, double end, double stepSize, Long timeout){
public ChannelAccessFunctionActuator(ChannelService s, String channelName, String doneChannelName, T doneValue, double doneDelay, Function function, double start, double end, double stepSize, Long timeout){
this.doneValue = doneValue;
this.doneDelay = (long) Math.floor((doneDelay*1000));
@@ -170,8 +173,8 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
// Initialize/create Channel Access channel
try {
channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
} catch (CAException e) {
channel = s.createChannel(new ChannelDescriptor<>(Double.class, channelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -179,8 +182,8 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
}
if(doneChannelName != null){
try {
doneChannel = ChannelBeanFactory.getFactory().createChannelBean((Class<T>)doneValue.getClass(), doneChannelName, false);
} catch (CAException e) {
doneChannel = s.createChannel(new ChannelDescriptor<>((Class<T>)doneValue.getClass(), doneChannelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+doneChannelName+"]",e);
} catch (InterruptedException e) {
@@ -210,11 +213,11 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
channel.setValue(fvalue);
}
else{
channel.setValue(fvalue, timeout);
channel.setValueAsync(fvalue).get(timeout, TimeUnit.MILLISECONDS);
}
}
else{
channel.setValueNoWait(fvalue);
channel.setValueAsync(fvalue);
}
if(doneChannel != null){
@@ -231,7 +234,7 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
}
}
} catch (CAException e) {
} catch (ChannelException | ExecutionException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new RuntimeException("Unable to move actuator [channel: "+channel.getName()+"] to value "+value,e);
}
@@ -318,7 +321,7 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
try {
logger.finest("Destroy actor channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
@@ -327,7 +330,7 @@ public class ChannelAccessFunctionActuator<T> implements Actor {
try {
logger.finest("Destroy actor done channel: "+doneChannel.getName());
doneChannel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

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

@@ -19,14 +19,17 @@
package ch.psi.fda.core.actors;
import gov.aps.jca.CAException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import ch.psi.fda.core.Actor;
import ch.psi.fda.core.EngineConfiguration;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* This actuator sets an Channel Access channel from a start to an end value by doing discrete steps.
@@ -86,12 +89,12 @@ public class ChannelAccessLinearActuator<T> implements Actor {
/**
* Channel Access channel of the actuator
*/
private ChannelBean<Double> channel;
private Channel<Double> channel;
/**
* Channel Access channel of the actuator
*/
private ChannelBean<T> doneChannel = null;
private Channel<T> doneChannel = null;
private final T doneValue;
private final long doneDelay;
@@ -119,7 +122,7 @@ public class ChannelAccessLinearActuator<T> implements Actor {
* @param timeout Maximum move time (in milliseconds)
*/
@SuppressWarnings("unchecked")
public ChannelAccessLinearActuator(String channelName, String doneChannelName, T doneValue, double doneDelay, double start, double end, double stepSize, Long timeout){
public ChannelAccessLinearActuator(ChannelService s, String channelName, String doneChannelName, T doneValue, double doneDelay, double start, double end, double stepSize, Long timeout){
this.doneValue = doneValue;
this.doneDelay = (long) Math.floor((doneDelay*1000));
@@ -152,8 +155,8 @@ public class ChannelAccessLinearActuator<T> implements Actor {
// Initialize/create Channel Access channel
try {
channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
} catch (CAException e) {
channel = s.createChannel(new ChannelDescriptor<>(Double.class, channelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -161,8 +164,8 @@ public class ChannelAccessLinearActuator<T> implements Actor {
}
if(doneChannelName != null){
try {
doneChannel = ChannelBeanFactory.getFactory().createChannelBean((Class<T>) doneValue.getClass(), doneChannelName, false);
} catch (CAException e) {
doneChannel = s.createChannel(new ChannelDescriptor<>((Class<T>) doneValue.getClass(), doneChannelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+doneChannelName+"]",e);
} catch (InterruptedException e) {
@@ -191,11 +194,11 @@ public class ChannelAccessLinearActuator<T> implements Actor {
channel.setValue(value);
}
else{
channel.setValue(value, timeout);
channel.setValueAsync(value).get(timeout, TimeUnit.MILLISECONDS);
}
}
else{
channel.setValueNoWait(value);
channel.setValueAsync(value);
}
if(doneChannel != null){
@@ -212,7 +215,7 @@ public class ChannelAccessLinearActuator<T> implements Actor {
}
}
} catch (CAException e) {
} catch (ChannelException | TimeoutException | ExecutionException e) {
// Convert Exception into unchecked RuntimeException
throw new RuntimeException("Unable to move actuator [channel: "+channel.getName()+"] to value "+value,e);
}
@@ -295,7 +298,7 @@ public class ChannelAccessLinearActuator<T> implements Actor {
try {
logger.finest("Destroy actor channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
@@ -304,7 +307,7 @@ public class ChannelAccessLinearActuator<T> implements Actor {
try {
logger.finest("Destroy actor done channel: "+doneChannel.getName());
doneChannel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

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

@@ -19,14 +19,17 @@
package ch.psi.fda.core.actors;
import gov.aps.jca.CAException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import ch.psi.fda.core.Actor;
import ch.psi.fda.core.EngineConfiguration;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* This actuator sets an Channel Access channel by using the positions from the given table.
@@ -66,12 +69,12 @@ public class ChannelAccessTableActuator<T> implements Actor {
/**
* Channel Access channel of the actuator
*/
private ChannelBean<Double> channel;
private Channel<Double> channel;
/**
* Channel Access channel of the actuator
*/
private ChannelBean<T> doneChannel = null;
private Channel<T> doneChannel = null;
private final T doneValue;
private final long doneDelay;
@@ -94,8 +97,8 @@ public class ChannelAccessTableActuator<T> implements Actor {
* @param table Position table with the explicit positions for each step
* @param timeout Maximum move time (in milliseconds)
*/
public ChannelAccessTableActuator(String channelName, double[] table, Long timeout){
this(channelName, null, null, 0, table, timeout);
public ChannelAccessTableActuator(ChannelService s, String channelName, double[] table, Long timeout){
this(s, channelName, null, null, 0, table, timeout);
}
/**
@@ -108,7 +111,7 @@ public class ChannelAccessTableActuator<T> implements Actor {
* @param timeout Maximum move time (in milliseconds)
*/
@SuppressWarnings("unchecked")
public ChannelAccessTableActuator(String channelName, String doneChannelName, T doneValue, double doneDelay, double[] table, Long timeout){
public ChannelAccessTableActuator(ChannelService s, String channelName, String doneChannelName, T doneValue, double doneDelay, double[] table, Long timeout){
this.doneValue = doneValue;
this.doneDelay = (long) Math.floor((doneDelay*1000));
@@ -137,8 +140,8 @@ public class ChannelAccessTableActuator<T> implements Actor {
// Initialize/create Channel Access channel
try {
channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
} catch (CAException e) {
channel = s.createChannel(new ChannelDescriptor<>(Double.class, channelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -147,8 +150,8 @@ public class ChannelAccessTableActuator<T> implements Actor {
if(doneChannelName != null){
try {
doneChannel = ChannelBeanFactory.getFactory().createChannelBean((Class<T>)doneValue.getClass(), doneChannelName, false);
} catch (CAException e) {
doneChannel = s.createChannel(new ChannelDescriptor<>((Class<T>)doneValue.getClass(), doneChannelName, false));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+doneChannelName+"]",e);
} catch (InterruptedException e) {
@@ -176,11 +179,11 @@ public class ChannelAccessTableActuator<T> implements Actor {
channel.setValue(table[count]);
}
else{
channel.setValue(table[count], timeout);
channel.setValueAsync(table[count]).get(timeout, TimeUnit.MILLISECONDS);
}
}
else{
channel.setValueNoWait(table[count]);
channel.setValueAsync(table[count]);
}
@@ -196,7 +199,7 @@ public class ChannelAccessTableActuator<T> implements Actor {
}
}
} catch (CAException e) {
} catch (ChannelException | ExecutionException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new RuntimeException("Move actuator [channel: "+channel.getName()+"] to value "+table[count],e);
}
@@ -280,7 +283,7 @@ public class ChannelAccessTableActuator<T> implements Actor {
try {
logger.finest("Destroy actor channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
@@ -289,7 +292,7 @@ public class ChannelAccessTableActuator<T> implements Actor {
try {
logger.finest("Destroy actor done channel: "+doneChannel.getName());
doneChannel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

7
ch.psi.fda/src/main/java/ch/psi/fda/core/guard/ChannelAccessGuard.java
View File

@@ -19,15 +19,16 @@
package ch.psi.fda.core.guard;
import gov.aps.jca.CAException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
import ch.psi.fda.core.Guard;
import ch.psi.jcae.ChannelException;
/**
* Guard checking channels to meet a certain condition
@@ -85,7 +86,7 @@ public class ChannelAccessGuard implements Guard {
break;
}
}
catch(CAException e){
catch(ChannelException | TimeoutException | ExecutionException e){
logger.log(Level.WARNING, "Unable ", e);
check=false;
} catch (InterruptedException e) {

20
ch.psi.fda/src/main/java/ch/psi/fda/core/guard/ChannelAccessGuardCondition.java
View File

@@ -19,11 +19,13 @@
package ch.psi.fda.core.guard;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Channel and condition that need to be met.
@@ -38,7 +40,7 @@ public class ChannelAccessGuardCondition {
/**
* Channel name
*/
private final ChannelBean<?> channel;
private final Channel<?> channel;
/**
* Value of the channel to meet condition
@@ -50,10 +52,10 @@ public class ChannelAccessGuardCondition {
* @param channel Name of the channel that contributes to a guard
* @param value
*/
public ChannelAccessGuardCondition(String channel, Object value){
public ChannelAccessGuardCondition(ChannelService s, String channel, Object value){
try {
this.channel = ChannelBeanFactory.getFactory().createChannelBean(value.getClass(), channel, true);
} catch (CAException e) {
this.channel = s.createChannel(new ChannelDescriptor<>(value.getClass(), channel, true));
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize actuator channel [name:"+channel+"]",e);
} catch (InterruptedException e) {
@@ -65,7 +67,7 @@ public class ChannelAccessGuardCondition {
/**
* @return the channel
*/
public ChannelBean<?> getChannel() {
public Channel<?> getChannel() {
return channel;
}
@@ -88,7 +90,7 @@ public class ChannelAccessGuardCondition {
try {
logger.finest("Destroy guard condition channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

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

@@ -19,12 +19,13 @@
package ch.psi.fda.core.loops;
import gov.aps.jca.CAException;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.annotation.CaChannel;
import ch.psi.jcae.ChannelBean;
/**
* Bean holding all OTF channels and functionality
@@ -39,101 +40,101 @@ public class OTFBean {
private long timeoutMotorOk = 8000;
private long commandTimeout = 20000; // Maximum time until a command should take effect
@CaChannel(type=String.class, name =":UMOT")
private ChannelBean<String> motor;
@CaChannel(type=String.class, name ="${PREFIX}:UMOT")
private Channel<String> motor;
@CaChannel(type=String.class, name=":MENC")
private ChannelBean<String> encoder;
@CaChannel(type=String.class, name="${PREFIX}:MENC")
private Channel<String> encoder;
@CaChannel(type=Double.class, name=":UBEG")
private ChannelBean<Double> begin;
@CaChannel(type=Double.class, name="${PREFIX}:UBEG")
private Channel<Double> begin;
@CaChannel(type=Double.class, name=":UBEG.DRVL")
private ChannelBean<Double> beginMin;
@CaChannel(type=Double.class, name="${PREFIX}:UBEG.DRVL")
private Channel<Double> beginMin;
@CaChannel(type=Double.class, name=":UBEG.DRVH")
private ChannelBean<Double> beginMax;
@CaChannel(type=Double.class, name="${PREFIX}:UBEG.DRVH")
private Channel<Double> beginMax;
@CaChannel(type=Double.class, name=":UEND")
private ChannelBean<Double> end;
@CaChannel(type=Double.class, name="${PREFIX}:UEND")
private Channel<Double> end;
@CaChannel(type=Double.class, name=":UEND.DRVL")
private ChannelBean<Double> endMin;
@CaChannel(type=Double.class, name="${PREFIX}:UEND.DRVL")
private Channel<Double> endMin;
@CaChannel(type=Double.class, name=":UEND.DRVH")
private ChannelBean<Double> endMax;
@CaChannel(type=Double.class, name="${PREFIX}:UEND.DRVH")
private Channel<Double> endMax;
@CaChannel(type=Double.class, name=":USSIZ")
private ChannelBean<Double> stepSize;
@CaChannel(type=Double.class, name="${PREFIX}:USSIZ")
private Channel<Double> stepSize;
@CaChannel(type=Double.class, name=":USSIZ.DRVL")
private ChannelBean<Double> stepSizeMin;
@CaChannel(type=Double.class, name="${PREFIX}:USSIZ.DRVL")
private Channel<Double> stepSizeMin;
@CaChannel(type=Double.class, name=":UITIM")
private ChannelBean<Double> integrationTime;
@CaChannel(type=Double.class, name="${PREFIX}:UITIM")
private Channel<Double> integrationTime;
@CaChannel(type=Double.class, name=":UITIM.DRVL")
private ChannelBean<Double> integrationTimeMin;
@CaChannel(type=Double.class, name="${PREFIX}:UITIM.DRVL")
private Channel<Double> integrationTimeMin;
@CaChannel(type=Double.class, name=":UITIM.DRVH")
private ChannelBean<Double> integrationTimeMax;
@CaChannel(type=Double.class, name="${PREFIX}:UITIM.DRVH")
private Channel<Double> integrationTimeMax;
@CaChannel(type=Double.class, name=":UBCL")
private ChannelBean<Double> userBacklash;
@CaChannel(type=Double.class, name="${PREFIX}:UBCL")
private Channel<Double> userBacklash;
@CaChannel(type=String.class, name=":NFSSE")
private ChannelBean<String> nfsServer;
@CaChannel(type=String.class, name="${PREFIX}:NFSSE")
private Channel<String> nfsServer;
@CaChannel(type=String.class, name=":NFSSH")
private ChannelBean<String> nfsShare;
@CaChannel(type=String.class, name="${PREFIX}:NFSSH")
private Channel<String> nfsShare;
@CaChannel(type=String.class, name=":DFNAM")
private ChannelBean<String> fileName;
@CaChannel(type=String.class, name="${PREFIX}:DFNAM")
private Channel<String> fileName;
@CaChannel(type=String.class, name=":FFORM")
private ChannelBean<String> fileNameFormat;
@CaChannel(type=String.class, name="${PREFIX}:FFORM")
private Channel<String> fileNameFormat;
@CaChannel(type=Integer.class, name=":FCNT")
private ChannelBean<Integer> fileCount;
@CaChannel(type=Integer.class, name="${PREFIX}:FCNT")
private Channel<Integer> fileCount;
@CaChannel(type=Integer.class, name=":FCNT.B")
private ChannelBean<Integer> resetFileCounter;
@CaChannel(type=Integer.class, name="${PREFIX}:FCNT.B")
private Channel<Integer> resetFileCounter;
@CaChannel(type=Boolean.class, name=":FAPPE")
private ChannelBean<Boolean> appendFile;
@CaChannel(type=Boolean.class, name="${PREFIX}:FAPPE")
private Channel<Boolean> appendFile;
@CaChannel(type=Boolean.class, name=":FUSE")
private ChannelBean<Boolean> fileNameGeneration;
@CaChannel(type=Boolean.class, name="${PREFIX}:FUSE")
private Channel<Boolean> fileNameGeneration;
@CaChannel(type=Boolean.class, name=":UZIGZ")
private ChannelBean<Boolean> zigZag;
@CaChannel(type=Boolean.class, name="${PREFIX}:UZIGZ")
private Channel<Boolean> zigZag;
@CaChannel(type=Integer.class, name=":UCOM")
private ChannelBean<Integer> command;
@CaChannel(type=Integer.class, name="${PREFIX}:UCOM")
private Channel<Integer> command;
@CaChannel(type=Boolean.class, name=":SCRU", monitor=true)
private ChannelBean<Boolean> scanRunning;
@CaChannel(type=Boolean.class, name="${PREFIX}:SCRU", monitor=true)
private Channel<Boolean> scanRunning;
@CaChannel(type=Boolean.class, name=":MUENC")
private ChannelBean<Boolean> useEncoder;
@CaChannel(type=Boolean.class, name="${PREFIX}:MUENC")
private Channel<Boolean> useEncoder;
@CaChannel(type=String.class, name={":CTM0",":CTM1",":CTM2",":CTM3",":CTM4",":CTM5",":CTM6",":CTM7"})
private List<ChannelBean<String>> monitoredChannels;
@CaChannel(type=String.class, name={"${PREFIX}:CTM0","${PREFIX}:CTM1","${PREFIX}:CTM2","${PREFIX}:CTM3","${PREFIX}:CTM4","${PREFIX}:CTM5","${PREFIX}:CTM6","${PREFIX}:CTM7"})
private List<Channel<String>> monitoredChannels;
@CaChannel(type=Boolean.class, name=":OTF", monitor=true)
private ChannelBean<Boolean> running;
@CaChannel(type=Boolean.class, name="${PREFIX}:OTF", monitor=true)
private Channel<Boolean> running;
@CaChannel(type=Integer.class, name=":USTAT", monitor=true)
private ChannelBean<Integer> status;
@CaChannel(type=Integer.class, name="${PREFIX}:USTAT", monitor=true)
private Channel<Integer> status;
@CaChannel(type=Boolean.class, name=":MOK", monitor=true)
private ChannelBean<Boolean> motorOk;
@CaChannel(type=Boolean.class, name="${PREFIX}:MOK", monitor=true)
private Channel<Boolean> motorOk;
@CaChannel(type=Boolean.class, name=":EOK", monitor=true)
private ChannelBean<Boolean> encoderOk;
@CaChannel(type=Boolean.class, name="${PREFIX}:EOK", monitor=true)
private Channel<Boolean> encoderOk;
@CaChannel(type=String.class, name=":MSG")
private ChannelBean<String> message;
@CaChannel(type=String.class, name="${PREFIX}:MSG")
private Channel<String> message;
/**
* Get the trigger name that can be used by the sscan record to trigger an OTFScan
@@ -174,7 +175,7 @@ public class OTFBean {
this.command.setValue(Command.STOP.ordinal());
// Do not wait for put to return
this.running.setValueNoWait(false);
this.running.setValueAsync(false);
}
catch(Exception e){
throw new RuntimeException("Unable to abort OTF logic" ,e);
@@ -210,7 +211,7 @@ public class OTFBean {
throw new RuntimeException("OTFSCAN failed with message: "+message.getValue());
}
} catch (CAException e) {
} catch (ChannelException | ExecutionException | TimeoutException e) {
throw new RuntimeException("An error occurred while waiting for the OTF logic to finish.", e);
}
}
@@ -229,7 +230,7 @@ public class OTFBean {
throw new RuntimeException("OTFSCAN failed with message: "+message.getValue());
}
} catch (CAException e) {
} catch (ChannelException | ExecutionException | TimeoutException e) {
throw new RuntimeException("An error occurred while waiting for the OTF logic to finish.", e);
}
@@ -239,10 +240,10 @@ public class OTFBean {
/**
* Reset OTFScan records to defaults
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
* @throws InterruptedException
*/
public void resetToDefaults() throws CAException, InterruptedException{
public void resetToDefaults() throws ChannelException , ExecutionException , TimeoutException, InterruptedException{
setMonitoredChannels(new String[]{});
setMotor("");
begin.setValue(0d);
@@ -267,54 +268,69 @@ public class OTFBean {
/**
* Get motor of the OTFScan axis
* @return Name of the OTF motor
* @throws CAException
* @throws ExecutionException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String getMotor() throws CAException, InterruptedException {
public String getMotor() throws ChannelException, InterruptedException, TimeoutException, ExecutionException {
return(this.motor.getValue());
}
/**
* Set motor of the OTFScan axis
* @param motor
* @throws CAException
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setMotor(String motor) throws CAException, InterruptedException {
public void setMotor(String motor) throws InterruptedException, ExecutionException, ChannelException {
this.motor.setValue(motor);
}
/**
* Get encoder of the OTFScan axis
* @return Name of the used encoder
* @throws CAException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String getEncoder() throws CAException, InterruptedException {
public String getEncoder() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
return(this.encoder.getValue());
}
/**
* Set encoder to use of the OTFScan axis
* @param encoder
* @throws CAException
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setEncoder(String encoder) throws CAException, InterruptedException {
public void setEncoder(String encoder) throws InterruptedException, ExecutionException, ChannelException {
this.encoder.setValue(encoder);
}
/**
* Get begin position of the scan
* @return Begin position scan
* @throws CAException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getBegin() throws CAException, InterruptedException {
public Double getBegin() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
return(this.begin.getValue());
}
/**
* Set begin position of scan
* @param begin
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws Exception
*/
public void setBegin(Double begin) throws CAException, InterruptedException {
public void setBegin(Double begin) throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
if(begin==null){
throw new IllegalArgumentException("Begin position must not be null");
@@ -330,36 +346,48 @@ public class OTFBean {
/**
* Get minimum value of the begin position
* @return Min value for begin
* @throws CAException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getMinBegin() throws CAException, InterruptedException {
public Double getMinBegin() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
return(this.beginMin.getValue());
}
/**
* Get maximum value of the begin position
* @return Max value for begin
* @throws CAException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getMaxBegin() throws CAException, InterruptedException {
public Double getMaxBegin() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
return(this.beginMax.getValue());
}
/**
* Get end position of the scan
* @return End position scan
* @throws CAException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getEnd() throws CAException, InterruptedException {
public Double getEnd() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
return(this.end.getValue());
}
/**
* Set end positon of scan
* @param end
* @throws CAException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setEnd(Double end) throws CAException, InterruptedException {
public void setEnd(Double end) throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
if(end==null){
throw new IllegalArgumentException("End position must not be null");
@@ -375,35 +403,38 @@ public class OTFBean {
/**
* Get minimum value of end position
* @return Min value for end
* @throws CAException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getMinEnd() throws CAException, InterruptedException {
public Double getMinEnd() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
return(this.endMin.getValue());
}
/**
* Get maximum value of end position
* @return Max value for end
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getMaxEnd() throws CAException, InterruptedException {
public Double getMaxEnd() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.endMax.getValue());
}
/**
* Get scan step size
* @return Step size
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getStepSize() throws CAException, InterruptedException {
public Double getStepSize() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.stepSize.getValue());
}
/**
* Set step size of scan
* @param stepSize
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setStepSize(Double stepSize) throws CAException, InterruptedException {
public void setStepSize(Double stepSize) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
if(integrationTime==null){
throw new IllegalArgumentException("Step size must not be null");
@@ -423,27 +454,27 @@ public class OTFBean {
/**
* Get minimum integration time
* @return Min value for step size
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public double getMinStepSize() throws CAException, InterruptedException {
public double getMinStepSize() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.stepSizeMin.getValue());
}
/**
* Get scan integration time (time that is spend in one step)
* @return Integration time
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getIntegrationTime() throws CAException, InterruptedException {
public Double getIntegrationTime() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.integrationTime.getValue());
}
/**
* Set integration time of scan
* @param integrationTime
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setIntegrationTime(Double integrationTime) throws CAException, InterruptedException {
public void setIntegrationTime(Double integrationTime) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
if(integrationTime==null){
throw new IllegalArgumentException("Integration time must not be null");
@@ -472,35 +503,35 @@ public class OTFBean {
/**
* Get minimum integration time
* @return Min value for integration time
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getMinIntegrationTime() throws CAException, InterruptedException {
public Double getMinIntegrationTime() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.integrationTimeMin.getValue());
}
/**
* Get maximum integration time
* @return Max value for integration time
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getMaxIntegrationTime() throws CAException, InterruptedException {
public Double getMaxIntegrationTime() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.integrationTimeMax.getValue());
}
/**
* Get additional user defined backlash
* @return User backlash
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Double getUserBacklash() throws CAException, InterruptedException {
public Double getUserBacklash() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.userBacklash.getValue());
}
/**
* Set additional user defined backlash
* @param userBacklash
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setUserBacklash(Double userBacklash) throws CAException, InterruptedException {
public void setUserBacklash(Double userBacklash) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
if(userBacklash==null){
throw new IllegalArgumentException("User backlash must not be null");
}
@@ -511,63 +542,63 @@ public class OTFBean {
/**
* Get the current NFS server the data is written to
* @return Name of NFS server
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String getNfsServer() throws CAException, InterruptedException {
public String getNfsServer() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.nfsServer.getValue());
}
/**
* Set name of the NFS server the data is written to
* @param nfsServer
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setNfsServer(String nfsServer) throws CAException, InterruptedException {
public void setNfsServer(String nfsServer) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.nfsServer.setValue(nfsServer);
}
/**
* Get the NFS share the data is written to
* @return Name of NFS share
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String getNfsShare() throws CAException, InterruptedException {
public String getNfsShare() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.nfsShare.getValue());
}
/**
* Set name of the NFS share the data is written to
* @param nfsShare
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setNfsShare(String nfsShare) throws CAException, InterruptedException {
public void setNfsShare(String nfsShare) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.nfsShare.setValue(nfsShare);
}
/**
* Get the name of the data file
* @return Name of data file name
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String getFileName() throws CAException, InterruptedException {
public String getFileName() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.fileName.getValue());
}
/**
* Set name of the data file
* @param filename
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setFileName(String filename) throws CAException, InterruptedException {
public void setFileName(String filename) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.fileName.setValue(filename);
}
/**
* Get File name formate
* @return Get format for file name
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String getFileNameFormat() throws CAException, InterruptedException {
public String getFileNameFormat() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.fileNameFormat.getValue());
}
@@ -576,102 +607,102 @@ public class OTFBean {
* @param fileNameFormat
* @throws Exception
*/
public void setFileNameFormat(String fileNameFormat) throws CAException, InterruptedException {
public void setFileNameFormat(String fileNameFormat) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.fileNameFormat.setValue(fileNameFormat);
}
/**
* Get value of the IOC based file name counter
* @return File counter
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public int getFileCounter() throws CAException, InterruptedException {
public int getFileCounter() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.fileCount.getValue());
}
/**
* Reset the IOC based file counter
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void resetFileCounter() throws CAException, InterruptedException {
public void resetFileCounter() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.resetFileCounter.setValue(1);
}
/**
* Get if append file option is activated
* @return Append file flag
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public boolean isAppendFile() throws CAException, InterruptedException {
public boolean isAppendFile() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.appendFile.getValue());
}
/**
* Set whether to append the specified file if the file exists
* @param append
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setAppendFile(boolean append) throws CAException, InterruptedException {
public void setAppendFile(boolean append) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.appendFile.setValue(append);
}
/**
* Get if file name generation is on or off
* @return File name generation flag
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public boolean isFileNameGeneration() throws CAException, InterruptedException {
public boolean isFileNameGeneration() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.fileNameGeneration.getValue());
}
/**
* Set Whether the file name should be generated out of the file name format and the file counter
* @param generation
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setFileNameGeneration(boolean generation) throws CAException, InterruptedException {
public void setFileNameGeneration(boolean generation) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.fileNameGeneration.setValue(generation);
}
/**
* Get if ZigZag scan option is on or off
* @return ZigZag flag
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public boolean isZigZag() throws CAException, InterruptedException {
public boolean isZigZag() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.zigZag.getValue());
}
/**
* Set ZigZag scan mode on/off
* @param zigZag ZigZag mode on = true, ZigZag mode off = false
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setZigZag(boolean zigZag) throws CAException, InterruptedException {
public void setZigZag(boolean zigZag) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.zigZag.setValue(zigZag);
}
/**
* Get whether encoder is used
*/
public boolean isUseEncoder() throws CAException, InterruptedException {
public boolean isUseEncoder() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(this.useEncoder.getValue());
}
/**
* Set flag to use encoder
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setUseEncoder(boolean flag) throws CAException, InterruptedException {
public void setUseEncoder(boolean flag) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
this.useEncoder.setValue(flag);
}
/**
* Get the channels that are currently monitored by the OTFScan logic
* @return Names of the monitored channels
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String[] getMonitoredChannels() throws CAException, InterruptedException {
public String[] getMonitoredChannels() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
String[] values = new String[this.monitoredChannels.size()];
for(int i=0; i<this.monitoredChannels.size();i++){
@@ -686,9 +717,9 @@ public class OTFBean {
* Note: As OTF only supports 8 channels to be monitored, only the first 8
* values of the passed channelNames are considered.
* @param values Array of channel names to be monitored
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public void setMonitoredChannels(String[] values) throws CAException, InterruptedException {
public void setMonitoredChannels(String[] values) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
if(values.length>monitoredChannels.size()){
throw new IllegalArgumentException("Only up to "+monitoredChannels.size()+" monitored channels are supported by OTF");
@@ -707,36 +738,36 @@ public class OTFBean {
/**
* Returns whether an scan is running
* @return Running flag
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public boolean isRunning() throws CAException, InterruptedException {
public boolean isRunning() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(running.getValue());
}
/**
* Get status of the scan
* @return Status of the scan
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public Status getStatus() throws CAException, InterruptedException {
public Status getStatus() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(Status.values()[this.status.getValue()]);
}
/**
* Get the (error) message from the OTF records
* @return Message from OTF C logic
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public String getMessage() throws CAException, InterruptedException {
public String getMessage() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(message.getValue());
}
/**
* Check whether the specified motor is recognized as ok (i.e. it is registered as OTFScan motor)
* @return Flag whether motor is ok
* @throws CAException
* @throws TimeoutException, ChannelException, ExecutionException
*/
public boolean isMotorOk() throws CAException, InterruptedException {
public boolean isMotorOk() throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
return(motorOk.getValue());
}
@@ -744,9 +775,9 @@ public class OTFBean {
* Wait until the motor flag goes to ok
* @param timeout Timout in milliseconds
*
* @throws CAException If motor ok flag does not switch to ok within the specified timeout
* @throws TimeoutException, ChannelException, ExecutionException If motor ok flag does not switch to ok within the specified timeout
*/
public void waitUntilMotorOk(long timeout) throws CAException, InterruptedException {
public void waitUntilMotorOk(long timeout) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
motorOk.waitForValue(true, timeout);
}
@@ -754,14 +785,14 @@ public class OTFBean {
* Wait until the motor flag goes to not ok
* @param timeout Timout in milliseconds
*
* @throws CAException If motor ok flag does not switch to ok within the specified timeout
* @throws TimeoutException, ChannelException, ExecutionException If motor ok flag does not switch to ok within the specified timeout
*/
public void waitUntilMotorNotOk(long timeout) throws CAException, InterruptedException {
public void waitUntilMotorNotOk(long timeout) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
motorOk.waitForValue(false, timeout);
}
public void waitUntilEncoderOk(long timeout) throws CAException, InterruptedException {
public void waitUntilEncoderOk(long timeout) throws TimeoutException, ChannelException, ExecutionException, InterruptedException {
if(!useEncoder.getValue()){
return;
}

34
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/OTFLoop.java
View File

@@ -24,15 +24,24 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
//import jcifs.smb.SmbException;
//import jcifs.smb.SmbFile;
import gov.aps.jca.CAException;
import ch.psi.fda.core.Action;
import ch.psi.fda.core.ActionLoop;
import ch.psi.fda.core.Sensor;
@@ -47,7 +56,8 @@ import ch.psi.fda.core.sensors.MillisecondTimestampSensor;
import ch.psi.fda.core.sensors.OTFNamedChannelSensor;
import ch.psi.fda.core.sensors.OTFReadbackSensor;
import ch.psi.fda.core.sensors.OTFScalerChannelSensor;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* ActionLoop that is implementing the OTF Scan logic.
@@ -143,6 +153,8 @@ public class OTFLoop implements ActionLoop {
*/
private volatile boolean abort = false;
private ChannelService cservice;
/**
* Constructor
* @param channelPrefix Prefix of the OTF related records, e.g. MTEST-HW3-OTF
@@ -151,13 +163,15 @@ public class OTFLoop implements ActionLoop {
* @param smbShare SMB share to get the data written by the OTF C Logic
* @param zigZag Operate loop in zig zag mode
*/
public OTFLoop(String channelPrefix, String server, String share, String smbShare, boolean zigZag){
public OTFLoop(ChannelService s, String channelPrefix, String server, String share, String smbShare, boolean zigZag){
cservice = s;
// Initialize connection to the OTF records
try {
this.obean = new OTFBean();
ChannelBeanFactory.getFactory().createChannelBeans(obean, channelPrefix);
} catch (CAException e) {
Map<String,String> m = new HashMap<>();
m.put("PREFIX", channelPrefix);
s.createAnnotatedChannels(obean, m);
} catch (ChannelException | TimeoutException e) {
throw new IllegalArgumentException("Unable to connect to the OTF channels",e);
} catch (InterruptedException e) {
throw new RuntimeException("Unable to connect to the OTF channels",e);
@@ -311,7 +325,7 @@ public class OTFLoop implements ActionLoop {
// Set monitored channels
obean.setMonitoredChannels(monitoredChannels.toArray(new String[monitoredChannels.size()]));
}
catch(CAException e){
catch(ChannelException | ExecutionException | TimeoutException e){
throw new RuntimeException("Unable to set OTF configuration parameters",e);
} catch (InterruptedException e) {
throw new RuntimeException("Unable to set OTF configuration parameters",e);
@@ -358,10 +372,8 @@ public class OTFLoop implements ActionLoop {
public void destroy() {
// Close all connections used by the OTFBean
try {
ChannelBeanFactory.getFactory().destroyChannelBeans(obean);
} catch (CAException e) {
throw new RuntimeException("Unable to destroy channels",e);
} catch (InterruptedException e) {
cservice.destroyAnnotatedChannels(obean);
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channels",e);
}
}

56
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/CrlogicChannelsTemplate.java
View File

@@ -19,7 +19,7 @@
package ch.psi.fda.core.loops.cr;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.Channel;
import ch.psi.jcae.annotation.CaChannel;
/**
@@ -37,120 +37,120 @@ public class CrlogicChannelsTemplate {
* Ticks per second - IOC setting
* ATTENTION - This field must only be set bu the IOC - ATTENTION
*/
@CaChannel(type=Integer.class, name =":TPS")
private ChannelBean<Integer> ticksPerSecond;
@CaChannel(type=Integer.class, name ="${PREFIX}:TPS")
private Channel<Integer> ticksPerSecond;
/**
* Status of the OTFSCAN IOC logic
*/
@CaChannel(type=String.class, name =":STATUS")
private ChannelBean<String> status;
@CaChannel(type=String.class, name ="${PREFIX}:STATUS")
private Channel<String> status;
/**
* Message from the OTFSCAN IOC logic
*/
@CaChannel(type=String.class, name =":MSG")
private ChannelBean<String> message;
@CaChannel(type=String.class, name ="${PREFIX}:MSG")
private Channel<String> message;
/**
* IOC ticks between data acquisition interrupts
*/
@CaChannel(type=Integer.class, name =":TBINT")
private ChannelBean<Integer> ticksBetweenInterrupts;
@CaChannel(type=Integer.class, name ="${PREFIX}:TBINT")
private Channel<Integer> ticksBetweenInterrupts;
/**
* Name or ip address of the NFS server to save the data to
* (depending on the IOC setup)
*/
@CaChannel(type=String.class, name =":NFSSE")
private ChannelBean<String> nfsServer;
@CaChannel(type=String.class, name ="${PREFIX}:NFSSE")
private Channel<String> nfsServer;
/**
* Name of the NFS share on the NFS server
*/
@CaChannel(type=String.class, name =":NFSSH")
private ChannelBean<String> nfsShare;
@CaChannel(type=String.class, name ="${PREFIX}:NFSSH")
private Channel<String> nfsShare;
/**
* Name of the data file
*/
@CaChannel(type=String.class, name =":DFNAM")
private ChannelBean<String> dataFile;
@CaChannel(type=String.class, name ="${PREFIX}:DFNAM")
private Channel<String> dataFile;
/**
* Flag to identify whether the data file should be appended
*/
@CaChannel(type=Boolean.class, name =":FAPPE")
private ChannelBean<Boolean> appendFile;
@CaChannel(type=Boolean.class, name ="${PREFIX}:FAPPE")
private Channel<Boolean> appendFile;
/**
* Readout resources
*/
@CaChannel(type=String[].class, name =":RRES")
private ChannelBean<String[]> readoutResources;
@CaChannel(type=String[].class, name ="${PREFIX}:RRES")
private Channel<String[]> readoutResources;
/**
* @return the ticksPerSecond
*/
public ChannelBean<Integer> getTicksPerSecond() {
public Channel<Integer> getTicksPerSecond() {
return ticksPerSecond;
}
/**
* @return the status
*/
public ChannelBean<String> getStatus() {
public Channel<String> getStatus() {
return status;
}
/**
* @return the message
*/
public ChannelBean<String> getMessage() {
public Channel<String> getMessage() {
return message;
}
/**
* @return the ticksBetweenInterrupts
*/
public ChannelBean<Integer> getTicksBetweenInterrupts() {
public Channel<Integer> getTicksBetweenInterrupts() {
return ticksBetweenInterrupts;
}
/**
* @return the nfsServer
*/
public ChannelBean<String> getNfsServer() {
public Channel<String> getNfsServer() {
return nfsServer;
}
/**
* @return the nfsShare
*/
public ChannelBean<String> getNfsShare() {
public Channel<String> getNfsShare() {
return nfsShare;
}
/**
* @return the dataFile
*/
public ChannelBean<String> getDataFile() {
public Channel<String> getDataFile() {
return dataFile;
}
/**
* @return the appendFile
*/
public ChannelBean<Boolean> getAppendFile() {
public Channel<Boolean> getAppendFile() {
return appendFile;
}
/**
* @return the readoutResources
*/
public ChannelBean<String[]> getReadoutResources() {
public Channel<String[]> getReadoutResources() {
return readoutResources;
}

40
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/CrlogicLoop.java
View File

@@ -27,12 +27,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import jcifs.smb.SmbFile;
import gov.aps.jca.CAException;
import ch.psi.fda.core.Action;
import ch.psi.fda.core.ActionLoop;
import ch.psi.fda.core.Sensor;
@@ -46,7 +48,8 @@ import ch.psi.fda.core.messages.Message;
import ch.psi.fda.core.sensors.MillisecondTimestampSensor;
import ch.psi.fda.core.sensors.OTFNamedChannelSensor;
import ch.psi.fda.core.sensors.OTFScalerChannelSensor;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* @author ebner
@@ -150,8 +153,9 @@ public class CrlogicLoop implements ActionLoop {
private boolean abortForce = false;
private Thread executionThread = null;
public CrlogicLoop(String prefix, String server, String share, String smbShare, boolean zigZag){
private ChannelService cservice;
public CrlogicLoop(ChannelService s, String prefix, String server, String share, String smbShare, boolean zigZag){
cservice = s;
this.prefix = prefix;
this.server = server;
this.share = share;
@@ -462,7 +466,7 @@ public class CrlogicLoop implements ActionLoop {
// Move to start
logger.info("Move motor to start ["+realStart+"]");
motortemplate.getSetValue().setValue(realStart, timeout); // Will block until move is done
motortemplate.getSetValue().setValueAsync(realStart).get(timeout, TimeUnit.MILLISECONDS); // Will block until move is done
// Set motor paramters
@@ -500,7 +504,7 @@ public class CrlogicLoop implements ActionLoop {
try{
template.getStatus().waitForValue(CrlogicChannelsTemplate.Status.ACTIVE.toString(), startStopTimeout);
}
catch(CAException e){
catch(ChannelException e){
logger.info( "Failed to start CRLOGIC. Logic in status: "+template.getStatus().getValue() );
if(template.getStatus().getValue().equals(CrlogicChannelsTemplate.Status.FAULT.toString())){
logger.info("Error message: "+template.getMessage().getValue());
@@ -515,7 +519,7 @@ public class CrlogicLoop implements ActionLoop {
// Move motor(s) to end / wait until motor is stopped
logger.info("Move motor to end ["+realEnd+"]");
try{
motortemplate.getSetValue().setValue(realEnd, timeout); // Will block until move is done
motortemplate.getSetValue().setValueAsync(realEnd).get(timeout, TimeUnit.MILLISECONDS); // Will block until move is done
}
catch (InterruptedException e) {
if(abort & (!abortForce)){
@@ -537,7 +541,7 @@ public class CrlogicLoop implements ActionLoop {
try{
template.getStatus().waitForValue(CrlogicChannelsTemplate.Status.INACTIVE.toString(), startStopTimeout);
}
catch(CAException e){
catch(ChannelException | ExecutionException e){
logger.info( "Failed to stop CRLOGIC. Logic in status: "+template.getStatus().getValue() );
// TODO Improve error handling
throw new RuntimeException("Failed to stop CRLOGIC. Logic in status: "+template.getStatus().getValue(), e);
@@ -589,7 +593,7 @@ public class CrlogicLoop implements ActionLoop {
executionThread = null;
}
}
catch(CAException e){
catch(ChannelException | ExecutionException | TimeoutException e){
throw new RuntimeException("Unable to execute crloop", e);
}
}
@@ -627,8 +631,8 @@ public class CrlogicLoop implements ActionLoop {
try {
ChannelBeanFactory.getFactory().destroyChannelBeans(template);
ChannelBeanFactory.getFactory().destroyChannelBeans(motortemplate);
cservice.destroyAnnotatedChannels(template);
cservice.destroyAnnotatedChannels(motortemplate);
template = null;
motortemplate = null;
@@ -677,11 +681,15 @@ public class CrlogicLoop implements ActionLoop {
// Connect crlogic channels
template = new CrlogicChannelsTemplate();
logger.info("Connect channels");
ChannelBeanFactory.getFactory().createChannelBeans(template, prefix);
Map<String, String> m = new HashMap<>();
m.put("PREFIX", prefix);
cservice.createAnnotatedChannels(template, m);
// Connect motor channels
motortemplate = new MotorChannelsTemplate();
ChannelBeanFactory.getFactory().createChannelBeans(motortemplate, actuator.getName());
m = new HashMap<>();
m.put("PREFIX", actuator.getName());
cservice.createAnnotatedChannels(motortemplate, m);
useReadback = motortemplate.getUseReadback().getValue();
useEncoder = motortemplate.getUseEncoder().getValue();
@@ -723,7 +731,9 @@ public class CrlogicLoop implements ActionLoop {
// Fill readback encoder settings
// Connect to encoder
EncoderChannelsTemplate encodertemplate = new EncoderChannelsTemplate();
ChannelBeanFactory.getFactory().createChannelBeans(encodertemplate, readback);
m = new HashMap<>();
m.put("PREFIX", readback);
cservice.createAnnotatedChannels(encodertemplate, m);
// Read encoder settings
if(encodertemplate.getDirection().getValue()==EncoderChannelsTemplate.Direction.Positive.ordinal()){
@@ -736,7 +746,7 @@ public class CrlogicLoop implements ActionLoop {
crlogicDataFilter.setEncoderResolution(encodertemplate.getResolution().getValue());
// Disconnect from encoder
ChannelBeanFactory.getFactory().destroyChannelBeans(encodertemplate);
cservice.destroyAnnotatedChannels(encodertemplate);
}
else if (useEncoder && (!useReadback)){

20
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/EncoderChannelsTemplate.java
View File

@@ -19,7 +19,7 @@
package ch.psi.fda.core.loops.cr;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.Channel;
import ch.psi.jcae.annotation.CaChannel;
/**
@@ -31,41 +31,41 @@ public class EncoderChannelsTemplate {
/**
* Resolution - $(P)$(E)_SCL
*/
@CaChannel(type=Double.class, name="_SCL")
private ChannelBean<Double> resolution;
@CaChannel(type=Double.class, name="${PREFIX}_SCL")
private Channel<Double> resolution;
/**
* Offset - $(P)$(E)_OFF
*/
@CaChannel(type=Double.class, name ="_OFF")
private ChannelBean<Double> offset;
@CaChannel(type=Double.class, name ="${PREFIX}_OFF")
private Channel<Double> offset;
/**
* Direction - $(P)$(E)_DIR
*/
public enum Direction {Negative, Positive};
@CaChannel(type=Integer.class, name ="_DIR")
private ChannelBean<Integer> direction;
@CaChannel(type=Integer.class, name ="${PREFIX}_DIR")
private Channel<Integer> direction;
/**
* @return the resolution
*/
public ChannelBean<Double> getResolution() {
public Channel<Double> getResolution() {
return resolution;
}
/**
* @return the offset
*/
public ChannelBean<Double> getOffset() {
public Channel<Double> getOffset() {
return offset;
}
/**
* @return the direction
*/
public ChannelBean<Integer> getDirection() {
public Channel<Integer> getDirection() {
return direction;
}

272
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/MotorChannelsTemplate.java
View File

@@ -19,7 +19,7 @@
package ch.psi.fda.core.loops.cr;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.Channel;
import ch.psi.jcae.annotation.CaChannel;
/**
@@ -38,92 +38,92 @@ public class MotorChannelsTemplate {
/**
* .HLM High limit - double
*/
@CaChannel(type=Double.class, name =".HLM")
private ChannelBean<Double> highLimit;
@CaChannel(type=Double.class, name ="${PREFIX}.HLM")
private Channel<Double> highLimit;
/**
* .LLM Low limit - double
*/
@CaChannel(type=Double.class, name =".LLM")
private ChannelBean<Double> lowLimit;
@CaChannel(type=Double.class, name ="${PREFIX}.LLM")
private Channel<Double> lowLimit;
/**
* .RBV Readback value - double
*/
@CaChannel(type=Double.class, name =".RBV", monitor=true)
private ChannelBean<Double> readbackValue;
@CaChannel(type=Double.class, name ="${PREFIX}.RBV", monitor=true)
private Channel<Double> readbackValue;
/**
* .VAL Set value - double
*/
@CaChannel(type=Double.class, name =".VAL", monitor=true)
private ChannelBean<Double> setValue;
@CaChannel(type=Double.class, name ="${PREFIX}.VAL", monitor=true)
private Channel<Double> setValue;
/**
* .RLV Relative move value - double
*/
@CaChannel(type=Double.class, name =".RLV")
private ChannelBean<Double> relativeMoveValue;
@CaChannel(type=Double.class, name ="${PREFIX}.RLV")
private Channel<Double> relativeMoveValue;
/**
* .TWV Teak value - double
*/
@CaChannel(type=Double.class, name =".TWV")
private ChannelBean<Double> tweakValue;
@CaChannel(type=Double.class, name ="${PREFIX}.TWV")
private Channel<Double> tweakValue;
/**
* .TWR Tweak reverse - move left - int
*/
@CaChannel(type=Integer.class, name =".TWR")
private ChannelBean<Integer> tweakReverse;
@CaChannel(type=Integer.class, name ="${PREFIX}.TWR")
private Channel<Integer> tweakReverse;
/**
* .TWF Tweak forward - move right - int
*/
@CaChannel(type=Integer.class, name =".TWF")
private ChannelBean<Integer> tweakForward;
@CaChannel(type=Integer.class, name ="${PREFIX}.TWF")
private Channel<Integer> tweakForward;
/**
* .JOGR Jog reverse - int
*/
@CaChannel(type=Integer.class, name =".JOGR")
private ChannelBean<Integer> jogReverse;
@CaChannel(type=Integer.class, name ="${PREFIX}.JOGR")
private Channel<Integer> jogReverse;
/**
* .JOGF Jog forward - int
*/
@CaChannel(type=Integer.class, name =".JOGF")
private ChannelBean<Integer> jogForward;
@CaChannel(type=Integer.class, name ="${PREFIX}.JOGF")
private Channel<Integer> jogForward;
/**
* .HOMR Home reverse - int
*/
@CaChannel(type=Integer.class, name =".HOMR")
private ChannelBean<Integer> homeReverse;
@CaChannel(type=Integer.class, name ="${PREFIX}.HOMR")
private Channel<Integer> homeReverse;
/**
* .HOMF Home forward - int
*/
@CaChannel(type=Integer.class, name =".HOMF")
private ChannelBean<Integer> homeForward;
@CaChannel(type=Integer.class, name ="${PREFIX}.HOMF")
private Channel<Integer> homeForward;
/**
* .EGU Engineering unit - String
*/
@CaChannel(type=String.class, name =".EGU")
private ChannelBean<String> engineeringUnit;
@CaChannel(type=String.class, name ="${PREFIX}.EGU")
private Channel<String> engineeringUnit;
/**
* .DTYP Type - String (e.g. "OMS MAXv") see enum Type
*/
@CaChannel(type=Integer.class, name =".DTYP")
private ChannelBean<Integer> type;
@CaChannel(type=Integer.class, name ="${PREFIX}.DTYP")
private Channel<Integer> type;
/**
* .DESC Description - String
*/
@CaChannel(type=String.class, name =".DESC")
private ChannelBean<String> description;
@CaChannel(type=String.class, name ="${PREFIX}.DESC")
private Channel<String> description;
/**
@@ -133,45 +133,45 @@ public class MotorChannelsTemplate {
/**
* .DHLM Dial high limit - double
*/
@CaChannel(type=Double.class, name =".DHLM")
private ChannelBean<Double> dialHighLimit;
@CaChannel(type=Double.class, name ="${PREFIX}.DHLM")
private Channel<Double> dialHighLimit;
/**
* .DLLM Dial low limit - double
*/
@CaChannel(type=Double.class, name =".DLLM")
private ChannelBean<Double> dialLowLimit;
@CaChannel(type=Double.class, name ="${PREFIX}.DLLM")
private Channel<Double> dialLowLimit;
/**
* .DRBV Dial readback value - double
*/
@CaChannel(type=Double.class, name =".DRBV", monitor=true)
private ChannelBean<Double> dialReadbackValue;
@CaChannel(type=Double.class, name ="${PREFIX}.DRBV", monitor=true)
private Channel<Double> dialReadbackValue;
/**
* .DVAL Dial set value - double
*/
@CaChannel(type=Double.class, name =".DVAL", monitor=true)
private ChannelBean<Double> dialSetValue;
@CaChannel(type=Double.class, name ="${PREFIX}.DVAL", monitor=true)
private Channel<Double> dialSetValue;
/**
* .RVAL Raw value - int
*/
@CaChannel(type=Integer.class, name =".RVAL", monitor=true)
private ChannelBean<Integer> rawValue;
@CaChannel(type=Integer.class, name ="${PREFIX}.RVAL", monitor=true)
private Channel<Integer> rawValue;
/**
* .RRBV Raw readback value - int
*/
@CaChannel(type=Integer.class, name =".RRBV", monitor=true)
private ChannelBean<Integer> rawReadbackValue;
@CaChannel(type=Integer.class, name ="${PREFIX}.RRBV", monitor=true)
private Channel<Integer> rawReadbackValue;
/**
* .SPMG Stop/Pause/Move/Go - (0:"Stop", 1:"Pause", 2:"Move", 3:"Go") - 3
*/
public enum Commands { Stop, Pause, Move, Go };
@CaChannel(type=Integer.class, name =".SPMG")
private ChannelBean<Integer> command;
@CaChannel(type=Integer.class, name ="${PREFIX}.SPMG")
private Channel<Integer> command;
/**
@@ -182,28 +182,28 @@ public class MotorChannelsTemplate {
* .SET Set/Use Switch - (0:"Use", 1:"Set") - 0
*/
public enum Calibration {Use, Set};
@CaChannel(type=Integer.class, name =".SET")
private ChannelBean<Integer> calibration;
@CaChannel(type=Integer.class, name ="${PREFIX}.SET")
private Channel<Integer> calibration;
/**
* .OFF User offset (EGU) - double
*/
@CaChannel(type=Double.class, name =".OFF")
private ChannelBean<Double> offset;
@CaChannel(type=Double.class, name ="${PREFIX}.OFF")
private Channel<Double> offset;
/**
* .FOFF Offset-Freeze Switch - (0:"Variable", 1:"Frozen") - 1
*/
public enum OffsetMode {Variable, Frozen};
@CaChannel(type=Integer.class, name =".FOFF")
private ChannelBean<Integer> offsetMode;
@CaChannel(type=Integer.class, name ="${PREFIX}.FOFF")
private Channel<Integer> offsetMode;
/**
* .DIR User direction - (0:"Pos", 1:"Neg")
*/
public enum Direction {Positive, Negative};
@CaChannel(type=Integer.class, name =".DIR")
private ChannelBean<Integer> direction;
@CaChannel(type=Integer.class, name ="${PREFIX}.DIR")
private Channel<Integer> direction;
/**
@@ -213,44 +213,44 @@ public class MotorChannelsTemplate {
/**
* .VELO Velocity (EGU/s) - double
*/
@CaChannel(type=Double.class, name =".VELO")
private ChannelBean<Double> velocity;
@CaChannel(type=Double.class, name ="${PREFIX}.VELO")
private Channel<Double> velocity;
/**
* .BVEL Backlash velocity (EGU/s) - double
*/
@CaChannel(type=Double.class, name =".BVEL")
private ChannelBean<Double> backlashVelocity;
@CaChannel(type=Double.class, name ="${PREFIX}.BVEL")
private Channel<Double> backlashVelocity;
/**
* .VBAS Base speed (EGU/s) - double
*/
@CaChannel(type=Double.class, name =".VBAS")
private ChannelBean<Double> baseSpeed;
@CaChannel(type=Double.class, name ="${PREFIX}.VBAS")
private Channel<Double> baseSpeed;
/**
* .ACCL Acceleration time / seconds to velocity - double
*/
@CaChannel(type=Double.class, name =".ACCL")
private ChannelBean<Double> accelerationTime;
@CaChannel(type=Double.class, name ="${PREFIX}.ACCL")
private Channel<Double> accelerationTime;
/**
* .BACC Backlash acceleration time / seconds to velocity - double
*/
@CaChannel(type=Double.class, name =".BACC")
private ChannelBean<Double> backlashAccelerationTime;
@CaChannel(type=Double.class, name ="${PREFIX}.BACC")
private Channel<Double> backlashAccelerationTime;
/**
* .BDST Backlash distance (EGU) - double
*/
@CaChannel(type=Double.class, name =".BDST")
private ChannelBean<Double> backlashDistance;
@CaChannel(type=Double.class, name ="${PREFIX}.BDST")
private Channel<Double> backlashDistance;
/**
* .FRAC Move fraction - double
*/
@CaChannel(type=Double.class, name =".FRAC")
private ChannelBean<Double> moveFracion;
@CaChannel(type=Double.class, name ="${PREFIX}.FRAC")
private Channel<Double> moveFracion;
/**
@@ -260,69 +260,69 @@ public class MotorChannelsTemplate {
/**
* .MRES Motor resolution - double
*/
@CaChannel(type=Double.class, name =".MRES")
private ChannelBean<Double> motorResolution;
@CaChannel(type=Double.class, name ="${PREFIX}.MRES")
private Channel<Double> motorResolution;
/**
* .ERES Encoder resolution - double
*/
@CaChannel(type=Double.class, name =".ERES")
private ChannelBean<Double> encoderResolution;
@CaChannel(type=Double.class, name ="${PREFIX}.ERES")
private Channel<Double> encoderResolution;
/**
* .RRES Readback resolution - double
*/
@CaChannel(type=Double.class, name =".RRES")
private ChannelBean<Double> readbackResolution;
@CaChannel(type=Double.class, name ="${PREFIX}.RRES")
private Channel<Double> readbackResolution;
/**
* .RDBD Retry deadband (EGU) - double
*/
@CaChannel(type=Double.class, name =".RDBD")
private ChannelBean<Double> retryDeadband;
@CaChannel(type=Double.class, name ="${PREFIX}.RDBD")
private Channel<Double> retryDeadband;
/**
* .RTRY Max retry count - int
*/
@CaChannel(type=Integer.class, name =".RTRY")
private ChannelBean<Integer> maxRetryCount;
@CaChannel(type=Integer.class, name ="${PREFIX}.RTRY")
private Channel<Integer> maxRetryCount;
/**
* .RCNT Retry count - int
*/
@CaChannel(type=Integer.class, name =".RCNT", monitor=true)
private ChannelBean<Integer> retryCount;
@CaChannel(type=Integer.class, name ="${PREFIX}.RCNT", monitor=true)
private Channel<Integer> retryCount;
/**
* .UEIP Use encoder (if present) - (0:"No", 1:"Yes")
*/
@CaChannel(type=Boolean.class, name =".UEIP")
private ChannelBean<Boolean> useEncoder;
@CaChannel(type=Boolean.class, name ="${PREFIX}.UEIP")
private Channel<Boolean> useEncoder;
/**
* .URIP Use readback link (if present) - (0:"No", 1:"Yes")
*/
@CaChannel(type=Boolean.class, name =".URIP")
private ChannelBean<Boolean> useReadback;
@CaChannel(type=Boolean.class, name ="${PREFIX}.URIP")
private Channel<Boolean> useReadback;
/**
* .DLY Readback delay (s) - double
*/
@CaChannel(type=Double.class, name =".DLY")
private ChannelBean<Double> readbackDelay;
@CaChannel(type=Double.class, name ="${PREFIX}.DLY")
private Channel<Double> readbackDelay;
/**
* .RDBL Readback link - String
*/
@CaChannel(type=String.class, name =".RDBL")
private ChannelBean<String> readbackLink;
@CaChannel(type=String.class, name ="${PREFIX}.RDBL")
private Channel<String> readbackLink;
/**
* .OMSL Output mode select - (0:"supervisory", 1:"closed_loop")
*/
public enum OutputMode {Supervisory, Closed_Loop};
@CaChannel(type=Integer.class, name =".OMSL")
private ChannelBean<Integer> outputMode;
@CaChannel(type=Integer.class, name ="${PREFIX}.OMSL")
private Channel<Integer> outputMode;
/**
* ## Status ##
@@ -331,321 +331,321 @@ public class MotorChannelsTemplate {
/**
* .DMOV Done move - int
*/
@CaChannel(type=Boolean.class, name =".DMOV", monitor=true)
private ChannelBean<Boolean> moveDone;
@CaChannel(type=Boolean.class, name ="${PREFIX}.DMOV", monitor=true)
private Channel<Boolean> moveDone;
/**
* @return the highLimit
*/
public ChannelBean<Double> getHighLimit() {
public Channel<Double> getHighLimit() {
return highLimit;
}
/**
* @return the lowLimit
*/
public ChannelBean<Double> getLowLimit() {
public Channel<Double> getLowLimit() {
return lowLimit;
}
/**
* @return the readbackValue
*/
public ChannelBean<Double> getReadbackValue() {
public Channel<Double> getReadbackValue() {
return readbackValue;
}
/**
* @return the setValue
*/
public ChannelBean<Double> getSetValue() {
public Channel<Double> getSetValue() {
return setValue;
}
/**
* @return the relativeMoveValue
*/
public ChannelBean<Double> getRelativeMoveValue() {
public Channel<Double> getRelativeMoveValue() {
return relativeMoveValue;
}
/**
* @return the tweakValue
*/
public ChannelBean<Double> getTweakValue() {
public Channel<Double> getTweakValue() {
return tweakValue;
}
/**
* @return the tweakReverse
*/
public ChannelBean<Integer> getTweakReverse() {
public Channel<Integer> getTweakReverse() {
return tweakReverse;
}
/**
* @return the tweakForward
*/
public ChannelBean<Integer> getTweakForward() {
public Channel<Integer> getTweakForward() {
return tweakForward;
}
/**
* @return the jogReverse
*/
public ChannelBean<Integer> getJogReverse() {
public Channel<Integer> getJogReverse() {
return jogReverse;
}
/**
* @return the jogForward
*/
public ChannelBean<Integer> getJogForward() {
public Channel<Integer> getJogForward() {
return jogForward;
}
/**
* @return the homeReverse
*/
public ChannelBean<Integer> getHomeReverse() {
public Channel<Integer> getHomeReverse() {
return homeReverse;
}
/**
* @return the homeForward
*/
public ChannelBean<Integer> getHomeForward() {
public Channel<Integer> getHomeForward() {
return homeForward;
}
/**
* @return the engineeringUnit
*/
public ChannelBean<String> getEngineeringUnit() {
public Channel<String> getEngineeringUnit() {
return engineeringUnit;
}
/**
* @return the type
*/
public ChannelBean<Integer> getType() {
public Channel<Integer> getType() {
return type;
}
/**
* @return the description
*/
public ChannelBean<String> getDescription() {
public Channel<String> getDescription() {
return description;
}
/**
* @return the dialHighLimit
*/
public ChannelBean<Double> getDialHighLimit() {
public Channel<Double> getDialHighLimit() {
return dialHighLimit;
}
/**
* @return the dialLowLimit
*/
public ChannelBean<Double> getDialLowLimit() {
public Channel<Double> getDialLowLimit() {
return dialLowLimit;
}
/**
* @return the dialReadbackValue
*/
public ChannelBean<Double> getDialReadbackValue() {
public Channel<Double> getDialReadbackValue() {
return dialReadbackValue;
}
/**
* @return the dialSetValue
*/
public ChannelBean<Double> getDialSetValue() {
public Channel<Double> getDialSetValue() {
return dialSetValue;
}
/**
* @return the rawValue
*/
public ChannelBean<Integer> getRawValue() {
public Channel<Integer> getRawValue() {
return rawValue;
}
/**
* @return the rawReadbackValue
*/
public ChannelBean<Integer> getRawReadbackValue() {
public Channel<Integer> getRawReadbackValue() {
return rawReadbackValue;
}
/**
* @return the command
*/
public ChannelBean<Integer> getCommand() {
public Channel<Integer> getCommand() {
return command;
}
/**
* @return the calibration
*/
public ChannelBean<Integer> getCalibration() {
public Channel<Integer> getCalibration() {
return calibration;
}
/**
* @return the userOffset
*/
public ChannelBean<Double> getOffset() {
public Channel<Double> getOffset() {
return offset;
}
/**
* @return the offsetMode
*/
public ChannelBean<Integer> getOffsetMode() {
public Channel<Integer> getOffsetMode() {
return offsetMode;
}
/**
* @return the direction
*/
public ChannelBean<Integer> getDirection() {
public Channel<Integer> getDirection() {
return direction;
}
/**
* @return the velocity
*/
public ChannelBean<Double> getVelocity() {
public Channel<Double> getVelocity() {
return velocity;
}
/**
* @return the backlashVelocity
*/
public ChannelBean<Double> getBacklashVelocity() {
public Channel<Double> getBacklashVelocity() {
return backlashVelocity;
}
/**
* @return the baseSpeed
*/
public ChannelBean<Double> getBaseSpeed() {
public Channel<Double> getBaseSpeed() {
return baseSpeed;
}
/**
* @return the accelerationTime
*/
public ChannelBean<Double> getAccelerationTime() {
public Channel<Double> getAccelerationTime() {
return accelerationTime;
}
/**
* @return the backlashAccelerationTime
*/
public ChannelBean<Double> getBacklashAccelerationTime() {
public Channel<Double> getBacklashAccelerationTime() {
return backlashAccelerationTime;
}
/**
* @return the backlashDistance
*/
public ChannelBean<Double> getBacklashDistance() {
public Channel<Double> getBacklashDistance() {
return backlashDistance;
}
/**
* @return the moveFracion
*/
public ChannelBean<Double> getMoveFracion() {
public Channel<Double> getMoveFracion() {
return moveFracion;
}
/**
* @return the motorResolution
*/
public ChannelBean<Double> getMotorResolution() {
public Channel<Double> getMotorResolution() {
return motorResolution;
}
/**
* @return the encoderResolution
*/
public ChannelBean<Double> getEncoderResolution() {
public Channel<Double> getEncoderResolution() {
return encoderResolution;
}
/**
* @return the readbackResolution
*/
public ChannelBean<Double> getReadbackResolution() {
public Channel<Double> getReadbackResolution() {
return readbackResolution;
}
/**
* @return the retryDeadband
*/
public ChannelBean<Double> getRetryDeadband() {
public Channel<Double> getRetryDeadband() {
return retryDeadband;
}
/**
* @return the maxRetryCount
*/
public ChannelBean<Integer> getMaxRetryCount() {
public Channel<Integer> getMaxRetryCount() {
return maxRetryCount;
}
/**
* @return the retryCount
*/
public ChannelBean<Integer> getRetryCount() {
public Channel<Integer> getRetryCount() {
return retryCount;
}
/**
* @return the useEncoder
*/
public ChannelBean<Boolean> getUseEncoder() {
public Channel<Boolean> getUseEncoder() {
return useEncoder;
}
/**
* @return the useReadback
*/
public ChannelBean<Boolean> getUseReadback() {
public Channel<Boolean> getUseReadback() {
return useReadback;
}
/**
* @return the readbackDelay
*/
public ChannelBean<Double> getReadbackDelay() {
public Channel<Double> getReadbackDelay() {
return readbackDelay;
}
/**
* @return the readbackLink
*/
public ChannelBean<String> getReadbackLink() {
public Channel<String> getReadbackLink() {
return readbackLink;
}
/**
* @return the outputMode
*/
public ChannelBean<Integer> getOutputMode() {
public Channel<Integer> getOutputMode() {
return outputMode;
}
/**
* @return the moveDone
*/
public ChannelBean<Boolean> getMoveDone() {
public Channel<Boolean> getMoveDone() {
return moveDone;
}

96
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ScrlogicLoop.java
View File

@@ -19,15 +19,17 @@
package ch.psi.fda.core.loops.cr;
import gov.aps.jca.CAException;
import gov.aps.jca.Monitor;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -41,8 +43,11 @@ import ch.psi.fda.core.messages.DataQueue;
import ch.psi.fda.core.messages.EndOfStreamMessage;
import ch.psi.fda.core.messages.Message;
import ch.psi.fda.core.sensors.ChannelAccessDoubleSensor;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.MonitorListenerDoubleTimestamp;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.type.DoubleTimestamp;
/**
* @author ebner
@@ -85,13 +90,13 @@ public class ScrlogicLoop implements ActionLoop {
/**
* Sensors to read out
*/
private List<Sensor> sensors;
// private List<Sensor> sensors;
/**
* List of monitors that were attached to the sensor channels (i.e
* workaround)
*/
private final List<Monitor> monitors = new ArrayList<Monitor>();
private final List<PropertyChangeListener> monitors = new ArrayList<>();
/**
* List of blocking queues that hold the data for one sensor (channel)
@@ -100,8 +105,20 @@ public class ScrlogicLoop implements ActionLoop {
private CountDownLatch latch;
public ScrlogicLoop(List<Sensor> sensors) {
this.sensors = sensors;
private List<Channel<DoubleTimestamp>> sensors = new ArrayList<>();
private List<String> sensorIds = new ArrayList<>();
private ChannelService cservice;
public ScrlogicLoop(ChannelService s, List<Sensor> sensors) {
try{
for(Sensor ss: sensors){
this.sensors.add(s.createChannel(new ChannelDescriptor<DoubleTimestamp>(DoubleTimestamp.class, ((ChannelAccessDoubleSensor)ss).getChannel().getName(), true)));
sensorIds.add(ss.getId());
}
this.cservice = s;
} catch (ChannelException | InterruptedException | TimeoutException e) {
throw new RuntimeException(e);
}
}
/*
@@ -116,53 +133,40 @@ public class ScrlogicLoop implements ActionLoop {
queues.clear();
latch = new CountDownLatch(1);
try {
// Attach monitors to the channels (this is actually a workaround)
for (Sensor sensor : sensors) {
if (sensor instanceof ChannelAccessDoubleSensor) {
ChannelAccessDoubleSensor s = (ChannelAccessDoubleSensor) sensor;
ChannelBean<Double> b = s.getChannel();
for (Channel<DoubleTimestamp> sensor : sensors) {
// if (sensor instanceof ChannelAccessDoubleSensor) {
// ChannelAccessDoubleSensor s = (ChannelAccessDoubleSensor) sensor;
// Channel<Double> b = s.getChannel();
// Create data queue for the channel
final BlockingQueue<TimestampedValue> q = new LinkedBlockingQueue<TimestampedValue>();
queues.add(q);
PropertyChangeListener b = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
DoubleTimestamp value = (DoubleTimestamp) evt.getNewValue();
q.add(new TimestampedValue(value.getValue(), value.getTimestamp().getTime(), value.getNanosecondOffset()));
}
};
Monitor m = b
.attachMonitor(new MonitorListenerDoubleTimestamp() {
@Override
public void valueChanged(Double value, Date timestamp, long nanosecondsOffset) {
// Add values to channel queue
q.add(new TimestampedValue(value, timestamp.getTime(), nanosecondsOffset));
}
});
monitors.add(m);
}
sensor.addPropertyChangeListener("value", b);
monitors.add(b);
// }
}
} catch (CAException e) {
new RuntimeException("Unable to create monitor for channels", e);
}
logger.info("Start data acquisition");
latch.await();
// Remove monitors
try {
try{
for (int i = 0; i < sensors.size(); i++) {
Sensor sensor = sensors.get(i);
if (sensor instanceof ChannelAccessDoubleSensor) {
ChannelAccessDoubleSensor s = (ChannelAccessDoubleSensor) sensor;
ChannelBean<Double> b = s.getChannel();
try{
b.removeMonitor(monitors.get(i));
}
catch(IllegalArgumentException e){
logger.log(Level.SEVERE, "Unable to detach monitor", e);
}
}
Channel<DoubleTimestamp> sensor = sensors.get(i);
sensor.removePropertyChangeListener(monitors.get(i));
}
} catch (CAException e) {
new RuntimeException(e);
}
finally{
// Clear all monitors in the list
@@ -201,8 +205,12 @@ public class ScrlogicLoop implements ActionLoop {
@Override
public void destroy() {
// Destroy all sensors
for (Sensor s : sensors) {
s.destroy();
for (Channel<DoubleTimestamp> s : sensors) {
try {
s.destroy();
} catch (ChannelException e) {
throw new RuntimeException(e);
}
}
sensors.clear();
}
@@ -280,8 +288,8 @@ public class ScrlogicLoop implements ActionLoop {
m.getComponents().add(new ComponentMetadata(ID_TIMESTAMP_MILLISECONDS));
m.getComponents().add(
new ComponentMetadata(ID_TIMESTAMP_OFFSET_NANOSECONDS));
for (Sensor s : sensors) {
m.getComponents().add(new ComponentMetadata(s.getId()));
for (String id : sensorIds) {
m.getComponents().add(new ComponentMetadata(id));
}
return new DataQueue(dataQueue, m);
}

32
ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/VSC16ScalerChannelsTemplate.java
View File

@@ -21,7 +21,7 @@ package ch.psi.fda.core.loops.cr;
import java.util.List;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.Channel;
import ch.psi.jcae.annotation.CaChannel;
/**
@@ -35,68 +35,68 @@ public class VSC16ScalerChannelsTemplate {
/**
* Command
*/
@CaChannel(type=Integer.class, name =".CNT")
private ChannelBean<Integer> command;
@CaChannel(type=Integer.class, name ="${PREFIX}.CNT")
private Channel<Integer> command;
public enum Mode {OneShot, AutoCount};
/**
* Count mode
*/
@CaChannel(type=Integer.class, name =".CONT")
private ChannelBean<Integer> mode;
@CaChannel(type=Integer.class, name ="${PREFIX}.CONT")
private Channel<Integer> mode;
/**
* Channel description
*/
@CaChannel(type=Boolean.class, name={".NM1", ".NM2", ".NM3", ".NM4", ".NM5", ".NM6", ".NM7", ".NM8", ".NM9", ".NM10", ".NM11", ".NM12", ".NM13", ".NM14", ".NM15", ".NM16"})
private List<ChannelBean<Boolean>> channelDescription;
@CaChannel(type=Boolean.class, name={"${PREFIX}.NM1", "${PREFIX}.NM2", "${PREFIX}.NM3", "${PREFIX}.NM4", "${PREFIX}.NM5", "${PREFIX}.NM6", "${PREFIX}.NM7", "${PREFIX}.NM8", "${PREFIX}.NM9", "${PREFIX}.NM10", "${PREFIX}.NM11", "${PREFIX}.NM12", "${PREFIX}.NM13", "${PREFIX}.NM14", "${PREFIX}.NM15", "${PREFIX}.NM16"})
private List<Channel<Boolean>> channelDescription;
/**
* Channel gate
*/
@CaChannel(type=Boolean.class, name={".G1", ".G2", ".G3", ".G4", ".G5", ".G6", ".G7", ".G8", ".G9", ".G10", ".G11", ".G12", ".G13", ".G14", ".G15", ".G16"})
private List<ChannelBean<Boolean>> channelGate;
@CaChannel(type=Boolean.class, name={"${PREFIX}.G1", "${PREFIX}.G2", "${PREFIX}.G3", "${PREFIX}.G4", "${PREFIX}.G5", "${PREFIX}.G6", "${PREFIX}.G7", "${PREFIX}.G8", "${PREFIX}.G9", "${PREFIX}.G10", "${PREFIX}.G11", "${PREFIX}.G12", "${PREFIX}.G13", "${PREFIX}.G14", "${PREFIX}.G15", "${PREFIX}.G16"})
private List<Channel<Boolean>> channelGate;
/**
* Channel preset count
* If gate is on scaler will only count until this value
*/
@CaChannel(type=Integer.class, name={".PR1", ".PR2", ".PR3", ".PR4", ".PR5", ".PR6", ".PR7", ".PR8", ".PR9", ".PR10", ".PR11", ".PR12", ".PR13", ".PR14", ".PR15", ".PR16"})
private List<ChannelBean<Integer>> channelPresetCount;
@CaChannel(type=Integer.class, name={"${PREFIX}.PR1", "${PREFIX}.PR2", "${PREFIX}.PR3", "${PREFIX}.PR4", "${PREFIX}.PR5", "${PREFIX}.PR6", "${PREFIX}.PR7", "${PREFIX}.PR8", "${PREFIX}.PR9", "${PREFIX}.PR10", "${PREFIX}.PR11", "${PREFIX}.PR12", "${PREFIX}.PR13", "${PREFIX}.PR14", "${PREFIX}.PR15", "${PREFIX}.PR16"})
private List<Channel<Integer>> channelPresetCount;
/**
* @return the command
*/
public ChannelBean<Integer> getCommand() {
public Channel<Integer> getCommand() {
return command;
}
/**
* @return the mode
*/
public ChannelBean<Integer> getMode() {
public Channel<Integer> getMode() {
return mode;
}
/**
* @return the channelDescription
*/
public List<ChannelBean<Boolean>> getChannelDescription() {
public List<Channel<Boolean>> getChannelDescription() {
return channelDescription;
}
/**
* @return the channelGate
*/
public List<ChannelBean<Boolean>> getChannelGate() {
public List<Channel<Boolean>> getChannelGate() {
return channelGate;
}
/**
* @return the channelPresetCount
*/
public List<ChannelBean<Integer>> getChannelPresetCount() {
public List<Channel<Integer>> getChannelPresetCount() {
return channelPresetCount;
}

23
ch.psi.fda/src/main/java/ch/psi/fda/core/manipulator/JythonManipulation.java
View File

@@ -19,9 +19,8 @@
package ch.psi.fda.core.manipulator;
import gov.aps.jca.CAException;
import java.util.List;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
@@ -37,8 +36,10 @@ import ch.psi.fda.core.scripting.JythonParameterMapping;
import ch.psi.fda.core.scripting.JythonParameterMappingChannel;
import ch.psi.fda.core.scripting.JythonParameterMappingGlobalVariable;
import ch.psi.fda.core.scripting.JythonParameterMappingID;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Manipulation
@@ -96,14 +97,15 @@ public class JythonManipulation implements Manipulation{
* Parameter array of the entry function
*/
private String[] parameter;
private ChannelService cservice;
/**
* Jython entry call
*/
private String jythonCall;
public JythonManipulation(String id, String script, List<JythonParameterMapping> mapping){
this(id, script, mapping, false);
public JythonManipulation(ChannelService s, String id, String script, List<JythonParameterMapping> mapping){
this(s, id, script, mapping, false);
}
/**
@@ -112,11 +114,12 @@ public class JythonManipulation implements Manipulation{
* @param script
* @param mapping
*/
public JythonManipulation(String id, String script, List<JythonParameterMapping> mapping, boolean returnArray){
public JythonManipulation(ChannelService s, String id, String script, List<JythonParameterMapping> mapping, boolean returnArray){
this.id = id;
this.script = script;
this.mapping = mapping;
this.returnArray = returnArray;
this.cservice = s;
}
/**
@@ -192,10 +195,10 @@ public class JythonManipulation implements Manipulation{
JythonParameterMappingChannel pm = (JythonParameterMappingChannel)jpm;
parameterIndex[i] = null;
ChannelBean<?> cb;
Channel<?> cb;
try {
cb = ChannelBeanFactory.getFactory().createChannelBean(pm.getType(), pm.getChannel(), true);
} catch (CAException e) {
cb = cservice.createChannel(new ChannelDescriptor<>(pm.getType(), pm.getChannel(), true));
} catch (ChannelException | TimeoutException e) {
throw new IllegalArgumentException("Unable to establish channel: "+pm.getChannel(), e);
} catch (InterruptedException e) {
throw new RuntimeException("Unable to establish channel: "+pm.getChannel(), e);

24
ch.psi.fda/src/main/java/ch/psi/fda/core/sensors/ChannelAccessDoubleArraySensor.java
View File

@@ -19,13 +19,16 @@
package ch.psi.fda.core.sensors;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.EngineConfiguration;
import ch.psi.fda.core.Sensor;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Scalar sensor that reads a double form a Channel Access channel
@@ -40,7 +43,7 @@ public class ChannelAccessDoubleArraySensor implements Sensor {
/**
* Channel Access channel of this sensor
*/
private final ChannelBean<double[]> channel;
private final Channel<double[]> channel;
/**
* Number of elements to read from the waveform
@@ -58,12 +61,12 @@ public class ChannelAccessDoubleArraySensor implements Sensor {
* @param channelName Name of the Channel Access channel of this sensor
* @param numberOfElements Number of elements to read out of the waveform
*/
public ChannelAccessDoubleArraySensor(String id, String channelName, int numberOfElements){
public ChannelAccessDoubleArraySensor(ChannelService s, String id, String channelName, int numberOfElements){
try {
this.channel = ChannelBeanFactory.getFactory().createChannelBean(double[].class, channelName, false);
this.channel = s.createChannel(new ChannelDescriptor<>(double[].class, channelName, false, numberOfElements));
this.numberOfElements = numberOfElements;
this.id = id;
} catch (CAException e) {
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize sensor channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -80,7 +83,8 @@ public class ChannelAccessDoubleArraySensor implements Sensor {
double[] v;
try {
v = channel.getValue(numberOfElements);
// v = channel.getValue(numberOfElements);
v = channel.getValue();
} catch (IllegalStateException e) {
// Only fail during data acquisition if fail on error sensor flag is on true. Otherwise
// return NaN (Not a Number)
@@ -91,7 +95,7 @@ public class ChannelAccessDoubleArraySensor implements Sensor {
for(int i =0;i<v.length;i++){
v[i] = Double.NaN;
}
} catch (CAException e) {
} catch (ChannelException | TimeoutException | ExecutionException e) {
// Only fail during data acquisition if fail on error sensor flag is on true. Otherwise
// return NaN (Not a Number)
if(EngineConfiguration.getInstance().isFailOnSensorError()){
@@ -136,7 +140,7 @@ public class ChannelAccessDoubleArraySensor implements Sensor {
try {
logger.finest("Destroy sensor channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

23
ch.psi.fda/src/main/java/ch/psi/fda/core/sensors/ChannelAccessDoubleSensor.java
View File

@@ -19,13 +19,16 @@
package ch.psi.fda.core.sensors;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.EngineConfiguration;
import ch.psi.fda.core.Sensor;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Scalar sensor that reads a double form a Channel Access channel
@@ -41,7 +44,7 @@ public class ChannelAccessDoubleSensor implements Sensor {
/**
* Channel Access channel of this sensor
*/
private ChannelBean<Double> channel;
private Channel<Double> channel;
/**
* Global id of the sensor
@@ -53,11 +56,11 @@ public class ChannelAccessDoubleSensor implements Sensor {
* @param id Global id of the sensor
* @param channelName Name of the Channel Access channel of this sensor
*/
public ChannelAccessDoubleSensor(String id, String channelName){
public ChannelAccessDoubleSensor(ChannelService s, String id, String channelName){
try {
channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
channel = s.createChannel(new ChannelDescriptor<>(Double.class, channelName, false));
this.id = id;
} catch (CAException e) {
} catch (ChannelException | TimeoutException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize sensor channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
@@ -82,7 +85,7 @@ public class ChannelAccessDoubleSensor implements Sensor {
throw e;
}
v = Double.NaN;
} catch (CAException e) {
} catch (ChannelException | TimeoutException | ExecutionException e) {
// Only fail during data acquisition if fail on error sensor flag is on true. Otherwise
// return NaN (Not a Number)
if(EngineConfiguration.getInstance().isFailOnSensorError()){
@@ -116,7 +119,7 @@ public class ChannelAccessDoubleSensor implements Sensor {
try {
logger.finest("Destroy sensor channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}
@@ -125,7 +128,7 @@ public class ChannelAccessDoubleSensor implements Sensor {
* Get channel object of sensor
* @return
*/
public ChannelBean<Double> getChannel(){
public Channel<Double> getChannel(){
return channel;
}

27
ch.psi.fda/src/main/java/ch/psi/fda/core/sensors/ChannelAccessStringSensor.java
View File

@@ -19,13 +19,16 @@
package ch.psi.fda.core.sensors;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import ch.psi.fda.core.EngineConfiguration;
import ch.psi.fda.core.Sensor;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
/**
* Scalar sensor that reads a double form a Channel Access channel
@@ -41,7 +44,7 @@ public class ChannelAccessStringSensor implements Sensor {
/**
* Channel Access channel of this sensor
*/
private ChannelBean<String> channel;
private Channel<String> channel;
/**
* Global id of the sensor
@@ -53,15 +56,16 @@ public class ChannelAccessStringSensor implements Sensor {
* @param id Global id of the sensor
* @param channelName Name of the Channel Access channel of this sensor
*/
public ChannelAccessStringSensor(String id, String channelName){
public ChannelAccessStringSensor(ChannelService s, String id, String channelName){
try {
channel = ChannelBeanFactory.getFactory().createChannelBean(String.class, channelName, false);
channel = s.createChannel(new ChannelDescriptor<String>(String.class, channelName, false));
this.id = id;
} catch (CAException e) {
// Convert Exception into unchecked RuntimeException
throw new IllegalArgumentException("Unable to initialize sensor channel [name:"+channelName+"]",e);
} catch (InterruptedException e) {
throw new RuntimeException("Unable to initialize sensor channel [name:"+channelName+"]",e);
} catch (ChannelException e) {
throw new IllegalArgumentException("Unable to initialize sensor channel [name:"+channelName+"]",e);
} catch (TimeoutException e) {
throw new IllegalArgumentException("Unable to initialize sensor channel [name:"+channelName+"]",e);
}
}
@@ -82,7 +86,7 @@ public class ChannelAccessStringSensor implements Sensor {
throw e;
}
v = null;
} catch (CAException e) {
} catch (TimeoutException | ExecutionException |ChannelException e) {
// Only fail during data acquisition if fail on error sensor flag is on true. Otherwise
// return NaN (Not a Number)
if(EngineConfiguration.getInstance().isFailOnSensorError()){
@@ -96,6 +100,7 @@ public class ChannelAccessStringSensor implements Sensor {
// }
// v = null;
}
return(v);
}
@@ -116,7 +121,7 @@ public class ChannelAccessStringSensor implements Sensor {
try {
logger.finest("Destroy sensor channel: "+channel.getName());
channel.destroy();
} catch (CAException e) {
} catch (ChannelException e) {
throw new RuntimeException("Unable to destroy channel ["+channel.getName()+"]",e);
}
}

64
ch.psi.fda/src/test/java/ch/psi/fda/core/actions/ChannelAccessConditionTest.java
View File

@@ -21,18 +21,21 @@ package ch.psi.fda.core.actions;
import static org.junit.Assert.fail;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.actions.ChannelAccessCondition;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -43,11 +46,14 @@ public class ChannelAccessConditionTest {
// Get Logger
private static Logger logger = Logger.getLogger(ChannelAccessConditionTest.class.getName());
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -60,21 +66,24 @@ public class ChannelAccessConditionTest {
/**
* Test method for {@link ch.psi.fda.core.actions.ChannelAccessStringCondition#ChannelAccessStringCondition(java.lang.String, java.lang.String, long)}.
* @throws InterruptedException
* @throws TimeoutException
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testChannelAccessStringCondition() throws InterruptedException, CAException {
final ChannelBean<String> channel = ChannelBeanFactory.getFactory().createChannelBean(String.class, TestChannels.STRING_OUT, false);
public void testChannelAccessStringCondition() throws InterruptedException, ChannelException, TimeoutException, ExecutionException {
final Channel<String> channel = cservice.createChannel(new ChannelDescriptor<>(String.class, TestChannels.STRING_OUT, false));
channel.setValue("SomeValue");
ChannelAccessCondition<String> c = new ChannelAccessCondition<String>(TestChannels.STRING_OUT, "SomeValue", 1000l);
ChannelAccessCondition<String> c = new ChannelAccessCondition<String>(cservice, TestChannels.STRING_OUT, "SomeValue", 1000l);
c.execute();
}
@Test
public void testChannelAccessStringConditionRegex() throws InterruptedException, CAException {
final ChannelBean<String> channel = ChannelBeanFactory.getFactory().createChannelBean(String.class, TestChannels.STRING_OUT, false);
public void testChannelAccessStringConditionRegex() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
final Channel<String> channel = cservice.createChannel(new ChannelDescriptor<>(String.class, TestChannels.STRING_OUT, false));
channel.setValue("SomeValue");
ChannelAccessConditionRegex<String> c = new ChannelAccessConditionRegex<String>(TestChannels.STRING_OUT, "Some.*", 1000l);
ChannelAccessConditionRegex<String> c = new ChannelAccessConditionRegex<String>(cservice, TestChannels.STRING_OUT, "Some.*", 1000l);
c.execute();
}
@@ -83,20 +92,23 @@ public class ChannelAccessConditionTest {
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessStringConditionNotExist() {
new ChannelAccessCondition<String>(TestChannels.STRING_OUT_NOT_EXIST, "SomeValue", 1000l);
new ChannelAccessCondition<String>(cservice, TestChannels.STRING_OUT_NOT_EXIST, "SomeValue", 1000l);
}
/**
* Test method for {@link ch.psi.fda.core.actions.ChannelAccessStringCondition#execute()}.
* @throws CAException
* @throws InterruptedException
* @throws TimeoutException
* @throws ChannelException
* @throws ExecutionException
*/
@Test
public void testExecute() throws CAException, InterruptedException {
public void testExecute() throws InterruptedException, ChannelException, TimeoutException, ExecutionException {
String value = "SomeValue";
final ChannelAccessCondition<String> action = new ChannelAccessCondition<String>(TestChannels.STRING_OUT, value, 10000l);
final ChannelBean<String> channel = ChannelBeanFactory.getFactory().createChannelBean(String.class, TestChannels.STRING_OUT, false);
final ChannelAccessCondition<String> action = new ChannelAccessCondition<String>(cservice, TestChannels.STRING_OUT, value, 10000l);
final Channel<String> channel = cservice.createChannel(new ChannelDescriptor<>(String.class, TestChannels.STRING_OUT, false));
Thread t = new Thread(new Runnable() {
@@ -131,11 +143,11 @@ public class ChannelAccessConditionTest {
}
@Test(expected=RuntimeException.class)
public void testExecuteFail() throws CAException, InterruptedException {
public void testExecuteFail() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
String value = "SomeValue";
final ChannelAccessCondition<String> action = new ChannelAccessCondition<String>(TestChannels.STRING_OUT, value, 9000l);
final ChannelBean<String> channel = ChannelBeanFactory.getFactory().createChannelBean(String.class, TestChannels.STRING_OUT, false);
final ChannelAccessCondition<String> action = new ChannelAccessCondition<String>(cservice, TestChannels.STRING_OUT, value, 9000l);
final Channel<String> channel = cservice.createChannel(new ChannelDescriptor<>(String.class, TestChannels.STRING_OUT, false));
// Set the value to something else than the expected value
@@ -148,13 +160,16 @@ public class ChannelAccessConditionTest {
* Test method for {@link ch.psi.fda.core.actions.ChannelAccessStringCondition#execute()}.
* @throws CAException
* @throws InterruptedException
* @throws TimeoutException
* @throws ChannelException
* @throws ExecutionException
*/
@Test
public void testExecuteInteger() throws CAException, InterruptedException {
public void testExecuteInteger() throws InterruptedException, ChannelException, TimeoutException, ExecutionException {
Integer value = 12;
final ChannelAccessCondition<Integer> action = new ChannelAccessCondition<Integer>(TestChannels.STRING_OUT, value, 10000l);
final ChannelBean<Integer> channel = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, TestChannels.STRING_OUT, false);
final ChannelAccessCondition<Integer> action = new ChannelAccessCondition<Integer>(cservice, TestChannels.STRING_OUT, value, 10000l);
final Channel<Integer> channel = cservice.createChannel(new ChannelDescriptor<>(Integer.class, TestChannels.STRING_OUT, false));
Thread t = new Thread(new Runnable() {
@@ -192,11 +207,14 @@ public class ChannelAccessConditionTest {
* Test to ensure that the abort function is working correctly
* @throws CAException
* @throws InterruptedException
* @throws TimeoutException
* @throws ChannelException
* @throws ExecutionException
*/
@Test
public void testWaitAbort() throws CAException, InterruptedException {
final ChannelAccessCondition<Integer> action = new ChannelAccessCondition<Integer>(TestChannels.BINARY_OUT, 1, 10000l);
final ChannelBean<Integer> channel = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, TestChannels.BINARY_OUT, false);
public void testWaitAbort() throws InterruptedException, ChannelException, TimeoutException, ExecutionException {
final ChannelAccessCondition<Integer> action = new ChannelAccessCondition<Integer>(cservice, TestChannels.BINARY_OUT, 1, 10000l);
final Channel<Integer> channel = cservice.createChannel(new ChannelDescriptor<>(Integer.class, TestChannels.BINARY_OUT, false));
Thread t = new Thread(new Runnable() {

43
ch.psi.fda/src/test/java/ch/psi/fda/core/actions/ChannelAccessPutTest.java
View File

@@ -23,8 +23,8 @@ import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.List;
import gov.aps.jca.CAException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import org.junit.After;
import org.junit.Before;
@@ -32,8 +32,11 @@ import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.actions.ChannelAccessPut;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Test class for ChannelAccessStringPut
@@ -42,12 +45,14 @@ import ch.psi.jcae.ChannelBeanFactory;
*/
public class ChannelAccessPutTest {
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -63,7 +68,7 @@ public class ChannelAccessPutTest {
*/
@Test
public void testChannelAccessStringPutStringStringBoolean() {
new ChannelAccessPut<String>(TestChannels.STRING_OUT, "SomeValue", true, null);
new ChannelAccessPut<String>(cservice, TestChannels.STRING_OUT, "SomeValue", true, null);
}
/**
@@ -72,7 +77,7 @@ public class ChannelAccessPutTest {
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessStringPutStringStringBooleanNotExist() {
new ChannelAccessPut<String>(TestChannels.STRING_OUT_NOT_EXIST, "SomeValue", true, null);
new ChannelAccessPut<String>(cservice, TestChannels.STRING_OUT_NOT_EXIST, "SomeValue", true, null);
}
/**
@@ -81,7 +86,7 @@ public class ChannelAccessPutTest {
*/
@Test
public void testChannelAccessStringPutStringString() {
new ChannelAccessPut<String>(TestChannels.STRING_OUT, "SomeValue");
new ChannelAccessPut<String>(cservice, TestChannels.STRING_OUT, "SomeValue");
}
/**
@@ -90,22 +95,25 @@ public class ChannelAccessPutTest {
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessStringPutStringStringNotExist() {
new ChannelAccessPut<String>(TestChannels.STRING_OUT_NOT_EXIST, "SomeValue");
new ChannelAccessPut<String>(cservice, TestChannels.STRING_OUT_NOT_EXIST, "SomeValue");
}
/**
* Test method for {@link ch.psi.fda.core.actions.ChannelAccessStringPut#execute()}.
* @throws CAException
* @throws InterruptedException
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
*/
@Test
public void testExecute() throws CAException, InterruptedException {
public void testExecute() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
String setValue = "MyTestString";
ChannelAccessPut<String> action = new ChannelAccessPut<String>(TestChannels.STRING_OUT, setValue);
ChannelAccessPut<String> action = new ChannelAccessPut<String>(cservice, TestChannels.STRING_OUT, setValue);
action.execute();
ChannelBean<String> channel = ChannelBeanFactory.getFactory().createChannelBean(String.class, TestChannels.STRING_OUT, false);
Channel<String> channel = cservice.createChannel(new ChannelDescriptor<>(String.class, TestChannels.STRING_OUT, false));
String value = channel.getValue();
if(!value.equals(setValue)){
@@ -115,18 +123,21 @@ public class ChannelAccessPutTest {
/**
* Test method for {@link ch.psi.fda.core.actions.ChannelAccessStringPut#execute()}.
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testExecuteString() throws CAException, InterruptedException {
public void testExecuteString() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
String setValue = "MyTestString";
ChannelBean<String> channel = ChannelBeanFactory.getFactory().createChannelBean(String.class, TestChannels.STRING_OUT, false);
Channel<String> channel = cservice.createChannel(new ChannelDescriptor<>(String.class, TestChannels.STRING_OUT, false));
// Set channel to something else
channel.setValue(setValue+"test");
ChannelAccessPut<String> action = new ChannelAccessPut<String>(TestChannels.STRING_OUT, setValue);
ChannelAccessPut<String> action = new ChannelAccessPut<String>(cservice, TestChannels.STRING_OUT, setValue);
action.execute();
@@ -143,11 +154,11 @@ public class ChannelAccessPutTest {
* @throws InterruptedException
*/
@Test
public void testExecuteMulti() throws CAException, InterruptedException {
public void testExecuteMulti() throws InterruptedException {
List<ChannelAccessPut<String>> actions = new ArrayList<ChannelAccessPut<String>>();
for(int i=0;i<20;i++){
actions.add(new ChannelAccessPut<String>(TestChannels.STRING_OUT, i+""));
actions.add(new ChannelAccessPut<String>(cservice, TestChannels.STRING_OUT, i+""));
}
for(ChannelAccessPut<String> action: actions){

10
ch.psi.fda/src/test/java/ch/psi/fda/core/actions/JythonActionTest.java
View File

@@ -31,6 +31,8 @@ import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.actions.JythonAction;
import ch.psi.fda.core.scripting.JythonParameterMappingChannel;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -38,11 +40,13 @@ import ch.psi.fda.core.scripting.JythonParameterMappingChannel;
*/
public class JythonActionTest {
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -61,7 +65,7 @@ public class JythonActionTest {
String script = "import math\ndef process(o):\n print o.getValue()\n o.setValue(-1.0)\n print o.getValue()\n val=math.cos(10.0) + math.sin(o.getValue())\n print val\n o.setValue(val)";
List<JythonParameterMappingChannel> mapping = new ArrayList<JythonParameterMappingChannel>();
mapping.add(new JythonParameterMappingChannel("o", TestChannels.ANALOG_OUT, Double.class));
JythonAction action = new JythonAction(script, mapping);
JythonAction action = new JythonAction(cservice, script, mapping);
// Execute action
action.execute();
@@ -78,7 +82,7 @@ public class JythonActionTest {
List<JythonParameterMappingChannel> mapping = new ArrayList<JythonParameterMappingChannel>();
mapping.add(new JythonParameterMappingChannel("o", TestChannels.ANALOG_OUT, Double.class));
mapping.add(new JythonParameterMappingChannel("b", TestChannels.ANALOG_OUT, Double.class));
JythonAction action = new JythonAction(script, mapping);
JythonAction action = new JythonAction(cservice, script, mapping);
// Execute action
action.execute();
@@ -94,7 +98,7 @@ public class JythonActionTest {
String script = "import math\ndef process(o):\n print o.getValue()\n o.setValue(-1.0)\n print o.getValue()\n val=math.cos(10.0) + math.sin(o.getValue())\n print val\n o.setValue(val)";
List<JythonParameterMappingChannel> mapping = new ArrayList<JythonParameterMappingChannel>();
mapping.add(new JythonParameterMappingChannel("ooo", TestChannels.ANALOG_OUT, Double.class));
JythonAction action = new JythonAction(script, mapping);
JythonAction action = new JythonAction(cservice, script, mapping);
// Execute action
action.execute();

123
ch.psi.fda/src/test/java/ch/psi/fda/core/actors/ChannelAccessFunctionActuatorTest.java
View File

@@ -21,11 +21,12 @@ package ch.psi.fda.core.actors;
import static org.junit.Assert.fail;
import gov.aps.jca.CAException;
import java.net.SocketException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import org.junit.After;
@@ -34,8 +35,11 @@ import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.actors.ChannelAccessFunctionActuator;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Test class specific for the FunctionActuatorChannelAccess implementation.
@@ -53,18 +57,20 @@ public class ChannelAccessFunctionActuatorTest {
private static final double doneDelay = 0;
private static final Long timeout = 1800000l; // 30 minutes
private ChannelBean<Double> channel;
private ChannelBean<Integer> doneChannel;
private Channel<Double> channel;
private Channel<Integer> doneChannel;
private Function function;
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
doneChannel = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, channelNameDone, false);
cservice = new DefaultChannelService();
channel = cservice.createChannel(new ChannelDescriptor<>(Double.class, channelName, false));
doneChannel = cservice.createChannel(new ChannelDescriptor<>(Integer.class, channelNameDone, false));
function = new Function() {
@@ -87,22 +93,22 @@ public class ChannelAccessFunctionActuatorTest {
* Check whether Exception is thrown if a negative step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessFunctionActuatorNegativeStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessFunctionActuatorNegativeStepSize() throws SocketException, Exception {
// Need to throw exception because of negative step size
new ChannelAccessFunctionActuator<Object>(channelName, function,0, 1, -0.1, timeout);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, function,0, 1, -0.1, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessFunctionActuator#FunctionActuatorChannelAccess(String, double, double, double)}.
*/
@Test
public void testChannelAccessFunctionActuatorTimeout() throws SocketException, CAException, Exception {
public void testChannelAccessFunctionActuatorTimeout() throws SocketException, Exception {
// Negative timeout
boolean flag = false;
try{
// Need to return IllegalArgumentException due to negative Timeout
new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 1, 0.1, -1l);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 1, 0.1, -1l);
}
catch(IllegalArgumentException e){
flag=true;
@@ -115,7 +121,7 @@ public class ChannelAccessFunctionActuatorTest {
flag=false;
try{
// Need to return IllegalArgumentException
new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 1, 0.1, -0l);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 1, 0.1, -0l);
}
catch(IllegalArgumentException e){
flag=true;
@@ -125,10 +131,10 @@ public class ChannelAccessFunctionActuatorTest {
}
// Accept null timeout
new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 1, 0.1, null);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 1, 0.1, null);
// Accept positive timeout
new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 1, 0.1, 1l);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 1, 0.1, 1l);
}
@@ -137,18 +143,18 @@ public class ChannelAccessFunctionActuatorTest {
* Check whether Exception is thrown if a zero step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessFunctionActuatorZeroStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessFunctionActuatorZeroStepSize() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 1, 0, timeout);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 1, 0, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessFunctionActuator#FunctionActuatorChannelAccess(String, double, double, double)}.
* Check correct initialization
*/
public void testChannelAccessFunctionActuator() throws SocketException, CAException, Exception {
public void testChannelAccessFunctionActuator() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 10, 1, timeout);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 10, 1, timeout);
}
@@ -158,7 +164,7 @@ public class ChannelAccessFunctionActuatorTest {
*/
@Test
public void testSet() throws InterruptedException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 0.09999, 0.1, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 0.09999, 0.1, timeout);
actuator.set();
}
@@ -169,7 +175,7 @@ public class ChannelAccessFunctionActuatorTest {
*/
@Test(expected=IllegalStateException.class)
public void testSetNoNext() throws InterruptedException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 0.09999, 0.1, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 0.09999, 0.1, timeout);
actuator.set();
actuator.set();
}
@@ -180,7 +186,7 @@ public class ChannelAccessFunctionActuatorTest {
*/
@Test
public void testHasNextOneStep() throws InterruptedException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 0.09999, 0.1, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 0.09999, 0.1, timeout);
// Execute first set (because there is always a first move)
actuator.set();
@@ -197,7 +203,7 @@ public class ChannelAccessFunctionActuatorTest {
*/
@Test
public void testHasNext() throws InterruptedException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, 0, 10, 0.1, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, 0, 10, 0.1, timeout);
int count = 0;
int steps = (int) ((10-0)/0.1)+1;
@@ -227,7 +233,7 @@ public class ChannelAccessFunctionActuatorTest {
for(double[] svalue: settings){
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, svalue[0], svalue[1], svalue[2], timeout);
int count =0;
while(actuator.hasNext()){
@@ -246,10 +252,13 @@ public class ChannelAccessFunctionActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessFunctionActuator#set()}.
* Test actuator move start<end and start>end ...
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testReverse() throws CAException, InterruptedException {
public void testReverse() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
List<double[]> settings = new ArrayList<double[]>();
// start end stepsize
@@ -258,7 +267,7 @@ public class ChannelAccessFunctionActuatorTest {
for(double[] svalue: settings){
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, svalue[0], svalue[1], svalue[2], timeout);
actuator.init();
int count =0;
@@ -328,10 +337,13 @@ public class ChannelAccessFunctionActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessFunctionActuator#set()}.
* Test actuator move start<end and start>end ...
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testReverseReset() throws CAException, InterruptedException {
public void testReverseReset() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
List<double[]> settings = new ArrayList<double[]>();
// start end stepsize
@@ -340,7 +352,7 @@ public class ChannelAccessFunctionActuatorTest {
for(double[] svalue: settings){
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, svalue[0], svalue[1], svalue[2], timeout);
actuator.init();
int count =0;
@@ -417,9 +429,9 @@ public class ChannelAccessFunctionActuatorTest {
* Check whether Exception is thrown if a negative step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessGPFunctionActuatorNegativeStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessGPFunctionActuatorNegativeStepSize() throws SocketException, Exception {
// Need to throw exception because of negative step size
new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function, 0, 1, -0.1, timeout);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function, 0, 1, -0.1, timeout);
}
/**
@@ -427,29 +439,31 @@ public class ChannelAccessFunctionActuatorTest {
* Check whether Exception is thrown if a zero step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessGPFunctionActuatorZeroStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessGPFunctionActuatorZeroStepSize() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function, 0, 1, 0, timeout);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function, 0, 1, 0, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#FunctionActuatorChannelAccess(String, double, double, double)}.
* Check correct initialization
*/
public void testChannelAccessGPFunctionActuator() throws SocketException, CAException, Exception {
public void testChannelAccessGPFunctionActuator() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function, 0, 10, 1, timeout);
new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function, 0, 10, 1, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#set()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneSet() throws CAException, InterruptedException {
public void testDoneSet() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function, 0, 0.09999, 0.1, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function, 0, 0.09999, 0.1, timeout);
// Simulate done channel
doneChannel.setValue(0);
@@ -472,12 +486,14 @@ public class ChannelAccessFunctionActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#set()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneDelay() throws CAException, InterruptedException {
public void testDoneDelay() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, 1.5, function, 0, 1, 0.1, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, 1.5, function, 0, 1, 0.1, timeout);
// Simulate done channel
doneChannel.setValue(1);
@@ -510,12 +526,14 @@ public class ChannelAccessFunctionActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#hasNext()}.
* Check whether the actuator throws an Exception if there is no next point but set() is called
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test(expected=IllegalStateException.class)
public void testDoneSetNoNext() throws CAException, InterruptedException {
public void testDoneSetNoNext() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function,0, 0.09999, 0.1, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function,0, 0.09999, 0.1, timeout);
// Simulate done channel
@@ -558,11 +576,13 @@ public class ChannelAccessFunctionActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#hasNext()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneHasNextOneStep() throws CAException, InterruptedException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function, 0, 0.09999, 0.1, timeout);
public void testDoneHasNextOneStep() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function, 0, 0.09999, 0.1, timeout);
// Simulate done channel
doneChannel.setValue(0);
@@ -592,11 +612,13 @@ public class ChannelAccessFunctionActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#hasNext()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneHasNext() throws CAException, InterruptedException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function,0, 10, 0.1, timeout);
public void testDoneHasNext() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function,0, 10, 0.1, timeout);
int count = 0;
int steps = (int) ((10-0)/0.1)+1;
@@ -633,10 +655,12 @@ public class ChannelAccessFunctionActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#set()}.
* Test actuator move start<end and start>end ...
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneSetLoop() throws CAException, InterruptedException {
public void testDoneSetLoop() throws InterruptedException, ExecutionException, ChannelException {
List<double[]> settings = new ArrayList<double[]>();
// start end stepsize
@@ -645,7 +669,7 @@ public class ChannelAccessFunctionActuatorTest {
for(double[] svalue: settings){
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function, svalue[0], svalue[1], svalue[2], timeout);
int count =0;
while(actuator.hasNext()){
@@ -682,10 +706,13 @@ public class ChannelAccessFunctionActuatorTest {
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPFunctionActuator#set()}.
* Test whether the actuator returns if the actuator is already on the position it should be before the move ...
* (see issue XASEC-278)
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testMoveToActualPosition() throws CAException, InterruptedException {
public void testMoveToActualPosition() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
double start = 0;
double end = 2;
@@ -697,7 +724,7 @@ public class ChannelAccessFunctionActuatorTest {
logger.info("Current channel value: "+channel.getValue());
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, function, start, end, stepSize, timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, function, start, end, stepSize, timeout);
while(actuator.hasNext()){
// Simulate done channel
@@ -740,7 +767,7 @@ public class ChannelAccessFunctionActuatorTest {
for(double[] svalue: settings){
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(channelName, function, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessFunctionActuator<Object> actuator = new ChannelAccessFunctionActuator<Object>(cservice, channelName, function, svalue[0], svalue[1], svalue[2], timeout);
int count =0;
while(actuator.hasNext()){

121
ch.psi.fda/src/test/java/ch/psi/fda/core/actors/ChannelAccessLinearActuatorTest.java
View File

@@ -21,11 +21,12 @@ package ch.psi.fda.core.actors;
import static org.junit.Assert.fail;
import gov.aps.jca.CAException;
import java.net.SocketException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import org.junit.After;
@@ -34,8 +35,11 @@ import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.actors.ChannelAccessLinearActuator;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Test class specific for the LinearActuatorChannelAccess implementation.
@@ -53,16 +57,18 @@ public class ChannelAccessLinearActuatorTest {
private static final double doneDelay = 0;
private static final Long timeout = 1800000l; // 30 minutes
private ChannelBean<Double> channel;
private ChannelBean<Integer> doneChannel;
private Channel<Double> channel;
private Channel<Integer> doneChannel;
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
doneChannel = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, channelNameDone, false);
cservice = new DefaultChannelService();
channel = cservice.createChannel(new ChannelDescriptor<>(Double.class, channelName, false));
doneChannel = cservice.createChannel(new ChannelDescriptor<>(Integer.class, channelNameDone, false));
}
/**
@@ -77,22 +83,22 @@ public class ChannelAccessLinearActuatorTest {
* Check whether Exception is thrown if a negative step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessLinearActuatorNegativeStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessLinearActuatorNegativeStepSize() throws SocketException, Exception {
// Need to throw exception because of negative step size
new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 1, -0.1, timeout);
new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 1, -0.1, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessLinearActuator#LinearActuatorChannelAccess(String, double, double, double)}.
*/
@Test
public void testChannelAccessLinearActuatorTimeout() throws SocketException, CAException, Exception {
public void testChannelAccessLinearActuatorTimeout() throws SocketException, Exception {
// Negative timeout
boolean flag = false;
try{
// Need to return IllegalArgumentException due to negative Timeout
new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 1, 0.1, -1l);
new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 1, 0.1, -1l);
}
catch(IllegalArgumentException e){
flag=true;
@@ -105,7 +111,7 @@ public class ChannelAccessLinearActuatorTest {
flag=false;
try{
// Need to return IllegalArgumentException
new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 1, 0.1, -0l);
new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 1, 0.1, -0l);
}
catch(IllegalArgumentException e){
flag=true;
@@ -115,10 +121,10 @@ public class ChannelAccessLinearActuatorTest {
}
// Accept null timeout
new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 1, 0.1, null);
new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 1, 0.1, null);
// Accept positive timeout
new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 1, 0.1, 1l);
new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 1, 0.1, 1l);
}
@@ -127,18 +133,18 @@ public class ChannelAccessLinearActuatorTest {
* Check whether Exception is thrown if a zero step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessLinearActuatorZeroStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessLinearActuatorZeroStepSize() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 1, 0, timeout);
new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 1, 0, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessLinearActuator#LinearActuatorChannelAccess(String, double, double, double)}.
* Check correct initialization
*/
public void testChannelAccessLinearActuator() throws SocketException, CAException, Exception {
public void testChannelAccessLinearActuator() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 10, 1, timeout);
new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 10, 1, timeout);
}
@@ -148,7 +154,7 @@ public class ChannelAccessLinearActuatorTest {
*/
@Test
public void testSet() throws InterruptedException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 0.09999, 0.1, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 0.09999, 0.1, timeout);
actuator.set();
}
@@ -159,7 +165,7 @@ public class ChannelAccessLinearActuatorTest {
*/
@Test(expected=IllegalStateException.class)
public void testSetNoNext() throws InterruptedException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 0.09999, 0.1, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 0.09999, 0.1, timeout);
actuator.set();
actuator.set();
}
@@ -170,7 +176,7 @@ public class ChannelAccessLinearActuatorTest {
*/
@Test
public void testHasNextOneStep() throws InterruptedException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 0.09999, 0.1, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 0.09999, 0.1, timeout);
// Execute first set (because there is always a first move)
actuator.set();
@@ -187,7 +193,7 @@ public class ChannelAccessLinearActuatorTest {
*/
@Test
public void testHasNext() throws InterruptedException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, 0, 10, 0.1, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, 0, 10, 0.1, timeout);
int count = 0;
int steps = (int) ((10-0)/0.1)+1;
@@ -217,7 +223,7 @@ public class ChannelAccessLinearActuatorTest {
for(double[] svalue: settings){
ChannelAccessLinearActuator<Integer> actuator = new ChannelAccessLinearActuator<Integer>(channelName, null, 1,0, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessLinearActuator<Integer> actuator = new ChannelAccessLinearActuator<Integer>(cservice, channelName, null, 1,0, svalue[0], svalue[1], svalue[2], timeout);
int count =0;
while(actuator.hasNext()){
@@ -236,10 +242,13 @@ public class ChannelAccessLinearActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessLinearActuator#set()}.
* Test actuator move start<end and start>end ...
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testReverse() throws CAException, InterruptedException {
public void testReverse() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
List<double[]> settings = new ArrayList<double[]>();
// start end stepsize
@@ -248,7 +257,7 @@ public class ChannelAccessLinearActuatorTest {
for(double[] svalue: settings){
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, svalue[0], svalue[1], svalue[2], timeout);
actuator.init();
int count =0;
@@ -316,10 +325,13 @@ public class ChannelAccessLinearActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessLinearActuator#set()}.
* Test actuator move start<end and start>end ...
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testReverseReset() throws CAException, InterruptedException {
public void testReverseReset() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
List<double[]> settings = new ArrayList<double[]>();
// start end stepsize
@@ -328,7 +340,7 @@ public class ChannelAccessLinearActuatorTest {
for(double[] svalue: settings){
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, null, 1,0, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, null, 1,0, svalue[0], svalue[1], svalue[2], timeout);
actuator.init();
int count =0;
@@ -403,9 +415,9 @@ public class ChannelAccessLinearActuatorTest {
* Check whether Exception is thrown if a negative step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessGPLinearActuatorNegativeStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessGPLinearActuatorNegativeStepSize() throws SocketException, Exception {
// Need to throw exception because of negative step size
new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, 0, 1, -0.1, timeout);
new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, 0, 1, -0.1, timeout);
}
/**
@@ -413,29 +425,31 @@ public class ChannelAccessLinearActuatorTest {
* Check whether Exception is thrown if a zero step size is specified.
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessGPLinearActuatorZeroStepSize() throws SocketException, CAException, Exception {
public void testChannelAccessGPLinearActuatorZeroStepSize() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, 0, 1, 0, timeout);
new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, 0, 1, 0, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#LinearActuatorChannelAccess(String, double, double, double)}.
* Check correct initialization
*/
public void testChannelAccessGPLinearActuator() throws SocketException, CAException, Exception {
public void testChannelAccessGPLinearActuator() throws SocketException, Exception {
// Zero step size need to cause an exception
new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, 0, 10, 1, timeout);
new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, 0, 10, 1, timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#set()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneSet() throws CAException, InterruptedException {
public void testDoneSet() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, 0, 0.09999, 0.1, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, 0, 0.09999, 0.1, timeout);
// Simulate done channel
doneChannel.setValue(0);
@@ -458,12 +472,14 @@ public class ChannelAccessLinearActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#set()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneDelay() throws CAException, InterruptedException {
public void testDoneDelay() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, 1.5, 0, 1, 0.1, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, 1.5, 0, 1, 0.1, timeout);
// Simulate done channel
doneChannel.setValue(1);
@@ -496,12 +512,14 @@ public class ChannelAccessLinearActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#hasNext()}.
* Check whether the actuator throws an Exception if there is no next point but set() is called
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test(expected=IllegalStateException.class)
public void testDoneSetNoNext() throws CAException, InterruptedException {
public void testDoneSetNoNext() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, 0, 0.09999, 0.1, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, 0, 0.09999, 0.1, timeout);
// Simulate done channel
@@ -544,11 +562,13 @@ public class ChannelAccessLinearActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#hasNext()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneHasNextOneStep() throws CAException, InterruptedException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, 0, 0.09999, 0.1, timeout);
public void testDoneHasNextOneStep() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, 0, 0.09999, 0.1, timeout);
// Simulate done channel
doneChannel.setValue(0);
@@ -578,11 +598,13 @@ public class ChannelAccessLinearActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#hasNext()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneHasNext() throws CAException, InterruptedException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, 0, 10, 0.1, timeout);
public void testDoneHasNext() throws InterruptedException, ExecutionException, ChannelException {
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, 0, 10, 0.1, timeout);
int count = 0;
int steps = (int) ((10-0)/0.1)+1;
@@ -619,10 +641,12 @@ public class ChannelAccessLinearActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#set()}.
* Test actuator move start<end and start>end ...
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneSetLoop() throws CAException, InterruptedException {
public void testDoneSetLoop() throws InterruptedException, ExecutionException, ChannelException {
List<double[]> settings = new ArrayList<double[]>();
// start end stepsize
@@ -631,7 +655,7 @@ public class ChannelAccessLinearActuatorTest {
for(double[] svalue: settings){
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, svalue[0], svalue[1], svalue[2], timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, svalue[0], svalue[1], svalue[2], timeout);
int count =0;
while(actuator.hasNext()){
@@ -668,10 +692,13 @@ public class ChannelAccessLinearActuatorTest {
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessGPLinearActuator#set()}.
* Test whether the actuator returns if the actuator is already on the position it should be before the move ...
* (see issue XASEC-278)
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testMoveToActualPosition() throws CAException, InterruptedException {
public void testMoveToActualPosition() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
double start = 0;
double end = 2;
@@ -683,7 +710,7 @@ public class ChannelAccessLinearActuatorTest {
logger.info("Current channel value: "+channel.getValue());
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, start, end, stepSize, timeout);
ChannelAccessLinearActuator<Object> actuator = new ChannelAccessLinearActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, start, end, stepSize, timeout);
while(actuator.hasNext()){
// Simulate done channel

93
ch.psi.fda/src/test/java/ch/psi/fda/core/actors/ChannelAccessTableActuatorTest.java
View File

@@ -21,18 +21,21 @@ package ch.psi.fda.core.actors;
import static org.junit.Assert.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.actors.ChannelAccessTableActuator;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -50,16 +53,19 @@ public class ChannelAccessTableActuatorTest {
private static final double doneDelay = 0;
private static final Long timeout = 1800000l; // 30 minutes
private ChannelBean<Double> channel;
private ChannelBean<Integer> doneChannel;
private Channel<Double> channel;
private Channel<Integer> doneChannel;
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
doneChannel = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, channelNameDone, false);
cservice = new DefaultChannelService();
channel = cservice.createChannel(new ChannelDescriptor<>(Double.class, channelName, false));
doneChannel = cservice.createChannel(new ChannelDescriptor<>(Integer.class, channelNameDone, false));
}
/**
@@ -74,7 +80,7 @@ public class ChannelAccessTableActuatorTest {
*/
@Test
public void testChannelAccessTableActuator() {
new ChannelAccessTableActuator<Object>(channelName, new double[]{1}, timeout);
new ChannelAccessTableActuator<Object>(cservice, channelName, new double[]{1}, timeout);
}
/**
@@ -86,7 +92,7 @@ public class ChannelAccessTableActuatorTest {
boolean flag = false;
try{
// Need to return IllegalArgumentException due to negative Timeout
new ChannelAccessTableActuator<Object>(channelName, new double[]{1}, -1l);
new ChannelAccessTableActuator<Object>(cservice, channelName, new double[]{1}, -1l);
}
catch(IllegalArgumentException e){
flag=true;
@@ -99,7 +105,7 @@ public class ChannelAccessTableActuatorTest {
flag=false;
try{
// Need to return IllegalArgumentException
new ChannelAccessTableActuator<Object>(channelName, new double[]{1}, 0l);
new ChannelAccessTableActuator<Object>(cservice, channelName, new double[]{1}, 0l);
}
catch(IllegalArgumentException e){
flag=true;
@@ -109,10 +115,10 @@ public class ChannelAccessTableActuatorTest {
}
// Accept null timeout
new ChannelAccessTableActuator<Object>(channelName, new double[]{1}, null);
new ChannelAccessTableActuator<Object>(cservice, channelName, new double[]{1}, null);
// Accept positive timeout
new ChannelAccessTableActuator<Object>(channelName, new double[]{1}, 1l);
new ChannelAccessTableActuator<Object>(cservice, channelName, new double[]{1}, 1l);
}
@@ -122,7 +128,7 @@ public class ChannelAccessTableActuatorTest {
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessTableActuatorNull() {
new ChannelAccessTableActuator<Object>(channelName, null, timeout);
new ChannelAccessTableActuator<Object>(cservice, channelName, null, timeout);
}
/**
@@ -131,17 +137,20 @@ public class ChannelAccessTableActuatorTest {
*/
@Test(expected=IllegalArgumentException.class)
public void testChannelAccessTableActuatorEmptyTable() {
new ChannelAccessTableActuator<Object>(channelName, new double[0], timeout);
new ChannelAccessTableActuator<Object>(cservice, channelName, new double[0], timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessTableActuator#set()}.
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testSet() throws CAException, InterruptedException {
public void testSet() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
double[] table = new double[]{1,2,3,4,5,6};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, table, timeout);
int count=0;
while(actor.hasNext()){
@@ -166,7 +175,7 @@ public class ChannelAccessTableActuatorTest {
@Test(expected=RuntimeException.class)
public void testSetFail() throws InterruptedException {
double[] table = new double[]{1};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, table, timeout);
actor.set();
// This set() call has to fail with an RuntimeException
@@ -181,7 +190,7 @@ public class ChannelAccessTableActuatorTest {
public void testHasNext() throws InterruptedException {
double[] table = new double[]{1};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, table, timeout);
actor.set();
boolean next = actor.hasNext();
@@ -192,12 +201,15 @@ public class ChannelAccessTableActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessTableActuator#set()}.
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testReverse() throws CAException, InterruptedException {
public void testReverse() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
double[] table = new double[]{1,2,3,4,5,6};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, table, timeout);
actor.init();
int count=0;
@@ -237,12 +249,15 @@ public class ChannelAccessTableActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessTableActuator#set()}.
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testReverseReset() throws CAException, InterruptedException {
public void testReverseReset() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
double[] table = new double[]{1,2,3,4,5,6};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, table, timeout);
actor.init();
int count=0;
@@ -287,7 +302,7 @@ public class ChannelAccessTableActuatorTest {
*/
@Test
public void testDoneChannelAccessTableActuator() {
new ChannelAccessTableActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, new double[]{1}, timeout);
new ChannelAccessTableActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, new double[]{1}, timeout);
}
/**
@@ -296,7 +311,7 @@ public class ChannelAccessTableActuatorTest {
*/
@Test(expected=IllegalArgumentException.class)
public void testDoneChannelAccessTableActuatorNull() {
new ChannelAccessTableActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, null, timeout);
new ChannelAccessTableActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, null, timeout);
}
/**
@@ -305,17 +320,20 @@ public class ChannelAccessTableActuatorTest {
*/
@Test(expected=IllegalArgumentException.class)
public void testDoneChannelAccessTableActuatorEmptyTable() {
new ChannelAccessTableActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, new double[0], timeout);
new ChannelAccessTableActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, new double[0], timeout);
}
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessTableActuator#set()}.
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testDoneSet() throws CAException, InterruptedException {
public void testDoneSet() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
double[] table = new double[]{1,2,3,4,5,6};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, table, timeout);
int count=0;
while(actor.hasNext()){
@@ -349,12 +367,15 @@ public class ChannelAccessTableActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessTableActuator#set()}.
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testDoneDelay() throws CAException, InterruptedException {
public void testDoneDelay() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
double[] table = new double[]{1,2,3,4,5,6};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, channelNameDone, doneValue, 0.1, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, channelNameDone, doneValue, 0.1, table, timeout);
int count=0;
long start = System.currentTimeMillis();
@@ -398,12 +419,14 @@ public class ChannelAccessTableActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessTableActuator#set()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test(expected=RuntimeException.class)
public void testDoneSetFail() throws CAException, InterruptedException {
public void testDoneSetFail() throws InterruptedException, ExecutionException, ChannelException {
double[] table = new double[]{1};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, table, timeout);
// Simulate done channel
doneChannel.setValue(0);
new Thread(new Runnable() {
@@ -442,13 +465,15 @@ public class ChannelAccessTableActuatorTest {
/**
* Test method for {@link ch.psi.fda.core.actors.ChannelAccessTableActuator#hasNext()}.
* @throws ChannelException
* @throws ExecutionException
* @throws CAException
*/
@Test
public void testDoneHasNext() throws CAException, InterruptedException {
public void testDoneHasNext() throws InterruptedException, ExecutionException, ChannelException {
double[] table = new double[]{1};
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(channelName, channelNameDone, doneValue, doneDelay, table, timeout);
ChannelAccessTableActuator<Object> actor = new ChannelAccessTableActuator<Object>(cservice, channelName, channelNameDone, doneValue, doneDelay, table, timeout);
// Simulate done channel
doneChannel.setValue(0);

10
ch.psi.fda/src/test/java/ch/psi/fda/core/actors/ComplexActorTest.java
View File

@@ -31,6 +31,8 @@ import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.actors.ChannelAccessLinearActuator;
import ch.psi.fda.core.actors.ComplexActuator;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Prerequisites for this test are:
@@ -45,12 +47,14 @@ public class ComplexActorTest {
private static Logger logger = Logger.getLogger(ComplexActorTest.class.getName());
private static final Long timeout = 1800000l;
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -69,9 +73,9 @@ public class ComplexActorTest {
ComplexActuator actuator = new ComplexActuator();
actuator.getActors().add(new ChannelAccessLinearActuator<Object>(TestChannels.ANALOG_OUT, null, 1,0, 0, 0.09999, 0.1, timeout));
actuator.getActors().add(new ChannelAccessLinearActuator<Object>(TestChannels.ANALOG_OUT, null, 1,0, 1, 2, 0.1, timeout));
actuator.getActors().add(new ChannelAccessLinearActuator<Object>(TestChannels.ANALOG_OUT, null, 1,0, -1, -2, 0.1, timeout));
actuator.getActors().add(new ChannelAccessLinearActuator<Object>(cservice, TestChannels.ANALOG_OUT, null, 1,0, 0, 0.09999, 0.1, timeout));
actuator.getActors().add(new ChannelAccessLinearActuator<Object>(cservice, TestChannels.ANALOG_OUT, null, 1,0, 1, 2, 0.1, timeout));
actuator.getActors().add(new ChannelAccessLinearActuator<Object>(cservice, TestChannels.ANALOG_OUT, null, 1,0, -1, -2, 0.1, timeout));
// Initialize actuator
actuator.init();

22
ch.psi.fda/src/test/java/ch/psi/fda/core/guard/ChannelAccessGuardTest.java
View File

@@ -21,10 +21,10 @@ package ch.psi.fda.core.guard;
import static org.junit.Assert.*;
import gov.aps.jca.CAException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import org.junit.After;
import org.junit.Before;
@@ -34,8 +34,11 @@ import ch.psi.fda.TestChannels;
import ch.psi.fda.core.Guard;
import ch.psi.fda.core.guard.ChannelAccessGuard;
import ch.psi.fda.core.guard.ChannelAccessGuardCondition;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -43,11 +46,13 @@ import ch.psi.jcae.ChannelBeanFactory;
*/
public class ChannelAccessGuardTest {
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -60,17 +65,20 @@ public class ChannelAccessGuardTest {
/**
* Test method for {@link ch.psi.fda.core.guard.ChannelAccessGuard#check()}.
* @throws InterruptedException
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testCheck() throws InterruptedException, CAException {
public void testCheck() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
String guardChannel = TestChannels.ANALOG_OUT;
Integer channelOkValue = 10;
List<ChannelAccessGuardCondition> conditions = new ArrayList<ChannelAccessGuardCondition>();
conditions.add(new ChannelAccessGuardCondition(guardChannel, channelOkValue));
conditions.add(new ChannelAccessGuardCondition(cservice, guardChannel, channelOkValue));
Guard guard = new ChannelAccessGuard(conditions );
ChannelBean<Integer> b = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, guardChannel, false);
Channel<Integer> b = cservice.createChannel(new ChannelDescriptor<>(Integer.class, guardChannel, false));
b.setValue(channelOkValue);
guard.init();

51
ch.psi.fda/src/test/java/ch/psi/fda/core/loops/ActorSensorLoopTest.java
View File

@@ -21,12 +21,12 @@ package ch.psi.fda.core.loops;
import static org.junit.Assert.*;
import gov.aps.jca.CAException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -48,8 +48,11 @@ import ch.psi.fda.core.messages.Message;
import ch.psi.fda.core.sensors.ChannelAccessDoubleArraySensor;
import ch.psi.fda.core.sensors.ChannelAccessDoubleSensor;
import ch.psi.fda.core.sensors.ChannelAccessStringSensor;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -66,20 +69,21 @@ public class ActorSensorLoopTest {
private static final Long timeout = 1800000l; // 30 minutes
private ActorSensorLoop loopOne;
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
loopOne = new ActorSensorLoop();
ChannelAccessLinearActuator<Object> a = new ChannelAccessLinearActuator<Object>(aoChannel, null, 1,0, 0, 10, 0.1, timeout); // Positioner
ChannelAccessDoubleSensor s = new ChannelAccessDoubleSensor("id0", boChannel); // Positioner Readback
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor("id1", aoChannel); // Scalar Detector
ChannelAccessStringSensor s1string = new ChannelAccessStringSensor("id3", boChannel+".NAME"); // Scalar String Detector
ChannelAccessDoubleArraySensor s2 = new ChannelAccessDoubleArraySensor("id2", wfChannel, 10);
ChannelAccessLinearActuator<Object> a = new ChannelAccessLinearActuator<Object>(cservice, aoChannel, null, 1,0, 0, 10, 0.1, timeout); // Positioner
ChannelAccessDoubleSensor s = new ChannelAccessDoubleSensor(cservice, "id0", boChannel); // Positioner Readback
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor(cservice, "id1", aoChannel); // Scalar Detector
ChannelAccessStringSensor s1string = new ChannelAccessStringSensor(cservice, "id3", boChannel+".NAME"); // Scalar String Detector
ChannelAccessDoubleArraySensor s2 = new ChannelAccessDoubleArraySensor(cservice, "id2", wfChannel, 10);
loopOne.getActors().add(a);
loopOne.getSensors().add(s);
@@ -140,8 +144,8 @@ public class ActorSensorLoopTest {
ActorSensorLoop loop = new ActorSensorLoop();
int numberOfSensors = 2;
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor("id0", boChannel); // Positioner Readback
ChannelAccessDoubleSensor s2 = new ChannelAccessDoubleSensor("id1", aoChannel); // Scalar Detector
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor(cservice, "id0", boChannel); // Positioner Readback
ChannelAccessDoubleSensor s2 = new ChannelAccessDoubleSensor(cservice, "id1", aoChannel); // Scalar Detector
loop.getSensors().add(s1);
loop.getSensors().add(s2);
@@ -167,18 +171,21 @@ public class ActorSensorLoopTest {
/**
* Test method for {@link ch.psi.fda.core.loops.ActorSensorLoop#execute()}.
* @throws InterruptedException
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testExecuteGuard() throws InterruptedException, CAException {
public void testExecuteGuard() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
ActorSensorLoop loop = new ActorSensorLoop();
ChannelAccessLinearActuator<Object> a = new ChannelAccessLinearActuator<Object>(aoChannel, null, 1,0, 0, 1.5, 0.1,timeout); // Positioner
ChannelAccessLinearActuator<Object> a = new ChannelAccessLinearActuator<Object>(cservice, aoChannel, null, 1,0, 0, 1.5, 0.1,timeout); // Positioner
ChannelAccessDoubleSensor s = new ChannelAccessDoubleSensor("id0", aoChannel); // Positioner Readback
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor("id1", boChannel); // Scalar Detector
ChannelAccessDoubleArraySensor s2 = new ChannelAccessDoubleArraySensor("id2", wfChannel, 10);
ChannelAccessDoubleSensor s = new ChannelAccessDoubleSensor(cservice, "id0", aoChannel); // Positioner Readback
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor(cservice, "id1", boChannel); // Scalar Detector
ChannelAccessDoubleArraySensor s2 = new ChannelAccessDoubleArraySensor(cservice, "id2", wfChannel, 10);
loop.getActors().add(a);
loop.getPostActorActions().add(new Delay(500));
@@ -189,11 +196,11 @@ public class ActorSensorLoopTest {
// Guard
final Integer okValue = 0;
List<ChannelAccessGuardCondition> conditions = new ArrayList<ChannelAccessGuardCondition>();
conditions.add(new ChannelAccessGuardCondition(boChannel, new Integer(0)));
conditions.add(new ChannelAccessGuardCondition(cservice, boChannel, new Integer(0)));
Guard guard = new ChannelAccessGuard(conditions);
loop.setGuard(guard);
final ChannelBean<Integer> b = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, boChannel, false);
final Channel<Integer> b = cservice.createChannel(new ChannelDescriptor<>(Integer.class, boChannel, false));
Thread tguard = new Thread(new Runnable() {
@@ -253,16 +260,16 @@ public class ActorSensorLoopTest {
@Test
public void testParallelSet() throws InterruptedException, CAException {
public void testParallelSet() throws InterruptedException {
final int steps = 2;
final HashMap<String,Long> timestamps = new HashMap<String, Long>();
ActorSensorLoop loop = new ActorSensorLoop();
ChannelAccessLinearActuator<Object> a = new ChannelAccessLinearActuator<Object>(aoChannel, null, 1,0, 0, (steps*0.1), 0.1, timeout); // Positioner
ChannelAccessLinearActuator<Object> a = new ChannelAccessLinearActuator<Object>(cservice, aoChannel, null, 1,0, 0, (steps*0.1), 0.1, timeout); // Positioner
ChannelAccessDoubleSensor s = new ChannelAccessDoubleSensor("id0", aoChannel); // Positioner Readback
ChannelAccessDoubleSensor s = new ChannelAccessDoubleSensor(cservice, "id0", aoChannel); // Positioner Readback
loop.getActors().add(a);
loop.getActors().add(new Actor() {

36
ch.psi.fda/src/test/java/ch/psi/fda/core/loops/OTFLoopTest.java
View File

@@ -21,9 +21,9 @@ package ch.psi.fda.core.loops;
import static org.junit.Assert.*;
import gov.aps.jca.CAException;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -42,8 +42,11 @@ import ch.psi.fda.core.sensors.MillisecondTimestampSensor;
import ch.psi.fda.core.sensors.OTFNamedChannelSensor;
import ch.psi.fda.core.sensors.OTFReadbackSensor;
import ch.psi.fda.core.sensors.OTFScalerChannelSensor;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -88,15 +91,17 @@ public class OTFLoopTest {
private OTFLoop loopZigZag;
private OTFLoop loop;
private ChannelBean<Integer> statusChannel;
private Channel<Integer> statusChannel;
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
statusChannel = ChannelBeanFactory.getFactory().createChannelBean(Integer.class, configuration.getOtfPrefix()+":USTAT", false);
statusChannel = cservice.createChannel(new ChannelDescriptor<>(Integer.class, configuration.getOtfPrefix()+":USTAT", false));
OTFActuator actor = new OTFActuator("id", configuration.getMotor1(), null, 0, 8, 0.5, 0.5, 0);
OTFReadbackSensor s1 = new OTFReadbackSensor("id0");
@@ -107,7 +112,7 @@ public class OTFLoopTest {
// ZigZag loop
loopZigZag = new OTFLoop(configuration.getOtfPrefix(), configuration.getServer(), configuration.getShare(), configuration.getSmbShare(), true);
loopZigZag = new OTFLoop(cservice, configuration.getOtfPrefix(), configuration.getServer(), configuration.getShare(), configuration.getSmbShare(), true);
loopZigZag.setActor(actor);
loopZigZag.getSensors().add(s1);
loopZigZag.getSensors().add(s2);
@@ -117,7 +122,7 @@ public class OTFLoopTest {
// Normal loop
loop = new OTFLoop(configuration.getOtfPrefix(), configuration.getServer(), configuration.getShare(), configuration.getSmbShare(), false);
loop = new OTFLoop(cservice, configuration.getOtfPrefix(), configuration.getServer(), configuration.getShare(), configuration.getSmbShare(), false);
loop.setActor(actor);
loop.getSensors().add(s1);
loop.getSensors().add(s2);
@@ -136,10 +141,13 @@ public class OTFLoopTest {
/**
* Test method for {@link ch.psi.fda.core.loops.OTFLoop#execute()}.
* Test ordinary 1D OTF scan
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testExecute() throws CAException, InterruptedException {
public void testExecute() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
Thread t = new Thread(new TestCollector(loop.getDataQueue().getQueue()));
t.start();
@@ -158,10 +166,13 @@ public class OTFLoopTest {
/**
* Test method for {@link ch.psi.fda.core.loops.OTFLoop#execute()}.
* Test OTF ZigZag mode
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testExecuteZigZag() throws CAException, InterruptedException {
public void testExecuteZigZag() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
Thread t = new Thread(new TestCollector(loopZigZag.getDataQueue().getQueue()));
t.start();
@@ -181,10 +192,13 @@ public class OTFLoopTest {
/**
* Test method for {@link ch.psi.fda.core.loops.OTFLoop#execute()}.
* Test abort functionality while executing an OTF scan
* @throws ExecutionException
* @throws ChannelException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testExecuteAbort() throws CAException, InterruptedException {
public void testExecuteAbort() throws InterruptedException, TimeoutException, ChannelException, ExecutionException {
// Data collector thread
Thread t = new Thread(new TestCollector(loop.getDataQueue().getQueue()));

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

@@ -20,16 +20,17 @@
package ch.psi.fda.core.loops.cr;
import gov.aps.jca.CAException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import ch.psi.fda.TestConfiguration;
@@ -41,7 +42,9 @@ import ch.psi.fda.core.sensors.ChannelAccessDoubleSensor;
import ch.psi.fda.core.sensors.MillisecondTimestampSensor;
import ch.psi.fda.core.sensors.OTFNamedChannelSensor;
import ch.psi.fda.core.sensors.OTFScalerChannelSensor;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -51,12 +54,13 @@ public class ParallelCrlogicTest {
// Get Logger
private static final Logger logger = Logger.getLogger(ParallelCrlogicTest.class.getName());
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -68,7 +72,7 @@ public class ParallelCrlogicTest {
// @Ignore
@Test(timeout=60000)
public void testExecute() throws InterruptedException, CAException{
public void testExecute() throws InterruptedException, ChannelException, TimeoutException, ExecutionException{
TestConfiguration c = TestConfiguration.getInstance();
@@ -82,18 +86,18 @@ public class ParallelCrlogicTest {
double additionalBacklash = 0;
List<Sensor> sensors = new ArrayList<Sensor>();
ChannelAccessDoubleSensor s2 = new ChannelAccessDoubleSensor("mot1", c.getMotor1()+".RVAL");
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor("mot2", c.getMotor1()+".RBV");
ChannelAccessDoubleSensor s3 = new ChannelAccessDoubleSensor("mot2", "ARIDI-PCT:CURRENT");
ChannelAccessDoubleSensor s2 = new ChannelAccessDoubleSensor(cservice, "mot1", c.getMotor1()+".RVAL");
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor(cservice, "mot2", c.getMotor1()+".RBV");
ChannelAccessDoubleSensor s3 = new ChannelAccessDoubleSensor(cservice, "mot2", "ARIDI-PCT:CURRENT");
sensors.add(s1);
sensors.add(s2);
sensors.add(s3);
ScrlogicLoop scrlogic = new ScrlogicLoop(sensors);
ScrlogicLoop scrlogic = new ScrlogicLoop(cservice, sensors);
CrlogicLoop crlogic = new CrlogicLoop(c.getCrlogicPrefix(), c.getServer(), c.getShare(), c.getSmbShare(), zigZag);
CrlogicLoop crlogic = new CrlogicLoop(cservice, c.getCrlogicPrefix(), c.getServer(), c.getShare(), c.getSmbShare(), zigZag);
crlogic.setActor(new OTFActuator("cmot", c.getMotor1(), readback, start, end, stepSize, integrationTime, additionalBacklash));
crlogic.getSensors().add(new OTFNamedChannelSensor("trigger", "TRIGGER0"));
crlogic.getSensors().add(new OTFScalerChannelSensor("scaler0", 0));
@@ -103,13 +107,16 @@ public class ParallelCrlogicTest {
// Initialize scaler template
VSC16ScalerChannelsTemplate scalertemplate = new VSC16ScalerChannelsTemplate();
ChannelBeanFactory.getFactory().createChannelBeans(scalertemplate, c.getPrefixScaler());
Map<String,String> ma = new HashMap<>();
ma.put("PREFIX", c.getPrefixScaler());
System.out.println(c.getPrefixScaler());
cservice.createAnnotatedChannels(scalertemplate, ma);
ParallelCrlogic pcrlogic = new ParallelCrlogic(crlogic, scrlogic);
logger.info("Start scaler");
scalertemplate.getCommand().setValueNoWait(VSC16ScalerChannelsTemplate.Command.Count.ordinal());
scalertemplate.getCommand().setValueAsync(VSC16ScalerChannelsTemplate.Command.Count.ordinal());
pcrlogic.prepare();
pcrlogic.execute();
@@ -127,7 +134,7 @@ public class ParallelCrlogicTest {
}
// Destroy scaler template
ChannelBeanFactory.getFactory().destroyChannelBeans(scalertemplate);
cservice.destroyAnnotatedChannels(scalertemplate);
pcrlogic.destroy();

20
ch.psi.fda/src/test/java/ch/psi/fda/core/loops/cr/ScrlogicLoopTest.java
View File

@@ -19,8 +19,6 @@
package ch.psi.fda.core.loops.cr;
import gov.aps.jca.CAException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
@@ -34,8 +32,10 @@ import ch.psi.fda.core.Sensor;
import ch.psi.fda.core.messages.EndOfStreamMessage;
import ch.psi.fda.core.messages.Message;
import ch.psi.fda.core.sensors.ChannelAccessDoubleSensor;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -43,11 +43,13 @@ import ch.psi.jcae.ChannelBeanFactory;
*/
public class ScrlogicLoopTest {
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -63,20 +65,20 @@ public class ScrlogicLoopTest {
* @throws CAException
*/
@Test
public void testExecute() throws InterruptedException, CAException {
public void testExecute() throws InterruptedException {
System.out.println("For this test the motor MTEST-HW3:MOT1 need to be moved manually");
List<Sensor> sensors = new ArrayList<Sensor>();
ChannelAccessDoubleSensor s2 = new ChannelAccessDoubleSensor("mot1", "MTEST-HW3:MOT1.RBV");
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor("mot2", "MTEST-HW3:MOT1");
ChannelAccessDoubleSensor s2 = new ChannelAccessDoubleSensor(cservice, "mot1", "MTEST-HW3:MOT1.RBV");
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor(cservice, "mot2", "MTEST-HW3:MOT1");
sensors.add(s1);
sensors.add(s2);
final ScrlogicLoop logic = new ScrlogicLoop(sensors);
final ScrlogicLoop logic = new ScrlogicLoop(cservice, sensors);
for(int i=0;i<2;i++){
@@ -104,7 +106,7 @@ public class ScrlogicLoopTest {
@Override
public void run() {
try{
ChannelBean<Double> channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, "MTEST-HW3:MOT1", false);
Channel<Double> channel = cservice.createChannel(new ChannelDescriptor<>(Double.class, "MTEST-HW3:MOT1", false));
// Wait some time until
Thread.sleep(100);
channel.setValue(1.5);

39
ch.psi.fda/src/test/java/ch/psi/fda/core/manipulator/ManipulatorTest.java
View File

@@ -20,12 +20,13 @@
package ch.psi.fda.core.manipulator;
import static org.junit.Assert.*;
import gov.aps.jca.CAException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import org.junit.After;
@@ -46,8 +47,11 @@ import ch.psi.fda.core.messages.Message;
import ch.psi.fda.core.scripting.JythonParameterMapping;
import ch.psi.fda.core.scripting.JythonParameterMappingChannel;
import ch.psi.fda.core.scripting.JythonParameterMappingID;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.ChannelService;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* @author ebner
@@ -58,12 +62,14 @@ public class ManipulatorTest {
// Get Logger
private static Logger logger = Logger.getLogger(ManipulatorTest.class.getName());
private ChannelService cservice;
/**
* @throws java.lang.Exception
*/
@Before
public void setUp() throws Exception {
cservice = new DefaultChannelService();
}
/**
@@ -85,7 +91,7 @@ public class ManipulatorTest {
String script = "import math\ndef process(o):\n return math.cos(10.0) + math.sin(o)";
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
// This constructor need to throw an IllegalArgumentException as there is no component
// id "myid" which is expected in the mapping
@@ -110,7 +116,7 @@ public class ManipulatorTest {
String script = "import math\ndef process():\n return 0.0";
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);
@@ -135,7 +141,7 @@ public class ManipulatorTest {
String script = "import math\ndef process():\n return 0.0";
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);
@@ -163,7 +169,7 @@ public class ManipulatorTest {
String script = "import math\ndef process(o ,c):\n return math.cos(c) + math.sin(o)";
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);
@@ -190,7 +196,7 @@ public class ManipulatorTest {
String script = "import math\ndef process(o):\n return math.cos(10.0) + math.sin(o)";
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);
@@ -256,7 +262,7 @@ public class ManipulatorTest {
String script = "import math\ndef process(o):\n return 1";
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);
@@ -335,7 +341,7 @@ public class ManipulatorTest {
String script = "import math\ndef process(o):\n return math.cos(10.0) + math.sin(o)";
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);
@@ -401,7 +407,7 @@ public class ManipulatorTest {
List<JythonParameterMapping> mapping = new ArrayList<JythonParameterMapping>();
mapping.add(new JythonParameterMappingID("o", "myid"));
mapping.add(new JythonParameterMappingID("c", "myid2"));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);
@@ -459,13 +465,16 @@ public class ManipulatorTest {
* Test method for {@link ch.psi.fda.core.manipulator.Manipulator#run()}.
* @throws InterruptedException
* @throws CAException
* @throws TimeoutException
* @throws ChannelException
* @throws ExecutionException
*/
@Test
public void testRunMultipleParameterAndChannel() throws InterruptedException, CAException {
public void testRunMultipleParameterAndChannel() throws InterruptedException, ChannelException, TimeoutException, ExecutionException {
Double setValue = 12.22;
ChannelBean<Double> cbean = ChannelBeanFactory.getFactory().createChannelBean(Double.class, TestChannels.ANALOG_OUT, false);
Channel<Double> cbean = new DefaultChannelService().createChannel(new ChannelDescriptor<Double>(Double.class, TestChannels.ANALOG_OUT, false));
DataMessageMetadata dmm = new DataMessageMetadata();
dmm.getComponents().add(new ComponentMetadata("myid"));
@@ -484,7 +493,7 @@ public class ManipulatorTest {
mapping.add(new JythonParameterMappingID("o", "myid"));
mapping.add(new JythonParameterMappingID("c", "myid2"));
mapping.add(new JythonParameterMappingChannel("d", TestChannels.ANALOG_OUT, Double.class));
JythonManipulation manipulation = new JythonManipulation(id, script, mapping);
JythonManipulation manipulation = new JythonManipulation(cservice, id, script, mapping);
List<Manipulation> manipulations = new ArrayList<Manipulation>();
manipulations.add(manipulation);

17
ch.psi.fda/src/test/java/ch/psi/fda/core/sensors/ChannelAccessDoubleArraySensorTest.java
View File

@@ -21,6 +21,8 @@ package ch.psi.fda.core.sensors;
import static org.junit.Assert.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
@@ -31,8 +33,10 @@ import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.sensors.ChannelAccessDoubleArraySensor;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Test class for the ScalarDoubleSensorChannelAccess class.
@@ -64,11 +68,14 @@ public class ChannelAccessDoubleArraySensorTest {
/**
* Test method for {@link ch.psi.fda.core.sensors.ChannelAccessDoubleSensor#read()}.
* @throws CAException
* @throws TimeoutException
* @throws ChannelException
* @throws ExecutionException
*/
@Test
public void testRead() throws CAException, InterruptedException {
ChannelAccessDoubleArraySensor sensor = new ChannelAccessDoubleArraySensor("id0", channelName, numberOfPoints);
ChannelBean<double[]> channel = ChannelBeanFactory.getFactory().createChannelBean(double[].class, channelName, false);
public void testRead() throws InterruptedException, ChannelException, TimeoutException, ExecutionException {
ChannelAccessDoubleArraySensor sensor = new ChannelAccessDoubleArraySensor(new DefaultChannelService(), "id0", channelName, numberOfPoints);
Channel<double[]> channel = new DefaultChannelService().createChannel(new ChannelDescriptor<double[]>(double[].class, channelName, false));
// Prepare sensor channel
double[] setValue = new double[] { 0.1,0.2,0.3,4,5,6,77,88,99,10.2};

17
ch.psi.fda/src/test/java/ch/psi/fda/core/sensors/ChannelAccessDoubleSensorTest.java
View File

@@ -21,6 +21,8 @@ package ch.psi.fda.core.sensors;
import static org.junit.Assert.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
@@ -31,8 +33,10 @@ import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.fda.core.sensors.ChannelAccessDoubleSensor;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Test class for the ScalarDoubleSensorChannelAccess class.
@@ -62,12 +66,15 @@ public class ChannelAccessDoubleSensorTest {
/**
* Test method for {@link ch.psi.fda.core.sensors.ChannelAccessDoubleSensor#read()}.
* @throws ChannelException
* @throws ExecutionException
* @throws TimeoutException
* @throws CAException
*/
@Test
public void testRead() throws CAException, InterruptedException {
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor("id0", channelName);
ChannelBean<Double> channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
public void testRead() throws InterruptedException, ExecutionException, ChannelException, TimeoutException {
ChannelAccessDoubleSensor sensor = new ChannelAccessDoubleSensor(new DefaultChannelService(), "id0", channelName);
Channel<Double> channel = new DefaultChannelService().createChannel(new ChannelDescriptor<Double>(Double.class, channelName, false));
// Prepare sensor channel
Double setValue = 0.1d;

3
ch.psi.fda/src/test/java/ch/psi/fda/core/sensors/ChannelAccessStringSensorTest.java
View File

@@ -30,6 +30,7 @@ import org.junit.Before;
import org.junit.Test;
import ch.psi.fda.TestChannels;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Test class for the ScalarDoubleSensorChannelAccess class.
@@ -64,7 +65,7 @@ public class ChannelAccessStringSensorTest {
*/
@Test
public void testRead() throws CAException, InterruptedException {
ChannelAccessStringSensor sensor = new ChannelAccessStringSensor("id0", channelName);
ChannelAccessStringSensor sensor = new ChannelAccessStringSensor(new DefaultChannelService(), "id0", channelName);
// Get sensor readout value
String value = (String) sensor.read();

17
ch.psi.fda/src/test/java/ch/psi/fda/core/sensors/ComplexSensorTest.java
View File

@@ -22,6 +22,8 @@ package ch.psi.fda.core.sensors;
import static org.junit.Assert.*;
import java.util.HashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
import gov.aps.jca.CAException;
@@ -34,8 +36,10 @@ import ch.psi.fda.TestChannels;
import ch.psi.fda.core.Action;
import ch.psi.fda.core.sensors.ChannelAccessDoubleSensor;
import ch.psi.fda.core.sensors.ComplexSensor;
import ch.psi.jcae.ChannelBean;
import ch.psi.jcae.ChannelBeanFactory;
import ch.psi.jcae.Channel;
import ch.psi.jcae.ChannelDescriptor;
import ch.psi.jcae.ChannelException;
import ch.psi.jcae.impl.DefaultChannelService;
/**
* Test class for the ScalarDoubleSensorChannelAccess class.
@@ -66,13 +70,16 @@ public class ComplexSensorTest {
/**
* Test method for {@link ch.psi.fda.core.sensors.ChannelAccessDoubleSensor#read()}.
* @throws CAException
* @throws TimeoutException
* @throws ChannelException
* @throws ExecutionException
*/
@Test
public void testRead() throws CAException, InterruptedException {
public void testRead() throws CAException, InterruptedException, ChannelException, TimeoutException, ExecutionException {
final HashMap<String, Long> timestamps = new HashMap<String,Long>();
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor("id0", channelName);
ChannelAccessDoubleSensor s1 = new ChannelAccessDoubleSensor(new DefaultChannelService(), "id0", channelName);
ComplexSensor sensor = new ComplexSensor("id2", s1);
// Add pre action
@@ -112,7 +119,7 @@ public class ComplexSensorTest {
});
// Create channel bean for test sensor channel
ChannelBean<Double> channel = ChannelBeanFactory.getFactory().createChannelBean(Double.class, channelName, false);
Channel<Double> channel = new DefaultChannelService().createChannel(new ChannelDescriptor<Double>(Double.class, channelName, false));
// Prepare sensor channel
Double setValue = 0.1d;