Closedown
This commit is contained in:
@@ -2,11 +2,9 @@
|
||||
* Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
|
||||
*/
|
||||
|
||||
import ch.psi.pshell.device.Device;
|
||||
import ch.psi.pshell.device.DeviceAdapter;
|
||||
import ch.psi.pshell.device.Motor;
|
||||
import ch.psi.pshell.epics.Scienta;
|
||||
import ch.psi.pshell.ui.Panel;
|
||||
import ch.psi.pshell.device.Startable;
|
||||
import ch.psi.pshell.epics.AreaDetector;
|
||||
import ch.psi.pshell.ui.ScriptProcessor;
|
||||
import ch.psi.utils.State;
|
||||
import ch.psi.utils.swing.SwingUtils;
|
||||
@@ -42,10 +40,10 @@ public class HoloScan extends ScriptProcessor {
|
||||
public void onInitialize(int runCount) {
|
||||
Motor phi = (Motor) getDevice("ManipulatorPhi");
|
||||
Motor theta = (Motor) getDevice("ManipulatorTheta");
|
||||
Scienta scienta = (Scienta) getDevice("Scienta");
|
||||
AreaDetector scienta = (Scienta) getDevice("Scienta");
|
||||
motorPanelPhi.setDevice(phi);
|
||||
motorPanelTheta.setDevice(theta);
|
||||
dvpAcqTime.setDevice(scienta.getAcquisitionTime());
|
||||
dvpAcqTime.setDevice(scienta.getChild(scienta.getName() + " acquire time"));
|
||||
try{
|
||||
spinnerFromPhi.setModel(new SpinnerNumberModel(Math.max(phi.getMinValue(),(Double)spinnerFromPhi.getValue()), phi.getMinValue(), phi.getMaxValue(), 1.0));
|
||||
spinnerToPhi.setModel(new SpinnerNumberModel(Math.min(phi.getMaxValue(),(Double)spinnerToPhi.getValue()), phi.getMinValue(), phi.getMaxValue(), 1.0));
|
||||
@@ -633,7 +631,7 @@ public class HoloScan extends ScriptProcessor {
|
||||
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
|
||||
try {
|
||||
abort();
|
||||
((Scienta) getDevice("Scienta")).stop();
|
||||
((Startable) getDevice("Scienta")).stop();
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user