pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2023-08-15 11:39:59 +02:00
parent 425eb19873
commit 5b369efe2d
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/HoloScan.java
View File

@@ -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);
}

11
plugins/ManipulatorScan.java
View File

@@ -3,7 +3,8 @@
*/
import ch.psi.pshell.device.Motor;
import ch.psi.pshell.epics.Scienta;
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;
@@ -40,10 +41,10 @@ public class ManipulatorScan extends ScriptProcessor {
@Override
public void onInitialize(int runCount) {
comboMotorActionPerformed(null);
Scienta scienta = (Scienta) getDevice("Scienta");
dvpAcqTime.setDevice(scienta.getAcquisitionTime());
AreaDetector scienta = (AreaDetector) getDevice("Scienta");
dvpAcqTime.setDevice(scienta.getChild(scienta.getName() + " acquire time"));
}
protected void onTimer(){
try{
int steps = radioSteps.isSelected() ?
@@ -607,7 +608,7 @@ public class ManipulatorScan extends ScriptProcessor {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
try {
abort();
getDevice("Scienta").stop();
((Startable) getDevice("Scienta")).stop();
} catch (Exception ex) {
showException(ex);
}

7
plugins/PhotonEnergy.java
View File

@@ -2,11 +2,10 @@
* Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
*/
import ch.psi.pshell.epics.Scienta;
import ch.psi.pshell.epics.AreaDetector;
import ch.psi.pshell.scan.Scan;
import ch.psi.pshell.scan.ScanListener;
import ch.psi.pshell.scan.ScanRecord;
import ch.psi.pshell.ui.Panel;
import ch.psi.pshell.ui.ScriptProcessor;
import ch.psi.utils.Convert;
import ch.psi.utils.State;
@@ -53,8 +52,8 @@ public class PhotonEnergy extends ScriptProcessor {
@Override
public void onInitialize(int runCount) {
Scienta scienta = (Scienta) getDevice("Scienta");
dvpAcqTime.setDevice(scienta.getAcquisitionTime());
AreaDetector scienta = (AreaDetector) getDevice("Scienta");
dvpAcqTime.setDevice(scienta.getChild(scienta.getName() + " acquire time"));
updateTable();
}