NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
darksnake 2017-05-16 16:55:26 +03:00
commit cdf4ee3018
30 changed files with 644 additions and 595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-control/cryotemp/build.gradle
View File

@ -10,7 +10,7 @@ if (!hasProperty('mainClass')) {
}
mainClassName = mainClass
version = "0.1.2";
version = "0.2.0";
//mainClassName = "inr.numass.readvac.Main"

50
numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java
View File

@ -17,8 +17,6 @@ package inr.numass.cryotemp;
import hep.dataforge.context.Context;
import hep.dataforge.control.collectors.RegularPointCollector;
import hep.dataforge.control.connections.Connection;
import hep.dataforge.control.connections.LoaderConnection;
import hep.dataforge.control.connections.Roles;
import hep.dataforge.control.connections.StorageConnection;
import hep.dataforge.control.devices.PortSensor;
@ -36,10 +34,10 @@ import hep.dataforge.storage.api.PointLoader;
import hep.dataforge.storage.api.Storage;
import hep.dataforge.storage.commons.LoaderFactory;
import hep.dataforge.tables.DataPoint;
import hep.dataforge.tables.PointListener;
import hep.dataforge.tables.TableFormat;
import hep.dataforge.tables.TableFormatBuilder;
import hep.dataforge.utils.DateTimeUtils;
import inr.numass.control.StorageHelper;
import java.time.Duration;
import java.util.Collection;
@ -52,7 +50,6 @@ import java.util.Map;
* @author Alexander Nozik
*/
@RoleDef(name = Roles.STORAGE_ROLE)
@RoleDef(name = Roles.POINT_LISTENER_ROLE)
@RoleDef(name = Roles.VIEW_ROLE, objectType = PKT8View.class)
@ValueDef(name = "port", def = "virtual", info = "The name of the port for this PKT8")
public class PKT8Device extends PortSensor<PKT8Result> {
@ -67,6 +64,7 @@ public class PKT8Device extends PortSensor<PKT8Result> {
*/
private final Map<String, PKT8Channel> channels = new HashMap<>();
private RegularPointCollector collector;
private StorageHelper storageHelper;
/**
* Cached values
@ -82,6 +80,18 @@ public class PKT8Device extends PortSensor<PKT8Result> {
setMetaBase(meta);
}
private PointLoader buildLoader(StorageConnection connection) {
Storage storage = connection.getStorage();
String suffix = DateTimeUtils.fileSuffix();
try {
return LoaderFactory.buildPointLoder(storage,
"cryotemp_" + suffix, "", "timestamp", getTableFormat());
} catch (StorageException e) {
throw new RuntimeException("Failed to build loader from storage", e);
}
}
@Override
public void init() throws ControlException {
@ -104,7 +114,7 @@ public class PKT8Device extends PortSensor<PKT8Result> {
//update parameters from meta
if (meta().hasValue("pga")) {
getLogger().info("Setting dynamic range to " + meta().getInt("pga"));
String response = getHandler().sendAndWait("g" + meta().getInt("pga"), null, 400).trim();
String response = getHandler().sendAndWait("g" + meta().getInt("pga"), 400, null).trim();
if (response.contains("=")) {
updateState(PGA, Integer.parseInt(response.substring(4)));
} else {
@ -116,12 +126,11 @@ public class PKT8Device extends PortSensor<PKT8Result> {
setBUF(meta().getInt("abuf", 100));
// setting up the collector
storageHelper = new StorageHelper(this, this::buildLoader);
Duration duration = Duration.parse(meta().getString("averagingDuration", "PT30S"));
collector = new RegularPointCollector((DataPoint dp) -> {
forEachConnection(Roles.POINT_LISTENER_ROLE, PointListener.class, listener -> {
getLogger().debug("Point measurement complete. Pushing...");
listener.accept(dp);
});
storageHelper.push(dp);
}, duration, channels.values().stream().map(PKT8Channel::getName).toArray(String[]::new));
}
@ -140,26 +149,9 @@ public class PKT8Device extends PortSensor<PKT8Result> {
return format;
}
@Override
public synchronized void connect(Connection connection, String... roles) {
super.connect(connection, roles);
if (connection instanceof StorageConnection) {
//TODO add loader cache to remove loaders on disconnect
Storage storage = ((StorageConnection) connection).getStorage();
String suffix = DateTimeUtils.fileSuffix();
try {
PointLoader pointLoader = LoaderFactory.buildPointLoder(storage,
"cryotemp_" + suffix, "", "timestamp", getTableFormat());
this.connect(new LoaderConnection(pointLoader), Roles.POINT_LISTENER_ROLE);
} catch (StorageException e) {
getLogger().error("Failed to build loader from storage {}", storage.getName());
}
}
}
@Override
public void shutdown() throws ControlException {
storageHelper.close();
if (collector != null) {
collector.clear();
collector = null;
@ -190,7 +182,7 @@ public class PKT8Device extends PortSensor<PKT8Result> {
getLogger().info("Setting avaraging buffer size to " + buf);
String response;
try {
response = getHandler().sendAndWait("b" + buf, null, 400).trim();
response = getHandler().sendAndWait("b" + buf, 400, null).trim();
} catch (Exception ex) {
response = ex.getMessage();
}
@ -279,7 +271,7 @@ public class PKT8Device extends PortSensor<PKT8Result> {
getLogger().info("Setting sampling rate to " + spsToStr(sps));
String response;
try {
response = getHandler().sendAndWait("v" + sps, null, 400).trim();
response = getHandler().sendAndWait("v" + sps, 400, null).trim();
} catch (Exception ex) {
response = ex.getMessage();
}
@ -333,6 +325,8 @@ public class PKT8Device extends PortSensor<PKT8Result> {
return super.startMeasurement();
}
public class PKT8Measurement extends AbstractMeasurement<PKT8Result> implements PortHandler.PortController {
final PortHandler handler;

5
numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8View.java
View File

@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.net.URL;
import java.time.Instant;
import java.util.Comparator;
import java.util.ResourceBundle;
/**
@ -98,7 +99,7 @@ public class PKT8View extends DeviceViewConnection<PKT8Device> implements Initia
lastUpdateLabel.setText(time.toString());
table.getItems().removeIf(it -> it.channel.equals(result.channel));
table.getItems().add(result);
table.getItems().sort((o1, o2) -> o1.channel.compareTo(o2.channel));
table.getItems().sort(Comparator.comparing(o -> o.channel));
});
}
@ -131,7 +132,7 @@ public class PKT8View extends DeviceViewConnection<PKT8Device> implements Initia
stopMeasurement();
}
} catch (ControlException ex) {
evaluateDeviceException(getDevice(), "Failed to start or stop device", ex);
getDevice().getLogger().error("Failed to start or stop device", ex);
}
}
}

4
numass-control/magnet/src/main/java/inr/numass/control/magnet/MagnetController.java
View File

@ -122,11 +122,11 @@ public class MagnetController implements PortHandler.PortController {
private String talk(String request) throws PortException {
try {
return port.sendAndWait(request + "\r", null, timeout).trim();
return port.sendAndWait(request + "\r", timeout, null).trim();
} catch (PortTimeoutException tex) {
//Single retry on timeout
LoggerFactory.getLogger(getClass()).warn("A timeout exception for request '" + request + "'. Making another atempt.");
return port.sendAndWait(request + "\r", null, timeout).trim();
return port.sendAndWait(request + "\r", timeout, null).trim();
}
}

2
numass-control/magnet/src/main/java/inr/numass/control/magnet/Talk.java
View File

@ -60,7 +60,7 @@ public class Talk {
while (!"exit".equals(nextString)) {
try {
Instant start = DateTimeUtils.now();
String answer = handler.sendAndWait(nextString + "\r", null, 1000);
String answer = handler.sendAndWait(nextString + "\r", 1000, null);
//String answer = controller.request(nextString);
System.out.printf("ANSWER (latency = %s): %s;%n", Duration.between(start, DateTimeUtils.now()), answer.trim());
} catch (PortException ex) {

34
numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java
View File

@ -39,6 +39,7 @@ import hep.dataforge.tables.TableFormat;
import hep.dataforge.tables.TableFormatBuilder;
import hep.dataforge.utils.DateTimeUtils;
import hep.dataforge.values.Value;
import inr.numass.control.StorageHelper;
import java.time.Instant;
import java.util.*;
@ -259,8 +260,7 @@ public class MspDevice extends SingleMeasurementDevice implements PortHandler.Po
String response = getHandler().sendAndWait(
request,
(String str) -> str.trim().startsWith(commandName),
TIMEOUT
TIMEOUT, (String str) -> str.trim().startsWith(commandName)
);
return new MspResponse(response);
}
@ -404,8 +404,7 @@ public class MspDevice extends SingleMeasurementDevice implements PortHandler.Po
private class PeakJumpMeasurement extends AbstractMeasurement<DataPoint> {
private final Map<Integer, Double> measurement = new ConcurrentSkipListMap<>();
private final Map<StorageConnection, PointLoader> loaderMap = new HashMap<>();
// private List<PointLoader> loaders = new ArrayList<>();
private StorageHelper helper = new StorageHelper(MspDevice.this,this::makeLoader);
private final Meta meta;
private Map<Integer, String> peakMap;
private double zero = 0;
@ -481,13 +480,7 @@ public class MspDevice extends SingleMeasurementDevice implements PortHandler.Po
boolean stop = sendAndWait("ScanStop").isOK();
afterStop();
responseDelegate = null;
loaderMap.values().forEach(loader -> {
try {
loader.close();
} catch (Exception ex) {
getLogger().error("Failed to close Loader", ex);
}
});
helper.close();
return stop;
} catch (PortException ex) {
throw new MeasurementException(ex);
@ -520,24 +513,15 @@ public class MspDevice extends SingleMeasurementDevice implements PortHandler.Po
MapPoint.Builder point = new MapPoint.Builder();
point.putValue("timestamp", time);
measurement.entrySet().forEach((entry) -> {
double val = entry.getValue();
point.putValue(peakMap.get(entry.getKey()), val);
measurement.forEach((key, value1) -> {
double val = value1;
point.putValue(peakMap.get(key), val);
});
mspListener.acceptScan(measurement);
if (getState("storing").booleanValue()) {
forEachConnection(Roles.STORAGE_ROLE, StorageConnection.class, (StorageConnection connection) -> {
PointLoader pl = loaderMap.computeIfAbsent(connection, this::makeLoader);
try {
pl.push(point.build());
} catch (StorageException ex) {
getLogger().error("Push to loader failed", ex);
}
});
}
//pushing data to storage
helper.push(point.build());
}
measurement.clear();

51
numass-control/src/main/java/inr/numass/control/StorageHelper.java Normal file
View File

@ -0,0 +1,51 @@
package inr.numass.control;
import hep.dataforge.control.connections.StorageConnection;
import hep.dataforge.control.devices.AbstractDevice;
import hep.dataforge.exceptions.StorageException;
import hep.dataforge.storage.api.PointLoader;
import hep.dataforge.tables.DataPoint;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
/**
* A helper to store points in multiple loaders
* Created by darksnake on 16-May-17.
*/
public class StorageHelper implements AutoCloseable {
private final AbstractDevice device;
private final Map<StorageConnection, PointLoader> loaderMap = new HashMap<>();
private final Function<StorageConnection, PointLoader> loaderFactory;
public StorageHelper(AbstractDevice device, Function<StorageConnection, PointLoader> loaderFactory) {
this.device = device;
this.loaderFactory = loaderFactory;
}
public void push(DataPoint point) {
if (!device.hasState("storing") || device.getState("storing").booleanValue()) {
device.forEachConnection("storage", StorageConnection.class, connection -> {
PointLoader pl = loaderMap.computeIfAbsent(connection, loaderFactory);
try {
pl.push(point);
} catch (StorageException ex) {
device.getLogger().error("Push to loader failed", ex);
}
});
}
}
@Override
public void close() {
loaderMap.values().forEach(it -> {
try {
it.close();
} catch (Exception ex) {
device.getLogger().error("Failed to close Loader", ex);
}
});
}
}

4
numass-control/vac/build.gradle
View File

@ -1,10 +1,10 @@
apply plugin: 'application'
version = "0.4.2"
version = "0.5.0"
if (!hasProperty('mainClass')) {
//ext.mainClass = 'inr.numass.readvac.app.ConsoleVac'
ext.mainClass = 'inr.numass.readvac.app.ReadVac'
ext.mainClass = 'inr.numass.readvac.fx.ReadVac'
}
mainClassName = mainClass

2
numass-control/vac/src/main/java/inr/numass/readvac/devices/CM32Device.java → numass-control/vac/src/main/java/inr/numass/readvac/CM32Device.java
View File

@ -3,7 +3,7 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.devices;
package inr.numass.readvac;
import hep.dataforge.context.Context;
import hep.dataforge.control.devices.PortSensor;

2
numass-control/vac/src/main/java/inr/numass/readvac/devices/MKSBaratronDevice.java → numass-control/vac/src/main/java/inr/numass/readvac/MKSBaratronDevice.java
View File

@ -3,7 +3,7 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.devices;
package inr.numass.readvac;
import hep.dataforge.context.Context;
import hep.dataforge.control.devices.PortSensor;

29
numass-control/vac/src/main/java/inr/numass/readvac/devices/MKSVacDevice.java → numass-control/vac/src/main/java/inr/numass/readvac/MKSVacDevice.java
View File

@ -3,16 +3,18 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.devices;
package inr.numass.readvac;
import hep.dataforge.context.Context;
import hep.dataforge.control.devices.PortSensor;
import hep.dataforge.control.devices.annotations.StateDef;
import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.measurements.SimpleMeasurement;
import hep.dataforge.control.ports.PortHandler;
import hep.dataforge.description.ValueDef;
import hep.dataforge.exceptions.ControlException;
import hep.dataforge.meta.Meta;
import hep.dataforge.values.Value;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.adapter.JavaBeanBooleanPropertyBuilder;
@ -20,12 +22,12 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
*
* @author Alexander Nozik
*/
@ValueDef(name = "address", def = "253")
@ValueDef(name = "channel", def = "5")
@ValueDef(name = "powerButton", type = "BOOLEAN", def = "true")
@StateDef(name = "power", writable = true, info = "Device powered up")
public class MKSVacDevice extends PortSensor<Double> {
public MKSVacDevice() {
@ -71,7 +73,7 @@ public class MKSVacDevice extends PortSensor<Double> {
return null;
}
switch (stateName) {
case "connection":
case CONNECTION_STATE:
return !talk("T?").isEmpty();
case "power":
return talk("FP?").equals("ON");
@ -81,15 +83,17 @@ public class MKSVacDevice extends PortSensor<Double> {
}
}
// @Override
// public void command(String commandName, Value argument) throws ControlException {
// if (commandName.equals("setPower")) {
// boolean powerOn = argument.booleanValue();
// setPowerOn(powerOn);
// } else {
// super.command(commandName, argument);
// }
// }
@Override
protected void requestStateChange(String stateName, Value value) throws ControlException {
switch (stateName) {
case "power":
setPowerOn(value.booleanValue());
break;
default:
super.requestStateChange(stateName, value);
}
}
@Override
public void shutdown() throws ControlException {
@ -98,7 +102,6 @@ public class MKSVacDevice extends PortSensor<Double> {
}
public boolean isPowerOn() {
return getState("power").booleanValue();
}

53
numass-control/vac/src/main/java/inr/numass/readvac/devices/VITVacDevice.java → numass-control/vac/src/main/java/inr/numass/readvac/MeradatVacDevice.java
View File

@ -3,13 +3,14 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.devices;
package inr.numass.readvac;
import hep.dataforge.context.Context;
import hep.dataforge.control.devices.PortSensor;
import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.measurements.SimpleMeasurement;
import hep.dataforge.control.ports.PortHandler;
import hep.dataforge.description.ValueDef;
import hep.dataforge.exceptions.ControlException;
import hep.dataforge.meta.Meta;
@ -21,12 +22,13 @@ import java.util.regex.Pattern;
/**
* @author Alexander Nozik
*/
public class VITVacDevice extends PortSensor<Double> {
@ValueDef(name = "address", type = "NUMBER", def = "1", info = "A modbus address")
public class MeradatVacDevice extends PortSensor<Double> {
public VITVacDevice() {
public MeradatVacDevice() {
}
public VITVacDevice(Context context, Meta meta) {
public MeradatVacDevice(Context context, Meta meta) {
setContext(context);
setMetaBase(meta);
}
@ -40,7 +42,7 @@ public class VITVacDevice extends PortSensor<Double> {
@Override
protected Measurement<Double> createMeasurement() {
return new CMVacMeasurement();
return new MeradatMeasurement(meta().getInt("adress", 1));
}
@Override
@ -48,41 +50,31 @@ public class VITVacDevice extends PortSensor<Double> {
return meta().getString("type", "Vit vacuumeter");
}
@Override
protected Object computeState(String stateName) throws ControlException {
if (getHandler() == null) {
notifyError("No port connection", null);
return null;
private class MeradatMeasurement extends SimpleMeasurement<Double> {
// private static final String VIT_QUERY = ":010300000002FA\r\n";
private final String query;
private final Pattern response;
private final String base;
public MeradatMeasurement(int address) {
base = String.format(":%02d", address);
query = base + "0300000002FA\r\n";
response = Pattern.compile(base + "0304(\\w{4})(\\w{4})..\r\n");
}
notifyError("State not found: " + stateName, null);
return null;
//TODO add connection check here
// switch (stateName) {
// case "connection":
// return !talk("T?").isEmpty();
// default:
// notifyError("State not found: " + stateName, null);
// return null;
// }
}
private class CMVacMeasurement extends SimpleMeasurement<Double> {
private static final String VIT_QUERY = ":010300000002FA\r\n";
@Override
protected synchronized Double doMeasure() throws Exception {
String answer = getHandler().sendAndWait(VIT_QUERY, timeout());
String answer = getHandler().sendAndWait(query, timeout(), phrase -> phrase.startsWith(base));
if (answer.isEmpty()) {
this.progressUpdate("No signal");
updateState("connection", false);
return null;
} else {
Matcher match = Pattern.compile(":010304(\\w{4})(\\w{4})..\r\n").matcher(answer);
Matcher match = response.matcher(answer);
if (match.matches()) {
double base = (double) (Integer.parseInt(match.group(1), 16)) / 10d;
@ -95,7 +87,8 @@ public class VITVacDevice extends PortSensor<Double> {
this.progressUpdate("OK");
updateState("connection", true);
return res.doubleValue();
} else {
}
else {
this.progressUpdate("Wrong answer: " + answer);
updateState("connection", false);
return null;

61
numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java → numass-control/vac/src/main/java/inr/numass/readvac/VacCollectorDevice.java
View File

@ -3,26 +3,33 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.devices;
package inr.numass.readvac;
import hep.dataforge.control.collectors.PointCollector;
import hep.dataforge.control.collectors.ValueCollector;
import hep.dataforge.control.connections.Roles;
import hep.dataforge.control.connections.StorageConnection;
import hep.dataforge.control.devices.annotations.RoleDef;
import hep.dataforge.control.devices.annotations.StateDef;
import hep.dataforge.control.measurements.AbstractMeasurement;
import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.exceptions.ControlException;
import hep.dataforge.exceptions.MeasurementException;
import hep.dataforge.storage.api.PointLoader;
import hep.dataforge.storage.commons.LoaderFactory;
import hep.dataforge.tables.DataPoint;
import hep.dataforge.tables.MapPoint;
import hep.dataforge.tables.PointListener;
import hep.dataforge.tables.TableFormatBuilder;
import hep.dataforge.utils.DateTimeUtils;
import hep.dataforge.values.Value;
import hep.dataforge.values.ValueType;
import inr.numass.control.StorageHelper;
import java.time.Instant;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.Executors;
@ -31,25 +38,30 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
/**
*
* @author <a href="mailto:altavir@gmail.com">Alexander Nozik</a>
*/
@RoleDef(name = Roles.STORAGE_ROLE, objectType = PointListener.class, info = "Storage for acquired points")
@StateDef(name = "storing", writable = true, info = "Define if this device is currently writes to storage")
public class VacCollectorDevice extends Sensor<DataPoint> {
private Map<String, Sensor> sensorMap = new HashMap<>();
private Map<String, Sensor<Double>> sensorMap = new LinkedHashMap<>();
public void setSensors(Sensor... sensors) {
sensorMap = new LinkedHashMap<>(sensors.length);
for (Sensor sensor : sensors) {
public void setSensors(Iterable<Sensor<Double>> sensors) {
sensorMap = new LinkedHashMap<>();
for (Sensor<Double> sensor : sensors) {
sensorMap.put(sensor.getName(), sensor);
}
}
@SuppressWarnings("unchecked")
public void setSensors(Sensor... sensors) {
setSensors(Arrays.asList(sensors));
}
@Override
public void init() throws ControlException {
super.init();
for (Sensor s : sensorMap.values()) {
for (Sensor<Double> s : sensorMap.values()) {
s.init();
}
}
@ -87,39 +99,34 @@ public class VacCollectorDevice extends Sensor<DataPoint> {
}
}
public Collection<Sensor> getSensors() {
public Collection<Sensor<Double>> getSensors() {
return sensorMap.values();
}
public void setSensors(Iterable<Sensor> sensors) {
sensorMap = new LinkedHashMap<>();
for (Sensor sensor : sensors) {
sensorMap.put(sensor.getName(), sensor);
}
}
private class VacuumMeasurement extends AbstractMeasurement<DataPoint> {
private final ValueCollector collector = new PointCollector(this::result, sensorMap.keySet());
private ScheduledExecutorService executor;
private ScheduledFuture<?> currentTask;
private StorageHelper helper;
@Override
public void start() {
helper = new StorageHelper(VacCollectorDevice.this, this::buildLoader);
executor = Executors
.newSingleThreadScheduledExecutor((Runnable r) -> new Thread(r, "VacuumMeasurement thread"));
currentTask = executor.scheduleWithFixedDelay(() -> {
sensorMap.entrySet().stream().parallel().forEach((entry) -> {
sensorMap.values().forEach((sensor) -> {
try {
Object value;
if (entry.getValue().meta().getBoolean("disabled", false)) {
if(sensor.optBooleanState("disabled").orElse(false)){
value = null;
} else {
value = entry.getValue().read();
value = sensor.read();
}
collector.put(entry.getKey(), value);
collector.put(sensor.getName(), value);
} catch (Exception ex) {
collector.put(entry.getKey(), Value.NULL);
collector.put(sensor.getName(), Value.NULL);
}
});
}, 0, meta().getInt("delay", 5000), TimeUnit.MILLISECONDS);
@ -133,10 +140,19 @@ public class VacCollectorDevice extends Sensor<DataPoint> {
});
}
private PointLoader buildLoader(StorageConnection connection) {
TableFormatBuilder format = new TableFormatBuilder().setType("timestamp", ValueType.TIME);
getSensors().forEach((s) -> {
format.setType(s.getName(), ValueType.NUMBER);
});
return LoaderFactory.buildPointLoder(connection.getStorage(), "vactms", "", "timestamp", format.build());
}
private DataPoint terminator() {
MapPoint.Builder p = new MapPoint.Builder();
p.putValue("timestamp", DateTimeUtils.now());
sensorMap.keySet().stream().forEach((n) -> {
sensorMap.keySet().forEach((n) -> {
p.putValue(n, null);
});
return p.build();
@ -151,6 +167,7 @@ public class VacCollectorDevice extends Sensor<DataPoint> {
currentTask.cancel(force);
executor.shutdown();
currentTask = null;
helper.close();
afterStop();
}
return isRunning;

46
numass-control/vac/src/main/java/inr/numass/readvac/VacDeviceFactory.java Normal file
View File

@ -0,0 +1,46 @@
package inr.numass.readvac;
import hep.dataforge.context.Context;
import hep.dataforge.control.devices.DeviceFactory;
import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.meta.Meta;
import java.util.List;
import java.util.stream.Collectors;
/**
* A factory for vacuum measurements collector
* Created by darksnake on 16-May-17.
*/
public class VacDeviceFactory implements DeviceFactory<VacCollectorDevice> {
@Override
public String getType() {
return "numass:vac";
}
public Sensor<Double> buildSensor(Context context, Meta sensorConfig) {
switch (sensorConfig.getString("sensorType", "")) {
case "mks":
return new MKSVacDevice(context, sensorConfig);
case "CM32":
return new CM32Device(context, sensorConfig);
case "meradat":
return new MeradatVacDevice(context, sensorConfig);
case "baratron":
return new MKSBaratronDevice(context, sensorConfig);
default:
throw new RuntimeException("Unknown vacuum sensor type");
}
}
@Override
public VacCollectorDevice build(Context context, Meta config) {
List<Sensor<Double>> sensors = config.getMetaList("sensor").stream()
.map(sensorConfig -> buildSensor(context, sensorConfig)).collect(Collectors.toList());
VacCollectorDevice collector = new VacCollectorDevice();
collector.configure(config);
collector.setSensors(sensors);
return collector;
}
}

163
numass-control/vac/src/main/java/inr/numass/readvac/app/ReadVac.java
View File

@ -1,163 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.app;
import hep.dataforge.context.Context;
import hep.dataforge.context.Global;
import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.exceptions.StorageException;
import hep.dataforge.io.MetaFileReader;
import hep.dataforge.meta.Meta;
import hep.dataforge.meta.MetaBuilder;
import hep.dataforge.storage.api.PointLoader;
import hep.dataforge.storage.api.Storage;
import hep.dataforge.storage.commons.LoaderFactory;
import hep.dataforge.tables.TableFormatBuilder;
import hep.dataforge.values.ValueType;
import inr.numass.client.ClientUtils;
import inr.numass.readvac.devices.*;
import inr.numass.readvac.fx.VacCollectorController;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.stage.Stage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
/**
* @author Alexander Nozik
*/
public class ReadVac extends Application {
VacCollectorController controller;
Logger logger = LoggerFactory.getLogger("ReadVac");
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
launch(args);
}
@Override
public void start(Stage primaryStage) throws Exception {
String configFileName = getParameters().getNamed().get("config");
if (configFileName == null) {
configFileName = "vac-config.xml";
}
File configFile = new File(configFileName);
Meta config;
if (configFile.exists()) {
config = MetaFileReader.read(configFile).build();
} else {
config = Meta.empty();
}
Context context = Global.instance();
Meta p1Meta = config.getMeta("p1",
new MetaBuilder("p1")
.setValue("port", "com::/dev/ttyUSB0")
.setValue("name", "P1")
.build()
);
Sensor<Double> p1 = new MKSVacDevice(context, p1Meta);
Meta p2Meta = config.getMeta("p2",
new MetaBuilder("p2")
.setValue("port", "tcp::192.168.111.32:4002")
.setValue("name", "P2")
.build()
);
Sensor<Double> p2 = new CM32Device(context,p2Meta);
Meta p3Meta = config.getMeta("p3",
new MetaBuilder("p3")
.setValue("port", "tcp::192.168.111.32:4003")
.setValue("name", "P3")
.build()
);
Sensor<Double> p3 = new CM32Device(context, p3Meta);
Meta pxMeta = config.getMeta("px",
new MetaBuilder("px")
.setValue("port", "tcp::192.168.111.32:4003")
.setValue("name", "Px")
.build()
);
Sensor<Double> px = new VITVacDevice(context,pxMeta);
Meta baratronMeta = config.getMeta("baratron",
new MetaBuilder("baratron")
.setValue("port", "tcp::192.168.111.33:4004")
.setValue("name", "Baratron")
.build()
);
Sensor<Double> baratron = new MKSBaratronDevice(context,baratronMeta);
VacCollectorDevice collector = new VacCollectorDevice();
collector.configure(config);
collector.setSensors(p1, p2, p3, px, baratron);
collector.init();
FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/VacCollector.fxml"));
loader.load();
controller = loader.getController();
controller.setDevice(collector);
controller.setLogger(logger);
controller.setLoaderFactory((VacCollectorDevice device, Storage localStorage) -> {
try {
String runName = ClientUtils.getRunName(config);
// String runName = device.meta().getString("numass.run", "");
// if (config.hasMeta("numass.server")) {
// try {
// logger.info("Obtaining run information from cetral server...");
// NumassClient client = new NumassClient(get);
// runName = client.getCurrentRun().getString("path", "");
// logger.info("Run name is '{}'", runName);
// } catch (Exception ex) {
// logger.warn("Failed to download current run information", ex);
// }
// }
TableFormatBuilder format = new TableFormatBuilder().setType("timestamp", ValueType.TIME);
device.getSensors().stream().forEach((s) -> {
format.setType(s.getName(), ValueType.NUMBER);
});
PointLoader pl = LoaderFactory.buildPointLoder(localStorage, "vactms", runName, "timestamp", format.build());
return pl;
} catch (StorageException ex) {
throw new RuntimeException(ex);
}
});
Scene scene = new Scene(loader.getRoot(), 800, 700);
primaryStage.setTitle("Numass vacuum measurements");
primaryStage.setScene(scene);
primaryStage.show();
// controller.startMeasurement();
}
@Override
public void stop() throws Exception {
if (controller != null) {
controller.stopMeasurement();
controller.getDevice().shutdown();
}
super.stop();
}
}

2
numass-control/vac/src/main/java/inr/numass/readvac/app/ConsoleVac.java → numass-control/vac/src/main/java/inr/numass/readvac/fx/ConsoleVac.java
View File

@ -1,4 +1,4 @@
package inr.numass.readvac.app;
package inr.numass.readvac.fx;
import hep.dataforge.control.measurements.Sensor;
import org.apache.commons.cli.CommandLine;

2
numass-control/vac/src/main/java/inr/numass/readvac/fx/PoweredVacuumeterView.java
View File

@ -22,7 +22,7 @@ import java.util.ResourceBundle;
public class PoweredVacuumeterView extends VacuumeterView {
@FXML
ToggleSwitch powerSwitch;
private ToggleSwitch powerSwitch;
@Override

172
numass-control/vac/src/main/java/inr/numass/readvac/fx/ReadVac.java Normal file
View File

@ -0,0 +1,172 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.fx;
import hep.dataforge.control.devices.DeviceFactory;
import hep.dataforge.meta.Meta;
import inr.numass.control.DeviceViewConnection;
import inr.numass.control.NumassControlApplication;
import inr.numass.readvac.VacCollectorDevice;
import inr.numass.readvac.VacDeviceFactory;
import javafx.stage.Stage;
import java.util.Objects;
/**
* @author Alexander Nozik
*/
public class ReadVac extends NumassControlApplication<VacCollectorDevice> {
@Override
protected DeviceViewConnection<VacCollectorDevice> buildView() {
return VacCollectorView.build();
}
@Override
protected DeviceFactory<VacCollectorDevice> getDeviceFactory() {
return new VacDeviceFactory();
}
@Override
protected void setupStage(Stage stage, VacCollectorDevice device) {
stage.setTitle("Numass vacuum measurements");
}
@Override
protected boolean acceptDevice(Meta meta) {
return Objects.equals(meta.getString("type", ""), "numass:vac");
}
// private VacCollectorDevice device;
//
// @Override
// public void start(Stage primaryStage) throws Exception {
// Locale.setDefault(Locale.US);// чтобы отделение десятичных знаков было точкой
// ch.qos.logback.classic.Logger rootLogger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME);
// rootLogger.setLevel(Level.INFO);
//
// DeviceViewConnection<VacCollectorDevice> controller = buildView();
//
// Scene scene = new Scene(controller.getPane());
//
// primaryStage.setScene(scene);
// primaryStage.show();
//
// device = setupDevice(controller);
// primaryStage.setTitle("Numass vacuum measurements");
// }
//
//
// private VacCollectorDevice setupDevice(DeviceConnection<VacCollectorDevice> controller) {
// Meta config = NumassControlUtils.getConfig(this)
// .orElseGet(() -> NumassControlUtils.readResourceMeta("/config/devices.xml"));
//
// Context ctx = NumassControlUtils.setupContext(config);
// Meta mspConfig = NumassControlUtils.findDeviceMeta(config, this::acceptDevice)
// .orElseThrow(() -> new RuntimeException("Device configuration not found"));
//
//
// try {
// D d = getDeviceFactory().build(ctx, mspConfig);
// d.init();
// NumassControlUtils.connectStorage(d, config);
// Platform.runLater(() -> {
// d.connect(controller, Roles.VIEW_ROLE, Roles.DEVICE_LISTENER_ROLE);
// });
// return d;
// } catch (ControlException e) {
// throw new RuntimeException("Failed to build device", e);
// }
// }
//
// @Override
// public void stop() throws Exception {
// super.stop();
// if (device != null) {
// device.shutdown();
// device.getContext().close();
// }
// }
// VacCollectorView controller;
// Logger logger = LoggerFactory.getLogger("ReadVac");
//
// /**
// * @param args the command line arguments
// */
// public static void main(String[] args) {
// launch(args);
// }
//
// @Override
// public void start(Stage primaryStage) throws Exception {
// String configFileName = getParameters().getNamed().get("config");
// if (configFileName == null) {
// configFileName = "devices.xml";
// }
// File configFile = new File(configFileName);
// Meta config;
// if (configFile.exists()) {
// config = MetaFileReader.read(configFile).build();
// } else {
// config = Meta.empty();
// }
//
// Context context = Global.instance();
//
// collector.init();
//
// FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/VacCollector.fxml"));
// loader.load();
// controller = loader.getController();
// controller.setDevice(collector);
// controller.setLogger(logger);
//
// controller.setLoaderFactory((VacCollectorDevice device, Storage localStorage) -> {
// try {
// String runName = ClientUtils.getRunName(config);
//// String runName = device.meta().getString("numass.run", "");
//// if (config.hasMeta("numass.server")) {
//// try {
//// logger.info("Obtaining run information from cetral server...");
//// NumassClient client = new NumassClient(get);
//// runName = client.getCurrentRun().getString("path", "");
//// logger.info("Run name is '{}'", runName);
//// } catch (Exception ex) {
//// logger.warn("Failed to download current run information", ex);
//// }
//// }
//
// TableFormatBuilder format = new TableFormatBuilder().setType("timestamp", ValueType.TIME);
// device.getSensors().stream().forEach((s) -> {
// format.setType(s.getName(), ValueType.NUMBER);
// });
//
// PointLoader pl = LoaderFactory.buildPointLoder(localStorage, "vactms", runName, "timestamp", format.build());
// return pl;
//
// } catch (StorageException ex) {
// throw new RuntimeException(ex);
// }
// });
// Scene scene = new Scene(loader.getRoot(), 800, 700);
//
// primaryStage.setTitle("Numass vacuum measurements");
// primaryStage.setScene(scene);
// primaryStage.show();
//// controller.startMeasurement();
// }
//
// @Override
// public void stop() throws Exception {
// if (controller != null) {
// controller.stopMeasurement();
// controller.getDevice().shutdown();
// }
// super.stop();
// }
}

14
numass-control/vac/src/main/java/inr/numass/readvac/app/TestVac.java → numass-control/vac/src/main/java/inr/numass/readvac/fx/TestVac.java
View File

@ -3,25 +3,26 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package inr.numass.readvac.app;
package inr.numass.readvac.fx;
import hep.dataforge.control.connections.Roles;
import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.control.virtual.Virtual;
import inr.numass.readvac.devices.VacCollectorDevice;
import inr.numass.readvac.fx.VacCollectorController;
import java.time.Duration;
import inr.numass.readvac.VacCollectorDevice;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.stage.Stage;
import java.time.Duration;
/**
*
* @author Alexander Nozik
*/
public class TestVac extends Application {
VacCollectorController controller;
VacCollectorView controller;
@Override
public void start(Stage primaryStage) {
@ -60,7 +61,7 @@ public class TestVac extends Application {
FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/VacCollector.fxml"));
loader.load();
controller = loader.getController();
controller.setDevice(collector);
collector.connect(controller, Roles.VIEW_ROLE);
Scene scene = new Scene(loader.getRoot(), 800, 600);
@ -75,7 +76,6 @@ public class TestVac extends Application {
@Override
public void stop() throws Exception {
if (controller != null) {
controller.stopMeasurement();
controller.getDevice().shutdown();
}
super.stop();

208
numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java → numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorView.java
View File

@ -5,10 +5,8 @@
*/
package inr.numass.readvac.fx;
import hep.dataforge.control.connections.LoaderConnection;
import hep.dataforge.control.connections.Roles;
import hep.dataforge.control.devices.Device;
import hep.dataforge.control.devices.DeviceListener;
import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.measurements.MeasurementListener;
import hep.dataforge.control.measurements.Sensor;
@ -23,33 +21,29 @@ import hep.dataforge.plots.data.TimePlottableGroup;
import hep.dataforge.plots.fx.FXPlotFrame;
import hep.dataforge.plots.fx.PlotContainer;
import hep.dataforge.plots.jfreechart.JFreeChartFrame;
import hep.dataforge.storage.api.PointLoader;
import hep.dataforge.storage.api.Storage;
import hep.dataforge.storage.commons.LoaderFactory;
import hep.dataforge.storage.commons.StorageManager;
import hep.dataforge.tables.DataPoint;
import hep.dataforge.tables.TableFormatBuilder;
import hep.dataforge.values.Value;
import hep.dataforge.values.ValueType;
import inr.numass.readvac.devices.VacCollectorDevice;
import inr.numass.control.DeviceViewConnection;
import inr.numass.readvac.VacCollectorDevice;
import javafx.application.Platform;
import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.Node;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Label;
import javafx.scene.control.ToggleButton;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.VBox;
import javafx.stage.DirectoryChooser;
import javafx.util.Duration;
import org.controlsfx.control.Notifications;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.time.Instant;
import java.time.LocalDateTime;
@ -58,26 +52,33 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
import java.util.function.BiFunction;
/**
* FXML Controller class
* A view controller for Vac collector
*
* @author <a href="mailto:altavir@gmail.com">Alexander Nozik</a>
*/
public class VacCollectorController implements Initializable, DeviceListener, MeasurementListener<DataPoint> {
public class VacCollectorView extends DeviceViewConnection<VacCollectorDevice> implements Initializable, MeasurementListener<DataPoint> {
public static VacCollectorView build() {
try {
FXMLLoader loader = new FXMLLoader(VacCollectorView.class.getResource("/fxml/VacCollector.fxml"));
loader.load();
return loader.getController();
} catch (IOException e) {
throw new Error(e);
}
}
private final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
private final String[] intervalNames = {"1 sec", "5 sec", "10 sec", "30 sec", "1 min"};
private final int[] intervals = {1000, 5000, 10000, 30000, 60000};
private final List<VacuumeterView> views = new ArrayList<>();
private LogFragment consoleWindow;
private Logger logger;
private LoaderConnection storageConnection;
private VacCollectorDevice device;
private PlotContainer plotContainer;
private TimePlottableGroup plottables;
private BiFunction<VacCollectorDevice, Storage, PointLoader> loaderFactory;
@FXML
private BorderPane root;
@FXML
private AnchorPane plotHolder;
@FXML
@ -93,12 +94,17 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
@FXML
private ToggleButton logButton;
@Override
public Node getFXNode() {
return root;
}
/**
* Initializes the controller class.
*/
@Override
public void initialize(URL url, ResourceBundle rb) {
plotContainer = PlotContainer.anchorTo(plotHolder);
intervalSelector.setItems(FXCollections.observableArrayList(intervalNames));
intervalSelector.getSelectionModel().select(1);
intervalSelector.getSelectionModel().selectedIndexProperty().addListener((ObservableValue<? extends Number> observable, Number oldValue, Number newValue) -> {
@ -111,7 +117,7 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
}
});
consoleWindow = new LogFragment();
LogFragment consoleWindow = new LogFragment();
new FragmentWindow(consoleWindow).bindTo(logButton);
consoleWindow.hookStd();
}
@ -121,24 +127,19 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
Notifications.create().darkStyle().hideAfter(Duration.seconds(2d)).text(message).showError();
}
public VacCollectorDevice getDevice() {
return device;
}
public void setDevice(VacCollectorDevice device) {
this.device = device;
@Override
public void open(VacCollectorDevice device) throws Exception {
super.open(device);
device.getSensors().stream().map((sensor) -> {
VacuumeterView controller;
if (sensor.meta().getBoolean("powerButton", false)) {
controller = new PoweredVacuumeterView();
VacuumeterView view;
if (sensor.hasState("power")) {
view = new PoweredVacuumeterView();
} else {
controller = new VacuumeterView();
view = new VacuumeterView();
}
sensor.connect(controller, Roles.DEVICE_LISTENER_ROLE, Roles.MEASUREMENT_CONSUMER_ROLE);
return controller;
}).forEach((controller) -> {
views.add(controller);
});
sensor.connect(view, Roles.VIEW_ROLE, Roles.DEVICE_LISTENER_ROLE, Roles.MEASUREMENT_CONSUMER_ROLE);
return view;
}).forEach(views::add);
setupView();
}
@ -156,13 +157,6 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
public void onMeasurementResult(Measurement<DataPoint> measurement, DataPoint result, Instant time) {
if (plottables != null) {
plottables.put(result);
//workaround to fix autorange problem
// for (String n : result.names()) {
// Value val = result.getValue(n);
// if (val.doubleValue() > 0) {
// plottables.put(n, val);
// }
// }
}
Platform.runLater(() -> timeLabel.setText(TIME_FORMAT.format(LocalDateTime.ofInstant(time, ZoneOffset.UTC))));
}
@ -170,16 +164,16 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
private void setupView() {
vacBoxHolder.getChildren().clear();
plottables = new TimePlottableGroup();
views.stream().forEach((controller) -> {
vacBoxHolder.getChildren().add(controller.getComponent());
TimePlottable plot = new TimePlottable(controller.getTitle(),
controller.getName());
plot.configure(controller.meta());
views.forEach((view) -> {
vacBoxHolder.getChildren().add(view.getComponent());
TimePlottable plot = new TimePlottable(view.getTitle(),
view.getDevice().getName());
plot.configure(view.getDevice().meta());
plottables.add(plot);
});
plottables.setValue("thickness", 3);
plottables.setMaxAge(java.time.Duration.ofHours(3));
plotContainer.setPlot(setupPlot(plottables));
PlotContainer.anchorTo(plotHolder).setPlot(setupPlot(plottables));
}
private FXPlotFrame setupPlot(TimePlottableGroup plottables) {
@ -195,12 +189,12 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
return frame;
}
public void startMeasurement() throws ControlException {
private void startMeasurement() throws ControlException {
getDevice().startMeasurement().addListener(this);
startStopButton.setSelected(true);
}
public void stopMeasurement() {
private void stopMeasurement() {
try {
getDevice().stopMeasurement(false);
for (Sensor sensor : getDevice().getSensors()) {
@ -211,10 +205,6 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
}
}
public void setLoaderFactory(BiFunction<VacCollectorDevice, Storage, PointLoader> loaderFactory) {
this.loaderFactory = loaderFactory;
}
@FXML
private void onStartStopToggle(ActionEvent event) {
if (startStopButton.isSelected() != getDevice().isMeasuring()) {
@ -224,7 +214,7 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
try {
startMeasurement();
} catch (ControlException ex) {
getLogger().error("Failed to start measurement", ex);
getDevice().getLogger().error("Failed to start measurement", ex);
startStopButton.setSelected(false);
}
} else {
@ -236,65 +226,51 @@ public class VacCollectorController implements Initializable, DeviceListener, Me
@FXML
private void onStoreToggle(ActionEvent event) {
if (storeButton.isSelected()) {
//creating storage on UI thread
if (!device.meta().hasMeta("storage")) {
getLogger().info("Storage not defined. Starting storage selection dialog");
DirectoryChooser chooser = new DirectoryChooser();
File storageDir = chooser.showDialog(plotHolder.getScene().getWindow());
if (storageDir == null) {
storeButton.setSelected(false);
throw new RuntimeException("User canceled directory selection");
}
device.getConfig().putNode(new MetaBuilder("storage")
.putValue("path", storageDir.getAbsolutePath()));
}
Meta storageConfig = device.meta().getMeta("storage");
Storage localStorage = StorageManager.buildFrom(device.getContext())
.buildStorage(storageConfig);
//Start storage creation on non-UI thread
new Thread(() -> {
try {
PointLoader loader;
if (loaderFactory != null) {
loader = loaderFactory.apply(device, localStorage);
} else {
TableFormatBuilder format = new TableFormatBuilder().setType("timestamp", ValueType.TIME);
device.getSensors().stream().forEach((s) -> {
format.setType(s.getName(), ValueType.NUMBER);
});
loader = LoaderFactory.buildPointLoder(localStorage, "vactms",
device.meta().getString("storage.shelf", ""), "timestamp", format.build());
}
storageConnection = new LoaderConnection(loader);
device.connect(storageConnection, Roles.STORAGE_ROLE);
} catch (Exception ex) {
getLogger().error("Failed to start data storing", ex);
storeButton.setSelected(false);
}
}).start();
} else if (storageConnection != null) {
device.disconnect(storageConnection);
}
getDevice().setState("storing", storeButton.isSelected());
// if (storeButton.isSelected()) {
// //creating storage on UI thread
// if (!device.meta().hasMeta("storage")) {
// getLogger().info("Storage not defined. Starting storage selection dialog");
// DirectoryChooser chooser = new DirectoryChooser();
// File storageDir = chooser.showDialog(plotHolder.getScene().getWindow());
// if (storageDir == null) {
// storeButton.setSelected(false);
// throw new RuntimeException("User canceled directory selection");
// }
// device.getConfig().putNode(new MetaBuilder("storage")
// .putValue("path", storageDir.getAbsolutePath()));
// }
// Meta storageConfig = device.meta().getMeta("storage");
// Storage localStorage = StorageManager.buildFrom(device.getContext())
// .buildStorage(storageConfig);
// //Start storage creation on non-UI thread
// new Thread(() -> {
// try {
//
// PointLoader loader;
//
// if (loaderFactory != null) {
// loader = loaderFactory.apply(device, localStorage);
// } else {
// TableFormatBuilder format = new TableFormatBuilder().setType("timestamp", ValueType.TIME);
// device.getSensors().forEach((s) -> {
// format.setType(s.getName(), ValueType.NUMBER);
// });
//
// loader = LoaderFactory.buildPointLoder(localStorage, "vactms",
// device.meta().getString("storage.shelf", ""), "timestamp", format.build());
// }
// storageConnection = new LoaderConnection(loader);
// device.connect(storageConnection, Roles.STORAGE_ROLE);
// } catch (Exception ex) {
// getLogger().error("Failed to start data storing", ex);
// storeButton.setSelected(false);
// }
// }).start();
// } else if (storageConnection != null) {
// device.disconnect(storageConnection);
// }
}
/**
* @return the logger
*/
public Logger getLogger() {
if (logger == null) {
logger = LoggerFactory.getLogger("ValCollector");
}
return logger;
}
/**
* @param logger the logger to set
*/
public void setLogger(Logger logger) {
this.logger = logger;
}
}

51
numass-control/vac/src/main/java/inr/numass/readvac/fx/VacuumeterView.java
View File

@ -5,16 +5,13 @@
*/
package inr.numass.readvac.fx;
import hep.dataforge.control.connections.DeviceConnection;
import hep.dataforge.control.connections.MeasurementConsumer;
import hep.dataforge.control.devices.Device;
import hep.dataforge.control.devices.DeviceListener;
import hep.dataforge.control.measurements.Measurement;
import hep.dataforge.control.measurements.MeasurementListener;
import hep.dataforge.meta.Meta;
import hep.dataforge.meta.Metoid;
import hep.dataforge.names.Named;
import hep.dataforge.control.measurements.Sensor;
import hep.dataforge.values.Value;
import inr.numass.control.DeviceViewConnection;
import javafx.application.Platform;
import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
@ -22,6 +19,7 @@ import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.BorderPane;
import javafx.scene.paint.Color;
import org.controlsfx.control.ToggleSwitch;
@ -37,7 +35,7 @@ import java.util.ResourceBundle;
/**
* @author <a href="mailto:altavir@gmail.com">Alexander Nozik</a>
*/
public class VacuumeterView extends DeviceConnection implements DeviceListener, MeasurementConsumer, MeasurementListener<Double>, Initializable, Named, Metoid {
public class VacuumeterView extends DeviceViewConnection<Sensor<Double>> implements MeasurementConsumer, MeasurementListener<Double>, Initializable {
private static final DecimalFormat FORMAT = new DecimalFormat("0.###E0");
private static final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ISO_LOCAL_TIME;
@ -45,27 +43,24 @@ public class VacuumeterView extends DeviceConnection implements DeviceListener,
protected Node node;
@FXML
Label deviceNameLabel;
private BorderPane root;
@FXML
Label unitLabel;
protected Label deviceNameLabel;
@FXML
Label valueLabel;
protected Label unitLabel;
@FXML
Label status;
private Label valueLabel;
@FXML
ToggleSwitch disableButton;
private Label status;
@FXML
private ToggleSwitch disableButton;
@Override
@SuppressWarnings("unchecked")
public void accept(Device device, String measurementName, Measurement measurement) {
measurement.addListener(this);
if (device.meta().hasValue("color")) {
valueLabel.setTextFill(Color.valueOf(device.meta().getString("color")));
}
getDevice().meta().optValue("color").ifPresent(colorValue ->valueLabel.setTextFill(Color.valueOf(colorValue.stringValue())));
}
@Override
@ -91,9 +86,9 @@ public class VacuumeterView extends DeviceConnection implements DeviceListener,
Platform.runLater(() -> {
unitLabel.setText(getDevice().meta().getString("units", "mbar"));
deviceNameLabel.setText(getDevice().getName());
disableButton.setSelected(!getDevice().meta().getBoolean("disabled", false));
disableButton.setSelected(!getDevice().optBooleanState("disabled").orElse(false));
disableButton.selectedProperty().addListener((ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) -> {
getDevice().getConfig().setValue("disabled", !newValue);
getDevice().setState("disabled",!newValue);
if (!newValue) {
valueLabel.setText("---");
}
@ -137,17 +132,13 @@ public class VacuumeterView extends DeviceConnection implements DeviceListener,
});
}
@Override
public String getName() {
return getDevice().getName();
}
@Override
public Meta meta() {
return getDevice().meta();
}
public String getTitle() {
return meta().getString("title", getName());
return getDevice().meta().getString("title", getDevice().getName());
}
@Override
public Node getFXNode() {
return root;
}
}

12
numass-control/vac/src/main/resources/config/devices.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
<device type="numass:vac">
<sensor name="P1" color="red" port="com::/dev/ttyUSB0" sensorType="mks"/>
<sensor name="P2" color="blue" port="tcp::192.168.111.32:4002" sensorType="CM32"/>
<sensor name="P3" color="green" port="tcp::192.168.111.32:4003" sensorType="CM32"/>
<!--<sensor name="Px" color="black" port="com::/dev/ttyUSB1" sensorType="meradat"/> -->
<sensor name="Px" color="black" port="tcp::192.168.111.33:4003" sensorType="meradat" address="1"/>
<sensor name="Baratron" color="cyan" port="tcp::192.168.111.33:4004" sensorType="baratron"/>
<!--<sensor name="collector" color="magenta" port="tcp::192.168.111.33:4003" sensorType="meradat" address="5"/>-->
</device>
</config>

52
numass-control/vac/src/main/resources/fxml/VacBox.fxml
View File

@ -1,63 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import org.controlsfx.control.*?>
<?import java.lang.*?>
<?import java.net.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import org.controlsfx.control.ToggleSwitch?>
<?import java.net.URL?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.VBox?>
<AnchorPane styleClass="vacBox" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1">
<BorderPane fx:id="root" styleClass="vacBox" xmlns="http://javafx.com/javafx/8.0.40"
xmlns:fx="http://javafx.com/fxml/1">
<stylesheets>
<URL value="@/styles/vacstyles.css"/>
</stylesheets>
<children>
<VBox AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<center>
<VBox>
<AnchorPane styleClass="namePane">
<children>
<Label id="name" fx:id="deviceNameLabel" alignment="CENTER" prefHeight="40.0" text="device Name" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="0.0" />
<ToggleSwitch fx:id="disableButton" alignment="CENTER" layoutX="140.0" layoutY="20.0" prefWidth="40.0" selected="true" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0" />
</children>
<Label id="name" fx:id="deviceNameLabel" alignment="CENTER" prefHeight="40.0" text="device Name"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="50.0"
AnchorPane.topAnchor="0.0"/>
<ToggleSwitch fx:id="disableButton" alignment="CENTER" layoutX="140.0" layoutY="20.0"
prefWidth="40.0" selected="true" AnchorPane.bottomAnchor="10.0"
AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"/>
</AnchorPane>
<Separator/>
<BorderPane VBox.vgrow="ALWAYS">
<left>
<Label id="pressure" fx:id="valueLabel" alignment="CENTER_RIGHT" minWidth="110.0" prefHeight="60.0" text="---" BorderPane.alignment="CENTER">
<Label id="pressure" fx:id="valueLabel" alignment="CENTER_RIGHT" minWidth="110.0" prefHeight="60.0"
text="---" BorderPane.alignment="CENTER">
<BorderPane.margin>
<Insets/>
</BorderPane.margin>
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</padding></Label>
</padding>
</Label>
</left>
<right>
<Label id="units" fx:id="unitLabel" prefHeight="60.0" prefWidth="75.0" text="mbar" BorderPane.alignment="CENTER">
<Label id="units" fx:id="unitLabel" prefHeight="60.0" prefWidth="75.0" text="mbar"
BorderPane.alignment="CENTER">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</padding></Label>
</padding>
</Label>
</right>
</BorderPane>
<Separator/>
<AnchorPane styleClass="statusPane">
<children>
<Label fx:id="status" maxWidth="200.0" text="Initializing" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</children>
<VBox.margin>
<Insets/>
</VBox.margin>
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</padding>
<Label fx:id="status" maxWidth="200.0" text="Initializing" wrapText="true"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"/>
</AnchorPane>
</children>
</VBox>
</children>
</AnchorPane>
</center>
</BorderPane>

43
numass-control/vac/src/main/resources/fxml/VacCollector.fxml
View File

@ -1,31 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.net.URL?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.ToggleButton?>
<?import javafx.scene.control.ToolBar?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?>
<AnchorPane id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="inr.numass.readvac.fx.VacCollectorController">
<?import java.net.URL?>
<BorderPane fx:id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="inr.numass.readvac.fx.VacCollectorView">
<stylesheets>
<URL value="@/styles/vacstyles.css"/>
</stylesheets>
<children>
<HBox AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<center>
<HBox>
<VBox alignment="TOP_CENTER" HBox.hgrow="ALWAYS">
<children>
<ToolBar>
<items>
<ToggleButton fx:id="startStopButton" mnemonicParsing="false" onAction="#onStartStopToggle" text="Measure" />
<ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle" text="Store" />
<ToggleButton fx:id="startStopButton" mnemonicParsing="false"
onAction="#onStartStopToggle" text="Measure"/>
<ToggleButton fx:id="storeButton" mnemonicParsing="false" onAction="#onStoreToggle"
text="Store"/>
<Separator orientation="VERTICAL"/>
<Label text="Interval: "/>
<ChoiceBox fx:id="intervalSelector" prefWidth="150.0"/>
@ -33,11 +26,9 @@
<Pane HBox.hgrow="ALWAYS"/>
<Separator orientation="VERTICAL"/>
<ToggleButton fx:id="logButton" mnemonicParsing="false" text="Console"/>
</items>
</ToolBar>
<AnchorPane fx:id="plotHolder" VBox.vgrow="ALWAYS"/>
<HBox styleClass="beveled">
<children>
<Label alignment="CENTER_RIGHT" text="Last update: ">
<font>
<Font size="24.0"/>
@ -48,16 +39,14 @@
<Font size="24.0"/>
</font>
</Label>
</children>
</HBox>
</children>
</VBox>
<Separator orientation="VERTICAL"/>
<VBox fx:id="vacBoxHolder" minWidth="200.0" spacing="2.0">
<HBox.margin>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
</HBox.margin></VBox>
</children>
</HBox.margin>
</VBox>
</HBox>
</children>
</AnchorPane>
</center>
</BorderPane>

6
numass-control/vac/src/main/resources/inr/numass/readvac/testConfig.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
<storage path="/home/numass-storage/"/>
<serialconfig P1="/dev/ttyUSB0" P2="/dev/ttyS5" P3="/dev/ttyS4" Px="/dev/ttyUSB1"/>
<run>12_2015.test</run>
</config>

8
numass-control/vac/src/main/resources/inr/numass/readvac/vac-config.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<numass-vac>
<p1 name="P1" color="red" port="com::/dev/ttyUSB0"/>
<p2 name="P2" color="blue" port="tcp::192.168.111.32:4002"/>
<p3 name="P3" color="green" port="tcp::192.168.111.32:4003"/>
<px name="Px" color="black" port="com::/dev/ttyUSB1"/>
<baratron name="Baratron" color="cyan" port="tcp::192.168.111.33:4004"/>
</numass-vac>

3
numass-main/src/main/groovy/inr/numass/scripts/Underflow.groovy
View File

@ -10,6 +10,7 @@ import hep.dataforge.io.ColumnedDataWriter
import hep.dataforge.storage.commons.StorageUtils
import hep.dataforge.tables.Table
import inr.numass.data.NMPoint
import inr.numass.data.NumassData
import inr.numass.data.NumassDataUtils
import inr.numass.storage.NumassStorage
import inr.numass.utils.UnderflowCorrection
@ -26,7 +27,7 @@ Collection<NMPoint> data = NumassDataUtils.joinSpectra(
.map {
println "loading ${it.key}"
it.value
}
}.map { (NumassData) it }
)
data = NumassDataUtils.substractReferencePoint(data, 18600d);

2
numass-main/src/main/java/inr/numass/tasks/NumassFitScanTask.java
View File

@ -84,7 +84,7 @@ public class NumassFitScanTask extends AbstractTask<FitResult> {
if (model.meta().hasMeta("filter")) {
model.dependsOn("filter", metaBuilder.build(), "prepare");
} else if (model.meta().hasMeta("empty")) {
model.dependsOn("substractEmpty", metaBuilder.build(), "prepare");
model.dependsOn("subtractEmpty", metaBuilder.build(), "prepare");
} else {
model.dependsOn("prepare", metaBuilder.build(), "prepare");
}

2
numass-main/src/main/java/inr/numass/tasks/NumassFitTask.java
View File

@ -72,7 +72,7 @@ public class NumassFitTask extends SingleActionTask<Table, FitResult> {
if (model.meta().hasMeta("filter")) {
model.dependsOn("filter", metaBuilder.build(), "prepare");
} else if (model.meta().hasMeta("empty")) {
model.dependsOn("substractEmpty", metaBuilder.build(), "prepare");
model.dependsOn("subtractEmpty", metaBuilder.build(), "prepare");
} else {
model.dependsOn("prepare", metaBuilder.build(), "prepare");
}

10
numass-main/src/main/java/inr/numass/tasks/NumassSubstractEmptySourceTask.java
View File

@ -41,7 +41,7 @@ import java.util.function.BiFunction;
public class NumassSubstractEmptySourceTask extends AbstractTask<Table> {
@Override
public String getName() {
return "substractEmpty";
return "subtractEmpty";
}
@Override
@ -50,7 +50,7 @@ public class NumassSubstractEmptySourceTask extends AbstractTask<Table> {
DataNode<Table> rootNode = data.getCheckedNode("prepare", Table.class);
Data<? extends Table> emptySource = data.getCheckedNode("empty", Table.class).getData();
rootNode.forEachDataWithType(Table.class, input -> {
Data<? extends Table> res = subtractBackground(input, emptySource);
Data<? extends Table> res = subtract(input, emptySource);
res.getGoal().onComplete((r, err) -> {
if (r != null) {
OutputStream out = model.getContext().io().out("merge", input.getName() + ".subtract");
@ -77,11 +77,11 @@ public class NumassSubstractEmptySourceTask extends AbstractTask<Table> {
}
private Data<? extends Table> subtractBackground(Data<? extends Table> mergeData, Data<? extends Table> emptyData) {
return DataUtils.combine(mergeData, emptyData, Table.class, mergeData.meta(), (BiFunction<Table, Table, Table>) this::subtractBackground);
private Data<? extends Table> subtract(Data<? extends Table> mergeData, Data<? extends Table> emptyData) {
return DataUtils.combine(mergeData, emptyData, Table.class, mergeData.meta(), (BiFunction<Table, Table, Table>) this::subtract);
}
private Table subtractBackground(Table merge, Table empty) {
private Table subtract(Table merge, Table empty) {
ListTable.Builder builder = new ListTable.Builder(merge.getFormat());
merge.stream().forEach(point -> {
MapPoint.Builder pointBuilder = new MapPoint.Builder(point);