This commit is contained in:
x07maop
2015-06-23 13:42:39 +02:00
parent b412254738
commit 88c84d87ab

View File

@@ -89,7 +89,8 @@ public class EnergyScan extends Panel {
void stopScan() throws Exception{
evalAsync("caput('START', 'STOP')");
}
/*
void convertFile() throws Exception{
String cmd = "/sls/X07MA/data/x07maop/bin/modify_otf.pl ";
String folder = "~/Data1/" + ((String) Epics.get("FOLDER", String.class)) + "/";
@@ -106,7 +107,7 @@ public class EnergyScan extends Panel {
//~/Data1/2015_06/20150623/23Jun_11_08_Fe_plus.txt
//~/Data1/2015_06/20150623/20150623_1144_Fe_plus_0000.txt
}
*/
long scanStartTimestamp;
@@ -121,7 +122,7 @@ public class EnergyScan extends Panel {
stopScan();
throw ((Exception)result);
}
convertFile();
//convertFile();
if (batch!=null){
batchIndex++;
if (batchIndex>=batch.length){