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

Closedown

Browse Source
This commit is contained in:
x07maop
2015-06-23 11:12:54 +02:00
parent a21650cbd9
commit 104e633217
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/EnergyScan.java
View File

@@ -93,6 +93,7 @@ public class EnergyScan extends Panel {
if (result instanceof Exception ){
batchIndex=0;
batch=null;
evalAsync("caput('START', 'STOP')");
throw ((Exception)result);
}
if (batch!=null){
@@ -169,7 +170,7 @@ public class EnergyScan extends Panel {
void plot() {
try {
if ((scanPlot!=null) && (scanSeries!=null) && scanPlot.isShowing()&& (count!=null)){
scanPlot.setTitle("hhh");
//buttonGroupPlot.getSelection().
Integer c = count.take();
if (c == null) {
scanSeries.clear();
@@ -342,6 +343,7 @@ public class EnergyScan extends Panel {
args.put("DELAY", (Double) spinnerDelay.getValue());
args.put("MODE", comboMode.getSelectedItem().toString());
args.put("OFFSET", (Double) spinnerOffset.getValue());
args.put("ALPHA", (Double) spinnerAlpha.getValue());
String file = expandPath(textFile.getText());
args.put("FILE", file);

9
script/EnergyScan.py
View File

@@ -23,17 +23,19 @@ FOLDER = '2015_04/20150417'
FILE = 'Fe_plus'
"""
print "Scan"
print E1,E2,TIME,DELAY,MODE ,OFFSET ,FOLDER ,FILE ,ALPHA
"""
#Pre-actions
#cawait('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's')
caput('X07MA-ID:MODE', MODE)
time.sleep(1.0)
if MODE == 'LINEAR':
caput('X07MA-ID:ALPHA', ALPHA)
cawait('X07MA-ID:DONE', 'DONE', type = 's')
#cawait('X07MA-ID:DONE', 'DONE', type = 's')
caput('X07MA-ID:ENERGY-OFFS', OFFSET)
cawait('X07MA-ID:DONE', 'DONE', type = 's')
#cawait('X07MA-ID:DONE', 'DONE', type = 's')
caput('E1', E1)
caput('E2', E2)
caput('TIME', TIME)
@@ -51,4 +53,5 @@ caput('START', '1')
#Post-actions
cawait('START', 'STOP', type = 's')
"""
time.sleep(2.0)