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

Startup

Browse Source
This commit is contained in:
boccioli_m
2015-06-26 15:38:39 +02:00
parent 686cd558be
commit 931f687b8a
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.properties
View File

@@ -1,4 +1,4 @@
#Fri May 29 15:04:38 CEST 2015
#Fri Jun 26 15:38:11 CEST 2015
autoSaveScanData=true
createSessionFiles=false
dataFile={data}/{year}_{month}/{date}/{date}_{time}_{context}
@@ -7,7 +7,7 @@ dataFilesCreation=true
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{context}
dataProvider=text
dataScanFlushRecords=false
dataScanStrategy=fda
dataScanStrategy=table
devicePoolFile={config}/devices.properties
deviceUpdateStrategyFile={config}/update.properties
imageSourcesFile={config}/imaging.properties

2
config/devices.properties
View File

@@ -20,4 +20,4 @@
#det=ch.psi.pshell.epics.AreaDetector 13SIM1:cam1 13SIM1:image1
#$scienta=ch.psi.pshell.epics.Scienta 13SIM1:cam1 13SIM1:image1
#$slit=ch.psi.pshell.epics.Slit MOT1 MOT2
vhq1=PowerSupply PO2DV-NCS-VHQ1
#vhq1=PowerSupply PO2DV-NCS-VHQ1

6
config/plugins.properties
View File

@@ -1,7 +1,7 @@
#Tue Jun 23 10:18:31 CEST 2015
#Fri Jun 26 14:47:27 CEST 2015
.\\home\\plugins\\TestMain.java=disabled
.\\home\\plugins\\TestingListDetails.java=enabled
.\\home\\plugins\\TestingListDetails.java=disabled
.\\home\\plugins\\TestingList.java=enabled
.\\home\\plugins\\TestingPanel.java=disabled
.\\home\\plugins\\PowerSupply.java=enabled
.\\home\\plugins\\PowerSupply.java=disabled
.\\home\\plugins\\plublic.java=disabled

13
plugins/TestingList.java
View File

@@ -902,7 +902,7 @@ public class TestingList extends Panel {
System.out.println("Running test '" + sTestName + "'. No parameters found.");
}
args = new HashMap();
args.put("ret", "");
//args.put("ret", "");
args.put("parameters", mParameters);
args.put("device", sDeviceName);
args.put("status", false);
@@ -958,13 +958,14 @@ public class TestingList extends Panel {
public void run() {
// code in the other thread, can reference "var" variable
try {
System.out.println("Parameters passed: " + String.valueOf(mParameters));
System.out.println("A4");
System.out.println("Parameters passed: " + String.valueOf(args.get("parameters")));
System.out.println("A4");
for (String key:args.keySet()){
getController().getScriptManager().setVar(key,args.get(key));
System.out.println("key: "+ key + " val: "+ String.valueOf(args.get(key)));
// getController().getScriptManager().setVar(key,args.get(key));
//setGlobalVar(key, (Object) args.get(key));
}
// setGlobalsVars(args);
System.out.println("A5");
//runAsync(sTestPath, args);
Object ret = eval("parallelize((run,('Motor Test 3 100ms'), (run,('Motor Test 3 200ms')))");