Skip to content

Commit 8dba453

Browse files
authored
Merge pull request #127 from ghalym/k-veto
DEV: Added TXI optics and PPS stopper and TMO ST1K4 to K veto list.
2 parents 03518e3 + 93ee93a commit 8dba453

File tree

2 files changed

+31198
-152
lines changed

2 files changed

+31198
-152
lines changed

Diff for: lcls-twincat-pmps/PMPS/DUTs/InternalDUT/K_Stopper.TcDUT

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ TYPE K_Stopper :
99
ST1K2 := 2, // RIX PPS stopper in
1010
MR1K1_IN := 3, // Monochromator focus optic vertical state
1111
MR1K1_OUT := 4, // Monochromator focus optic vertical state
12-
MR1K3_IN := 5, // TXI Offset Mirror horizontal state
13-
MR1K3_OUT := 6, // TXI Offset Mirror horizontal state
12+
MR1K3_IN := 5, // TXI MR1K3 Offset Mirror horizontal state
13+
MR1K3_OUT := 6, // TXI MR1K3 Offset Mirror horizontal state
1414
ST4K4 := 7, //TMO ST4K4 Photon Terminator In Limit Switch
15+
ST1K4 := 8, //TMO Photon Stopper in the FEE
16+
ST1K3 :=9, //TXI Kline PPS stopper in
17+
MR2K3_IN := 10, // TXI MR2K3 Offset Mirror state
18+
MR2K3_OUT := 11, // TXI MR2K3 Offset Mirror horizontal state
1519
DEFAULT := PMPS_GVL.MAX_VETO_DEVICES // DO NOT USE FOR ANYTHING
1620
);
1721
END_TYPE

0 commit comments

Comments
 (0)