Browse Source

added APR status indicator

Thomas Thümmler 2 years ago
parent
commit
3dd5dc3e01
2 changed files with 63 additions and 62 deletions
  1. 59 60
      SDS_status_channels.php
  2. 4 2
      SDS_status_main.php

+ 59 - 60
SDS_status_channels.php

@@ -137,38 +137,39 @@ $adeiChannel = array(
 			   "csms__ControlSystem_MS__432VAK_Tank__21",  // VAI 0105 Soll
 			   "csms__ControlSystem_MS__432VAK_Tank__33",  // PS-MS Flapper VMO 4110 AUF
 			   "csms__ControlSystem_MS__432VAK_Tank__36"   // PS-MS Flapper VMO 4110 AUF
-			   ),
-		     array(                                  //HV subsystem 
-			   "hv__katrin-hv_rep__0__39",    // MS vessel IST
-			   "hv__katrin-hv_rep__0__38",    // MS vessel SOLL
+			     ),
+		     array(                                  //HV subsystem , index 10
+			   "hv__katrin-hv_rep__0__39",    // MS vessel U_IST
+			   "hv__katrin-hv_rep__0__38",    // MS vessel U_SOLL
 			   "hv__katrin-hv_rep__0__87",    // MS IE Common electrode IST
 			   "hv__katrin-hv_rep__0__86",    // MS IE Common electrode SOLL
 			   "hv__katrin-hv_rep__0__71",    // MS IE dipole west IST
 			   "hv__katrin-hv_rep__0__70",    // MS IE dipole west SOLL
 			   "hv__katrin-hv_rep__0__79",    // MS IE dipole east IST
 			   "hv__katrin-hv_rep__0__78",    // MS IE dipole east SOLL
-			   "hv__katrin-hv_rep__0__63",
-			   "hv__katrin-hv_rep__0__62",
-			   "hv__katrin-hv_rep__0__55",
-			   "hv__katrin-hv_rep__0__54",
+			   "hv__katrin-hv_rep__0__63",    // Anti Penning south U ist
+			   "hv__katrin-hv_rep__0__62",    // Anti Penning south U soll
+			   "hv__katrin-hv_rep__0__55",    // Anti Penning north U ist 
+			   "hv__katrin-hv_rep__0__54",    // Anti Penning north U soll
 			   "hv__katrin-hv_rep__0__132",   // dipole relay status 
 			   "hv__katrin-hv_rep__0__131",   // dipole relay status
 			   "hv__katrin-hv_rep__0__95",    // PS vessel IST
 			   "hv__katrin-hv_rep__0__94",    // PS vessel SOLL
-			   "hv__katrin-hv_rep__0__103",    // PS IE1 Ch1A IST
-			   "hv__katrin-hv_rep__0__102",    // PS IE1 Ch1A SOLL
-			   "hv__katrin-hv_rep__0__111",    // PS IE2 Ch1B IST
-			   "hv__katrin-hv_rep__0__110",    // PS IE2 Ch1B SOLL
-			   "hv__katrin-hv_rep__0__119",    // PS IE3 Ch2A IST
-			   "hv__katrin-hv_rep__0__118",    // PS IE3 Ch2A SOLL
-			   "hv__katrin-hv_rep__0__127",    // PS IE4 Ch2B IST
-			   "hv__katrin-hv_rep__0__126",    // PS IE4 Ch2B SOLL
+			   "hv__katrin-hv_rep__0__103",   // PS IE1 Ch1A IST
+			   "hv__katrin-hv_rep__0__102",   // PS IE1 Ch1A SOLL
+			   "hv__katrin-hv_rep__0__111",   // PS IE2 Ch1B IST
+			   "hv__katrin-hv_rep__0__110",   // PS IE2 Ch1B SOLL
+			   "hv__katrin-hv_rep__0__119",   // PS IE3 Ch2A IST
+			   "hv__katrin-hv_rep__0__118",   // PS IE3 Ch2A SOLL
+			   "hv__katrin-hv_rep__0__127",   // PS IE4 Ch2B IST
+			   "hv__katrin-hv_rep__0__126",   // PS IE4 Ch2B SOLL
 			   "hv__katrin-hv_rep__0__47",    // MS IE Precision Supply IST
 			   "hv__katrin-hv_rep__0__46",    // MS IE Precision Supply SOLL
-   	           "hv__katrin-hv_rep__0__134",   // K35 regulated temperature actual value
+			   "hv__katrin-hv_rep__0__134",   // K35 regulated temperature actual value
 			   "hv__katrin-hv_rep__0__140",   // K65 regulated temperature actual value
-               "hv__katrin-hv_rep__0__41"     // MS vessel I_IST  (#28)
-							     ),
+			   "hv__katrin-hv_rep__0__41",    // MS vessel I_IST  (#28)
+			   "hv__katrin-hv_rep__0__165"    // Post regulation PID running flag (#29)
+			    ),
 		     array(
 			   "hv__katrin-hv_rep__1__3",
 			   "hv__katrin-hv_rep__1__10",
@@ -274,12 +275,9 @@ $adeiChannel = array(
 			   "hv__katrin-hv_rep__2__163"
 			   ),
 		     array(
-//			   "csms__ControlSystem_MS__430KRYO_Baffel__111",  // RTP 1081
-//			   "csms__ControlSystem_MS__430KRYO_Baffel__123",  // RTP 2081
-//			   "csms__ControlSystem_MS__430KRYO_Baffel__135",  // RTP 3081
-			   "csms__ControlSystem_MS__430KRYO_Baffel__105",  // RTP 1080
-			   "csms__ControlSystem_MS__430KRYO_Baffel__117",  // RTP 2080
-			   "csms__ControlSystem_MS__430KRYO_Baffel__129",  // RTP 3080
+			   "csms__ControlSystem_MS__430KRYO_Baffel__111",  // RTP 1081
+			   "csms__ControlSystem_MS__430KRYO_Baffel__123",  // RTP 2081
+			   "csms__ControlSystem_MS__430KRYO_Baffel__135",  // RTP 3081
 			   "csms__ControlSystem_MS__430KRYO_Baffel__147",  // VAI 5411
 			   "csms__ControlSystem_MS__430KRYO_Baffel__153",  // VAI 5421
 			   "csms__ControlSystem_MS__430KRYO_Baffel__159",  // VAI 5431
@@ -335,12 +333,12 @@ $adeiChannel = array(
 			   "precmm0__PrecMagnet__SouthRing__15",
 			   "precmm0__PrecMagnet__SouthRing__16"
 			   ),
-             // (index 19) FPD status values
+		     // FPD status values (index 19)
 		     array(
 			   "fpd__katrin_rep__0__198",
 			   "fpd__katrin_rep__0__199",
 			   "fpd__katrin_rep__0__200",
-			   "fpd__katrin_rep__0__180"   // port 0100 saphire window temp
+			   "fpd__katrin_rep__0__180"   // saphire window at port 0100 temperature
 			   ),
 		     array(
 			   "csms__ControlSystem_MS__435HZ_Temperatur__27",
@@ -348,7 +346,7 @@ $adeiChannel = array(
 			   "csms__ControlSystem_MS__435HZ_Temperatur__42",
 			   "csms__ControlSystem_MS__435HZ_Temperatur__45"
 			   ),
-		     array(                                  // EMCS+LFCS current set points
+		     array(                                  // EMCS+LFCS current set points (index 21)
 			   "aircoils__aircoils_rep__1__2",   //433-ELV-1-0101
 			   "aircoils__aircoils_rep__1__3",   //433-ELV-1-0201
 			   "aircoils__aircoils_rep__1__4",   //433-ELV-1-0301
@@ -469,7 +467,7 @@ $adeiChannel = array(
 			   ) ,
 		     // Voltage monitoring K35 etc. (index 30)
 		     array(
-               "hv__katrin-hv_rep__7__2",  //K35 divider voltage reading
+			   "hv__katrin-hv_rep__7__2",  //K35 divider voltage reading
 			   "hv__katrin-hv_rep__7__3",  //K35 divider voltage timestamp
 			   "hv__katrin-hv_rep__7__4",  //K35 divider voltage measurement running
 			   "hv__katrin-hv_rep__7__5",  //K65 divider voltage reading
@@ -478,7 +476,8 @@ $adeiChannel = array(
 			   "hv__katrin-hv_rep__7__8",  //JRL divider voltage reading KAL1, PS
 			   "hv__katrin-hv_rep__7__9",  //JRL divider voltage timestamp KAL1, PS
 			   "hv__katrin-hv_rep__7__10", //JRL divider voltage measurement running
-  			   ),
+			   ),
+		     
 		     // Detector Valve and HV grounding interlock (index 31)
 		     array(
 			   "csms__ControlSystem_MS__436HV_Interlook__6",  //CRT-5221 or 522-VAO-1010 clearance, detector gate valve clearence 
@@ -507,7 +506,7 @@ $adeiChannel = array(
 		     array(
 			   "csbl__ControlSystem_BL__408Beamline_Elektroden__0",  // 320-VAO-0004 clearance, V4 clearance from SDS 
 			   "csbl__ControlSystem_BL__408Beamline_Elektroden__3",  // 320-VAO-0004 position, V4 open or closed
-			   "csbl__ControlSystem_BL__408Beamline_Elektroden__60", // 522-VAO-1010 position, detector gate valve open or closed
+			   "csbl__ControlSystem_BL__408Beamline_Elektroden__60",  // 522-VAO-1010 position, detector gate valve open or closed
 			   "csbl__ControlSystem_BL__408Beamline_Elektroden__6",  // 418-EEL-2150 on off value 1 = on
 			   "csbl__ControlSystem_BL__408Beamline_Elektroden__9",  // 418-EEL-2150 actual value
 			   "csbl__ControlSystem_BL__408Beamline_Elektroden__12", // 418-EEL-2150 polatity 0 = pos
@@ -523,43 +522,43 @@ $adeiChannel = array(
 			   ),
 		     // Precision magnetometer for SAP North Ring (index 37)
 		     array(
-			   "precmm0__PrecMagnet__SAP_NorthRing__0",		//precision sensor (SAP NorthRing, BW) B_x
-			   "precmm0__PrecMagnet__SAP_NorthRing__1",		//precision sensor (SAP NorthRing, BW) B_y
-			   "precmm0__PrecMagnet__SAP_NorthRing__2",		//precision sensor (SAP NorthRing, BW) B_z
+			   "precmm0__PrecMagnet__SAP_NorthRing__0",	//precision sensor (SAP NorthRing, BW) B_x
+			   "precmm0__PrecMagnet__SAP_NorthRing__1",	//precision sensor (SAP NorthRing, BW) B_y
+			   "precmm0__PrecMagnet__SAP_NorthRing__2",	//precision sensor (SAP NorthRing, BW) B_z
 			   "precmm0__PrecMagnet__SAP_NorthRing__3",     //precision sensor (SAP NorthRing, TW) B_x
-			   "precmm0__PrecMagnet__SAP_NorthRing__4",		//precision sensor (SAP NorthRing, TW) B_y
-			   "precmm0__PrecMagnet__SAP_NorthRing__5",		//precision sensor (SAP NorthRing, TW) B_z
-			   "precmm0__PrecMagnet__SAP_NorthRing__6",		//precision sensor (SAP NorthRing, TE) B_x
-			   "precmm0__PrecMagnet__SAP_NorthRing__7",		//precision sensor (SAP NorthRing, TE) B_y
-			   "precmm0__PrecMagnet__SAP_NorthRing__8",		//precision sensor (SAP NorthRing, TE) B_z
-			   "precmm0__PrecMagnet__SAP_NorthRing__9",		//precision sensor (SAP NorthRing, BE) B_x
+			   "precmm0__PrecMagnet__SAP_NorthRing__4",	//precision sensor (SAP NorthRing, TW) B_y
+			   "precmm0__PrecMagnet__SAP_NorthRing__5",	//precision sensor (SAP NorthRing, TW) B_z
+			   "precmm0__PrecMagnet__SAP_NorthRing__6",	//precision sensor (SAP NorthRing, TE) B_x
+			   "precmm0__PrecMagnet__SAP_NorthRing__7",	//precision sensor (SAP NorthRing, TE) B_y
+			   "precmm0__PrecMagnet__SAP_NorthRing__8",	//precision sensor (SAP NorthRing, TE) B_z
+			   "precmm0__PrecMagnet__SAP_NorthRing__9",	//precision sensor (SAP NorthRing, BE) B_x
 			   "precmm0__PrecMagnet__SAP_NorthRing__10",	//precision sensor (SAP NorthRing, BE) B_y
 			   "precmm0__PrecMagnet__SAP_NorthRing__11",	//precision sensor (SAP NorthRing, BE) B_z
 			   "precmm0__PrecMagnet__SAP_NorthRing__12",	//precision sensor (SAP NorthRing, B) B_x
 			   "precmm0__PrecMagnet__SAP_NorthRing__13",	//precision sensor (SAP NorthRing, B) B_y
-			   "precmm0__PrecMagnet__SAP_NorthRing__14"		//precision sensor (SAP NorthRing, B) B_z
+			   "precmm0__PrecMagnet__SAP_NorthRing__14"	//precision sensor (SAP NorthRing, B) B_z
 			   ),
 		     // Precision magnetometer for SAP South Ring (index 38)
 		     array(
-			   "precmm0__PrecMagnet__SAP_SouthRing__0",		//precision sensor (SAP SouthRing, BW) B_x
-			   "precmm0__PrecMagnet__SAP_SouthRing__1",		//precision sensor (SAP SouthRing, BW) B_y
-			   "precmm0__PrecMagnet__SAP_SouthRing__2",		//precision sensor (SAP SouthRing, BW) B_z
-			   "precmm0__PrecMagnet__SAP_SouthRing__3",		//precision sensor (SAP SouthRing, TW) B_x
-			   "precmm0__PrecMagnet__SAP_SouthRing__4",		//precision sensor (SAP SouthRing, TW) B_y
-			   "precmm0__PrecMagnet__SAP_SouthRing__5",		//precision sensor (SAP SouthRing, TW) B_z
-			   "precmm0__PrecMagnet__SAP_SouthRing__6",		//precision sensor (SAP SouthRing, TE) B_x
-			   "precmm0__PrecMagnet__SAP_SouthRing__7",		//precision sensor (SAP SouthRing, TE) B_y
-			   "precmm0__PrecMagnet__SAP_SouthRing__8",		//precision sensor (SAP SouthRing, TE) B_z
-			   "precmm0__PrecMagnet__SAP_SouthRing__9",		//precision sensor (SAP SouthRing, BE) B_x
+			   "precmm0__PrecMagnet__SAP_SouthRing__0",	//precision sensor (SAP SouthRing, BW) B_x
+			   "precmm0__PrecMagnet__SAP_SouthRing__1",	//precision sensor (SAP SouthRing, BW) B_y
+			   "precmm0__PrecMagnet__SAP_SouthRing__2",	//precision sensor (SAP SouthRing, BW) B_z
+			   "precmm0__PrecMagnet__SAP_SouthRing__3",	//precision sensor (SAP SouthRing, TW) B_x
+			   "precmm0__PrecMagnet__SAP_SouthRing__4",	//precision sensor (SAP SouthRing, TW) B_y
+			   "precmm0__PrecMagnet__SAP_SouthRing__5",	//precision sensor (SAP SouthRing, TW) B_z
+			   "precmm0__PrecMagnet__SAP_SouthRing__6",	//precision sensor (SAP SouthRing, TE) B_x
+			   "precmm0__PrecMagnet__SAP_SouthRing__7",	//precision sensor (SAP SouthRing, TE) B_y
+			   "precmm0__PrecMagnet__SAP_SouthRing__8",	//precision sensor (SAP SouthRing, TE) B_z
+			   "precmm0__PrecMagnet__SAP_SouthRing__9",	//precision sensor (SAP SouthRing, BE) B_x
 			   "precmm0__PrecMagnet__SAP_SouthRing__10",	//precision sensor (SAP SouthRing, BE) B_y
-			   "precmm0__PrecMagnet__SAP_SouthRing__11"		//precision sensor (SAP SouthRing, BE) B_z
+			   "precmm0__PrecMagnet__SAP_SouthRing__11"	//precision sensor (SAP SouthRing, BE) B_z
 			   ),
 		     // status of PS ion monitor (index 39)
 		     array(
-			       "cspsionen__PS_Ionen__Amperemeter1__0",	//418-REI-0-10-01 measured mean value of ion monitor current
-			       "cspsionen__PS_Ionen__Amperemeter1__5"	//418-REI-0-10-06 lock status of ion monitoring alarm (0=armed, 1=off))	
-                   ),
-             // B460 OPUS weather stations at PS (index 40)
+			   "cspsionen__PS_Ionen__Amperemeter1__0",	//418-REI-0-10-01 measured mean value of ion monitor current
+			   "cspsionen__PS_Ionen__Amperemeter1__5"	//418-REI-0-10-06 lock status of ion monitoring alarm (0=armed, 1=off)
+			   ),		     
+		     // B460 OPUS weather stations at PS (index 40)
 		     array(
 			   "weather__Opus_WeatherStations__415OWS_PS_platform__0",	//415-RTY-0-9111-0001 PS weather station temperatuer in C
 			   "weather__Opus_WeatherStations__415OWS_PS_platform__1",	//415-RTY-0-9111-0002 PS weather station temperature in F
@@ -594,8 +593,8 @@ $adeiChannel = array(
 			   "weather__Opus_WeatherStations__435OWS_HV_cage__6",	//435-RTY-0-9113-0001 HV weather station abs pressure in hPa
 			   "weather__Opus_WeatherStations__435OWS_HV_cage__7",	//435-RTY-0-9113-0002 HV weather station rel presuure in hPa
 			   "weather__Opus_WeatherStations__435OWS_HV_cage__8"	//435-RTY-0-9114-0001 HV weather station voltage in V
-			   ),	    
-             // B460 OPUS weather stations at MS bottom (index 43)
+			   ),	     
+		     // B460 OPUS weather stations at MS bottom (index 43)
 		     array(
 			   "weather__Opus_WeatherStations__435OWS_MS_bottom__0",	//435-RTY-0-9131-0001 MS_bottom weather station temperatuer in C
 			   "weather__Opus_WeatherStations__435OWS_MS_bottom__1",	//435-RTY-0-9131-0002 MS_bottom weather station temperature in F
@@ -607,7 +606,7 @@ $adeiChannel = array(
 			   "weather__Opus_WeatherStations__435OWS_MS_bottom__7",	//435-RTY-0-9133-0002 MS_bottom weather station rel presuure in hPa
 			   "weather__Opus_WeatherStations__435OWS_MS_bottom__8"	        //435-RTY-0-9134-0001 MS_bottom weather station voltage in V
 			   ),	     
-             // B460 OPUS weather stations at MS top (index 44)
+		     // B460 OPUS weather stations at MS top (index 44)
 		     array(
 			   "weather__Opus_WeatherStations__435OWS_MS_top__0",	//435-RTY-0-9141-0001 MS_top weather station temperatuer in C
 			   "weather__Opus_WeatherStations__435OWS_MS_top__1",	//435-RTY-0-9141-0002 MS_top weather station temperature in F
@@ -630,7 +629,7 @@ $adeiChannel = array(
 			   "weather__Opus_WeatherStations__445OWS_MoS_general__6",	//445-RTY-0-9113-0001 MoS_general weather station abs pressure in hPa
 			   "weather__Opus_WeatherStations__445OWS_MoS_general__7",	//445-RTY-0-9113-0002 MoS_general weather station rel presuure in hPa
 			   "weather__Opus_WeatherStations__445OWS_MoS_general__8"	//445-RTY-0-9114-0001 MoS_general weather station voltage in V
-			   )			     
+			   )
 		     );
 
 ?>

+ 4 - 2
SDS_status_main.php

@@ -5,7 +5,7 @@ if ($onsite) placeBox(-135, 1190, "Inside KIT CN network", 250, 2, "#DDDDDD");
 if (substr($ip, 0, 7) == "134.107") placeBox(25, 10, "MPP Munich network", 250, 2, "#FFFFFF");
 if (substr($ip, 0, 7) == "128.176") placeBox(25, 10, "WWU Muenster network", 250, 2, "#FFFFFF");
 
-//  ####  global variable for PS and MS operation mode
+// #####  global variable for PS and MS operation mode
 $PSmode = $adeiValue[32][0];
 $MSmode = $adeiValue[33][0];
 
@@ -729,9 +729,10 @@ if (($MSmode == 5) or ($MSmode == 4))
 	$R_K65 = 54.5e6;
 	$R_K35 = 58.65e6;
 	$R_ges = (1-$hv_switch1103_k35)*$R_K35+(1-$hv_switch1102_k65)*$R_K65;
-	
+
 	$I_noPR = $U_ist / $R_ges * 1000.0;
 	$I_PR = $I_ist - $I_noPR;
+	$APR_on = abs($adeiValue[10][29]);
 
 	$verbose = false;  // switch for status outputs, dev mode
 	
@@ -778,6 +779,7 @@ if (($MSmode == 5) or ($MSmode == 4))
 	  {
 	    placeTextWithLink(466,325, sprintf('%.2F mA', $I_PR), 60, 2, $color, "Estimated current through post regulation triode shunt. 0.46-0.8 mA for optimal performance.", $adeiChannel[10][28]);
 	    placeTextWithLink(480,325, sprintf('%2.0F W', $P_PR), 60, 2, $color, "Estimated power consumption of post regulation triode shunt. Must be < 28 W.", $adeiChannel[10][28]);
+	    if ($APR_on) placeTextWithLink(491,335, "APR", 40, 0, "#40AA40", "Advanced Post Regulation (APR) status.", $adeiChannel[10][29]);
 	  }
 	
   }  // end of PCS7 mode switch