V2
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
|
||||
import ch.psi.jcae.ChannelException;
|
||||
import ch.psi.pshell.device.AccessType;
|
||||
import ch.psi.pshell.device.ArrayCalibration;
|
||||
import ch.psi.pshell.device.CameraImageDescriptor;
|
||||
import ch.psi.pshell.device.MatrixCalibration;
|
||||
import ch.psi.pshell.device.Device;
|
||||
import ch.psi.pshell.device.DeviceAdapter;
|
||||
import ch.psi.pshell.device.DeviceListener;
|
||||
import ch.psi.pshell.device.Readable.ReadableCalibratedArray;
|
||||
import java.io.IOException;
|
||||
@@ -13,9 +11,6 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import ch.psi.pshell.epics.*;
|
||||
import ch.psi.utils.State;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* Implementation of Scienta spectrometer analyser.
|
||||
@@ -72,7 +67,7 @@ public class Scienta extends AreaDetector {
|
||||
totalDataPoints = new ChannelInteger(name + " total points", channelCtrl + ":TOTAL_DATA_POINTS_RBV", false);
|
||||
totalDataPoints.setAccessType(AccessType.Read);
|
||||
|
||||
totalDataPoints.addListener(new DeviceAdapter() {
|
||||
totalDataPoints.addListener(new DeviceListener() {
|
||||
@Override
|
||||
public void onValueChanged(Device device, Object value, Object former) {
|
||||
try {
|
||||
@@ -129,7 +124,7 @@ public class Scienta extends AreaDetector {
|
||||
stats[4] = new Stats("Counts", 5);
|
||||
addChildren(stats);
|
||||
|
||||
stepTime.addListener(new DeviceAdapter() {
|
||||
stepTime.addListener(new DeviceListener() {
|
||||
@Override
|
||||
public void onValueChanged(Device device, Object value, Object former) {
|
||||
int time_ms = (int) (((Double) value) * 1000);
|
||||
@@ -149,7 +144,7 @@ public class Scienta extends AreaDetector {
|
||||
}
|
||||
});
|
||||
|
||||
frames.addListener(new DeviceAdapter() {
|
||||
frames.addListener(new DeviceListener() {
|
||||
@Override
|
||||
public void onValueChanged(Device device, Object value, Object former) {
|
||||
int num_frames = (Integer)value;
|
||||
|
||||
Reference in New Issue
Block a user