Merge pull request #68 from tongju12/TMO-FEB-28-COMPARE

adding new comparison
pcdshub · Mar 1, 2025 · 93929df · 93929df
2 parents c956074 + 88bd7f4
commit 93929df
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Spreadsheet/KFE/TMO-alarms.csv b/Spreadsheet/KFE/TMO-alarms.csv
@@ -7,7 +7,7 @@
 ,,MR1K4:SOMS:PRSM:1_RBV,Cool pressure,,,,
 ,,MR1K4:SOMS:PIP:01:PRESS_RBV,MR1K4 ion pump,,,,
 ,,MR1K4:SOMS:GCC:1:PRESS_RBV,GCC,,,,
-,,MR1K4:SOMS:COATING:STATE:GET_RBV,MR1K4 Coating,,,SIOC:SYS0:ML00:AO628 <= 400 & MR1K1:BEND:COATING:STATE:GET_RBV==B4C,
+,,major://SIOC:SYS0:ML00:AO628 <= 450 && MR1K4:SOMS:COATING:STATE:GET_RBV==2,MR1K4 Coating,,,,
 ,,MR1K4:SOMS:GANTRY_X_RBV,Gantry X,,,,
 ,,MR1K4:SOMS:GANTRY_Y_RBV,Gantry Y,,,,
 ,,MR1K4:SOMS:COATING:STATE:PMPS:ARB:ENABLE_RBV,MR1K4 arbiter status,,,,
@@ -18,13 +18,13 @@
 ,,MR2K4:KBO:RTD:CHIN:R:TEMP_RBV,Temperature,,,,
 ,,MR2K4:KBO:RTD:CHIN:L:TEMP_RBV,Temperature,,,,
 ,,MR2K4:KBO:GCC:01:PRESS_RBV,GCC,,,,
-,,MR2K4:KBO:COATING:STATE:GET_RBV,MR2K4 Coating,,,SIOC:SYS0:ML00:AO628 <= 400 & PPS:NEH1:1:ST3K4INSUM!=1,
+,,major://SIOC:SYS0:ML00:AO628 <= 450 && MR2K4:KBO:COATING:STATE:GET_RBV==2,MR2K4 Coating,,,,
 ,,MR2K4:KBO:COATING:STATE:PMPS:ARB:ENABLE_RBV,MR2K4 arbiter status,,,,
 2,MR3K4,,,,,,
 ,,MR3K4:KBO:FWM:1_RBV,Flow sensor,,,,
 ,,MR3K4:KBO:RTD:CHIN:R:TEMP_RBV,Temperature,,,,
 ,,MR3K4:KBO:RTD:CHIN:L:TEMP_RBV,Temperature,,,,
-,,MR3K4:KBO:COATING:STATE:GET_RBV,MR3K4 Coating,,,SIOC:SYS0:ML00:AO628 <= 400 & PPS:NEH1:1:ST3K4INSUM!=1,
+,,major://SIOC:SYS0:ML00:AO628 <= 450 && MR3K4:KBO:COATING:STATE:GET_RBV==2,MR3K4 Coating,,,,
 ,,MR3K4:KBO:COATING:STATE:PMPS:ARB:ENABLE_RBV,MR3K4 arbiter status,,,,
 2,MR4K4,,,,,,
 ,,MR4K4:KBO:RTD:CHIN:L:TEMP_RBV,Temperature,,,,
@@ -88,7 +88,8 @@
 1,STOPPER,,,,,,
 2,ST1K4,,,,,,
 ,,ST1K4:TEST:MMS:STATE:ERR_RBV,ST1K4 error state,,,,
-,,ST1K4:TEST:MMS:STATE:GET_RBV,ST1K4 state,,,PPS:NEH1:1:ST3K4INSUM!=0,
+,,minor://(ST1K4:TEST:MMS:STATE:GET_RBV!=1 && PPS:NEH1:1:ST3K4INSUM==0),ST1K4 state,,,,
+,,major://(ST1K4:TEST:MMS:STATE:GET_RBV!=2 && PPS:NEH1:1:ST3K4INSUM==1),ST1K4 state,,,,
 ,,ST1K4:TEST:MMS:STATE:ST3K4_AUTO_RBV,ST1K4 follow ST3K4 status,,,,
 1,IP1,,,,,,
 2,Main Chamber Pressure,,,,,,
@@ -124,4 +125,10 @@
 ,,LM1K4:QADC:01:OUT0_EDGE2,QADC signal monitor,,,LM1K4:QADC:01:OUT0_EDGE2>0,
 1,LASER PHASE MOTOR,,,,,,
 ,,LAS:LHN:LLG2:01:PHAS:ERROR,Laser phase feedback,,,,
-,,major://(abs(SL1K0:POWER:ACTUAL_YWIDTH_RBV) * 1000) > AT1K0:GAS_MA_Y:MMS:1,slits too wide,,,,
+,,PLC:LAS:OPCPA:01:LPS:AMPHOS_RELAY:ENABLE_RBV,AMPHOS TRIP,,,,
+0,KFE BEAMLINES,,,,,,
+1,SL1K0,,,,,,
+,,major://((SL1K0:POWER:ACTUAL_YWIDTH_RBV>2 || SL1K0:POWER:ACTUAL_XWIDTH_RBV>2)&&AT1K0:GAS_MAA:01:Y:STATE:GET_RBV==1),SL1K0 depending on AT1K0,,,,
+,,major://((SL1K0:POWER:ACTUAL_YWIDTH_RBV>6.8 || SL1K0:POWER:ACTUAL_XWIDTH_RBV>6.8)&&AT1K0:GAS_MAA:01:Y:STATE:GET_RBV==2),SL1K0 depending on AT1K0,,,,
+,,major://((SL1K0:POWER:ACTUAL_YWIDTH_RBV>8 || SL1K0:POWER:ACTUAL_XWIDTH_RBV>8)&&AT1K0:GAS_MAA:01:Y:STATE:GET_RBV==3),SL1K0 depending on AT1K0,,,,
+,,major://((SL1K0:POWER:ACTUAL_YWIDTH_RBV>8.5 || SL1K0:POWER:ACTUAL_XWIDTH_RBV>8.5)&&AT1K0:GAS_MAA:01:Y:STATE:GET_RBV==4),SL1K0 depending on AT1K0,,,,