diff --git a/config/config.properties b/config/config.properties index e4d40c2..cca9f93 100644 --- a/config/config.properties +++ b/config/config.properties @@ -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 diff --git a/config/devices.properties b/config/devices.properties index 2daceed..75acf10 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -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 diff --git a/config/plugins.properties b/config/plugins.properties index 0592e51..62400e8 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -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 diff --git a/plugins/TestingList.java b/plugins/TestingList.java index bbc2baa..8252d8b 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -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')))");