pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 1.14

Browse Source
This commit is contained in:
root
2020-08-14 16:25:14 +02:00
parent 481360d1f8
commit 9547784e17
18 changed files with 152 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/ScreenPanel6.java
View File

@@ -2297,10 +2297,10 @@ public class ScreenPanel6 extends Panel {
System.out.println("Setting laser state: " + value + " - bunch" + bunch);
//Epics.putq("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", value ? 0 : 1);
if ((bunch<=0) || (bunch==1)){
Epics.putq("SWISSFEL-STATUS:Bunch-1-OnDelay-Sel", value ? 0 : 1);
Epics.putq("SIN-TIMAST-TMA:Bunch-1-OnDelay-Sel", value ? 0 : 1);
}
if ((bunch<=0) || (bunch==2)){
Epics.putq("SWISSFEL-STATUS:Bunch-2-OnDelay-Sel", value ? 0 : 1);
Epics.putq("SIN-TIMAST-TMA:Bunch-2-OnDelay-Sel", value ? 0 : 1);
}
Epics.putq("SIN-TIMAST-TMA:Beam-Apply-Cmd.PROC", 1);
@@ -4269,6 +4269,9 @@ public class ScreenPanel6 extends Panel {
if (ret == OptionResult.No) {
laserOn2= false;
}
if (ret == OptionResult.Cancel) {
return;
}
}
} else {
ret = SwingUtils.showOption(getTopLevel(), "Capture Background", "Do you want to capture background now?", OptionType.OkCancel);