This commit is contained in:
@@ -29,6 +29,7 @@ public class Scienta extends AreaDetector {
|
||||
final String channelCtrl;
|
||||
final Device[] monitoredChildren;
|
||||
final boolean test;
|
||||
final ChannelDouble exposureDev;
|
||||
|
||||
public Scienta(final String name, final String channelPrefix, boolean test) {
|
||||
this(name, channelPrefix + ":cam1", channelPrefix + ":image1", test);
|
||||
@@ -49,6 +50,7 @@ public class Scienta extends AreaDetector {
|
||||
energyWidth.setAccessType(AccessType.Read);
|
||||
energyCount = new ChannelInteger(name + " energy count", channelCtrl + ":COUNT_RBV", false);
|
||||
energyCount.setAccessType(AccessType.Read);
|
||||
exposureDev = new ChannelDouble(name + " exposure time", channelCtrl + ":AcquireTime", 3, false);
|
||||
|
||||
lowThetaY = new ControlledVariable(name + " low Theta Y", channelCtrl + ":LOW_THETA_Y", channelCtrl + ":LOW_THETA_Y_RBV", false);
|
||||
centerThetaY = new ControlledVariable(name + " center Theta Y", channelCtrl + ":CENTRE_THETA_Y", channelCtrl + ":CENTRE_THETA_Y_RBV", false);
|
||||
@@ -118,7 +120,7 @@ public class Scienta extends AreaDetector {
|
||||
stepSize,totalSteps,currentStep, exposuresComplete, passEnergy,
|
||||
lensMode, acquisitionMode, energyMode, detectorMode, elementSet,
|
||||
slices, slicesReadback, channels, channelsReadback, excitationEnergy,
|
||||
estTime, detectorState, status
|
||||
exposureDev, estTime, detectorState, status
|
||||
};
|
||||
addChildren(monitoredChildren);
|
||||
addChildren(new Device[]{
|
||||
@@ -345,6 +347,10 @@ public class Scienta extends AreaDetector {
|
||||
public ChannelInteger getEnergyCount() {
|
||||
return energyCount;
|
||||
}
|
||||
|
||||
public ChannelDouble getExposureDev() {
|
||||
return exposureDev;
|
||||
}
|
||||
|
||||
public ControlledVariable getLowThetaY() {
|
||||
return lowThetaY;
|
||||
|
||||
Reference in New Issue
Block a user