updated K35 K65 display code

SDS_status_main.php

@@ -570,9 +570,8 @@ if (($MSmode == 5) or ($MSmode == 4))
     $posX = 10; // down/bottom (7)
 
 
-    
     if ($MSmode == 5)
-      { // only display in MS operation mode High-Voltage
+ 	{ // only display in MS operation mode High-Voltage
 
         $K35_value = $adeiValue[30][0];
         $K35_link = $adeiChannel[30][0];
@@ -601,16 +600,17 @@ if (($MSmode == 5) or ($MSmode == 4))
 	    echo '<h4 style="font-family: inherit; font-weight: plain; font-style: normal;">HV meas. timestamp: ' . date("r", $timestamp ) . '</h4>';
 	  }
 	  else echo '<font size="4" color="#000000">&nbsp;HV meas. OFFLINE </font><br>';
+
+   	//############# HV Monitoring K35 #################
 	
 	// HV switch for K35
 	$hv_switch1103_k35 = $adeiValue[35][2];
+	$K35_text = "K35 readout";
 	if ($hv_switch1103_k35 == 1) $K35_text = "K35 @ MoS Voltage";
-	else if ($hv_switch1103_k35 == 0) $K35_text = "K35 @ MS  Voltage";
-	$K35_text = "K35 @ MS Tank + IE";
+	else if ($hv_switch1103_k35 == 0) $K35_text = "K35 @ MS Voltage + IE";
 	
 	// voltage monitoring readout K35
 	$color = "#000000";
-  	//$factor_m = 1818.108;
 	$factor_m = 1972.462;
 	$factor_m_rel_error = 1.0e-6;
 	$offset = 4.97e-06;
@@ -623,33 +623,60 @@ if (($MSmode == 5) or ($MSmode == 4))
 	
 	// voltage display K35
 	$link = $K35_link;
-	$text = "K35 divider readout 436-REU-0-0201-0001, precision voltage value";
-	//$text = "K35 divider readout 436-REU-0-0201-0001, but connected to K65 in KNM6 at 436-REU-0-0101-0001, precision voltage value";
-	//$text = "K65 divider readout 436-REU-0-0301-0001, precision voltage value, 40 KV operation + regulation";
-        
+	$text = "K35 divider readout 436-REU-0-0201-0001, since KNM10 connected to main spectrometer precision voltage.";
+
+	// coordinate offset on display
+	$Xoffset = 660;
+	$Yoffset = 320;
+	
 	//	if (($K35_RunFlag > 0) && $local) 
-	if (($K35_RunFlag > 0) & ($value < -1))
+	if (($K35_RunFlag > 0) & ($value < 1))
 	  {
-	    placeText(342, 811, $K35_text, 140, 2, $color); // K35 voltage reading
-	    placeTextWithLink(320, 746, "U<sub>0</sub> = ".sprintf('%.3F', $value ) . "(" . sprintf('%.0F', $voltage_error ) .") V" , 270, 5, $color, $text, $link);
-	    if (($value < -19724.6) & ($value > -19724.7)) placeText(280, 796, "calibration in progress", 170, 2, "green"); // calibration ongoing
+	    placeTextWithLink($Yoffset+20, $Xoffset-54, "U<sub>0</sub> = ".sprintf('%.3F', $value ) . "(" . sprintf('%.0F', $voltage_error ) .") V" , 270, 5, $color, $text, $link);
 	  }
+
+	//display stability indicators
+	{
+	  if ((sizeof($REU0201) > 2) & ($value < 1000))
+	    {
+	      placeText($Yoffset+45, $Xoffset+11, $K35_text, 140, 2, $color); // K35 voltage reading
+	      
+	      if ($REU0201[0]['ppmdev'] <= 2e-6) $color1 = "lightgreen";
+	      if ($REU0201[1]['ppmdev'] <= 2e-6) $color2 = "lightgreen";
+	      if ($REU0201[2]['ppmdev'] <= 2e-6) $color3 = "lightgreen";
+	      if ($REU0201[3]['ppmdev'] <= 2e-6) $color4 = "lightgreen";
+	      
+	      if ($REU0201[0]['ppmdev'] > 2e-6) $color1 = "orange";
+	      if ($REU0201[1]['ppmdev'] > 2e-6) $color2 = "orange";
+	      if ($REU0201[2]['ppmdev'] > 2e-6) $color3 = "orange";
+	      if ($REU0201[3]['ppmdev'] > 2e-6) $color4 = "orange";
+	      
+	      if ($REU0201[0]['ppmdev'] > 5e-6) $color1 = "#FFA0A0";
+	      if ($REU0201[1]['ppmdev'] > 5e-6) $color2 = "#FFA0A0";
+	      if ($REU0201[2]['ppmdev'] > 5e-6) $color3 = "#FFA0A0";
+	      if ($REU0201[3]['ppmdev'] > 5e-6) $color4 = "#FFA0A0";
+	      
+	      placeBox($Yoffset+60, $Xoffset+115, "10s", 35, 1, $color1);
+	      placeBox($Yoffset+60, $Xoffset+80, "20s", 35, 1, $color2);
+	      placeBox($Yoffset+60, $Xoffset+45, "1m", 35, 1, $color3);
+	      placeBox($Yoffset+60, $Xoffset+10, "5m", 35, 1, $color4);
+	      
+	      echo '<h4 style="font-family: inherit; font-weight: plain; font-style: normal;">HV status timestamp: ' . $extraction_time_HV . '</h4>';
+	    }
+	  else placeText($Yoffset+45, $Xoffset+11, $K35_text, 140, 2, $color); // K35 voltage reading
+	}
 	
+	//############# HV Monitoring K65 #################
+
 	// HV switch for K65
 	$hv_switch1102_k65 = $adeiValue[35][1];
-	$K65_text = "K65 @ MS Tank + IE";
-	//$K65_text = "K35 @ MS Tank + IE";
-	//if ($hv_switch1102_k65 == 1) $K65_text = "K65 @ MoS Voltage";
-	//if ($hv_switch1102_k65 == 0) $K65_text = "K65 @ MS  Voltage";
+	$K65_text = "K65 readout";
+	if ($hv_switch1102_k65 == 1) $K65_text = "K65 @ MoS Voltage";
+	else if ($hv_switch1102_k65 == 0) $K65_text = "K65 @ MS Voltage + IE";
 	
 	// voltage monitoring readout K65
 	$color = "#000000";
-    //$factor_m = 1818.108;
-	//$factor_m_rel_error = 0.02/$factor_m;
-	//$offset = -4.1e-6;
-	//$gain = 1.00000136;
-        
-	$factor_m = 3636.259;
+  	$factor_m = 3636.259;
 	$factor_m_rel_error = 1.0e-6; // including calibration, gain and offset error
 	$offset = 8.72e-06;
 	$offset_error = 1.9e-7;
@@ -657,52 +684,53 @@ if (($MSmode == 5) or ($MSmode == 4))
 	$gain_error = 7.7e-8;
 	$value = ($K65_value - $offset) * $gain * $factor_m;
 	$voltage_error = abs($value * $factor_m_rel_error * 1e3); // in mV
-	if ($voltage_error < 1) { $voltage_error = 1; }       
+	if ($voltage_error < 1) { $voltage_error = 1; }        
 	
 	// voltage display K65
 	$link = $K65_link;
-	$text = "K65 divider channel 436-REU-0-0301-0001, precision voltage value";
-	//$text = "K65 divider channel 436-REU-0-0301-0001, precision voltage value, KNM5 calibration, in 2021 used for 436-REU-0-0201-0001 as long as K35 is down.";
+	$text = "K65 divider channel 436-REU-0-0301-0001, precision voltage value, KNM5 calibration, in 2022 connected to K35";
+
+	$Xoffset = 930;
+	$Yoffset = 320;
 	
-	//if (($K65_RunFlag > 0) && $local)
-	if (($K65_RunFlag > 0) & ($value < -1))
+	if (($K65_RunFlag > 0) & ($value < 1))
 	  {
 	    if (($value < -19724.6) & ($value > -19724.7)) placeText(340, 796, "calibration in progress", 170, 2, "green"); // calibration ongoing
-	    placeTextWithLink(358, 746, "U<sub>0</sub> = ".sprintf('%.3F', $value ) . "(" . sprintf('%.0F', $voltage_error ) .") V" , 270, 5, $color, $text, $link);
-
-	    
-	    //display stability indicators
-	    //if ($local)
+	    placeTextWithLink($Yoffset+20, $Xoffset-54, "U<sub>0</sub> = ".sprintf('%.3F', $value ) . "(" . sprintf('%.0F', $voltage_error ) .") V" , 270, 5, $color, $text, $link);
+	  }
+	
+	//display stability indicators
+	{
+	  if ((sizeof($REU0301) > 2) & ($value < 1000))
 	    {
-	      if ((sizeof($flukeE) > 2) & ($value < -1000))
-		{
-		  placeText(381, 811, $K65_text, 140, 2, $color); // K65 voltage reading
-		  
-		  if ($flukeE[0]['ppmdev'] <= 2e-6) $color1 = "lightgreen";
-		  if ($flukeE[1]['ppmdev'] <= 2e-6) $color2 = "lightgreen";
-		  if ($flukeE[2]['ppmdev'] <= 2e-6) $color3 = "lightgreen";
-		  if ($flukeE[3]['ppmdev'] <= 2e-6) $color4 = "lightgreen";
-		  
-		  if ($flukeE[0]['ppmdev'] > 2e-6) $color1 = "orange";
-		  if ($flukeE[1]['ppmdev'] > 2e-6) $color2 = "orange";
-		  if ($flukeE[2]['ppmdev'] > 2e-6) $color3 = "orange";
-		  if ($flukeE[3]['ppmdev'] > 2e-6) $color4 = "orange";
-		  
-		  if ($flukeE[0]['ppmdev'] > 5e-6) $color1 = "#FFA0A0";
-		  if ($flukeE[1]['ppmdev'] > 5e-6) $color2 = "#FFA0A0";
-		  if ($flukeE[2]['ppmdev'] > 5e-6) $color3 = "#FFA0A0";
-		  if ($flukeE[3]['ppmdev'] > 5e-6) $color4 = "#FFA0A0";
-		  
-		  placeBox(396, 915, "10s", 35, 1, $color1);
-		  placeBox(396, 880, "20s", 35, 1, $color2);
-		  placeBox(396, 845, "1m", 35, 1, $color3);
-		  placeBox(396, 810, "5m", 35, 1, $color4);
-		  
-		  echo '<h4 style="font-family: inherit; font-weight: plain; font-style: normal;">HV status timestamp: ' . $extraction_time_HV . '</h4>';
-		}
-	      else placeText(381, 811, $K65_text, 140, 2, $color); // K65 voltage reading
+	      placeText($Yoffset+45, $Xoffset+11, $K65_text, 140, 2, $color); // K65 voltage reading
+	      
+	      if ($REU0301[0]['ppmdev'] <= 2e-6) $color1 = "lightgreen";
+	      if ($REU0301[1]['ppmdev'] <= 2e-6) $color2 = "lightgreen";
+	      if ($REU0301[2]['ppmdev'] <= 2e-6) $color3 = "lightgreen";
+	      if ($REU0301[3]['ppmdev'] <= 2e-6) $color4 = "lightgreen";
+	      
+	      if ($REU0301[0]['ppmdev'] > 2e-6) $color1 = "orange";
+	      if ($REU0301[1]['ppmdev'] > 2e-6) $color2 = "orange";
+	      if ($REU0301[2]['ppmdev'] > 2e-6) $color3 = "orange";
+	      if ($REU0301[3]['ppmdev'] > 2e-6) $color4 = "orange";
+	      
+	      if ($REU0301[0]['ppmdev'] > 5e-6) $color1 = "#FFA0A0";
+	      if ($REU0301[1]['ppmdev'] > 5e-6) $color2 = "#FFA0A0";
+	      if ($REU0301[2]['ppmdev'] > 5e-6) $color3 = "#FFA0A0";
+	      if ($REU0301[3]['ppmdev'] > 5e-6) $color4 = "#FFA0A0";
+	      
+	      placeBox($Yoffset+60, $Xoffset+115, "10s", 35, 1, $color1);
+	      placeBox($Yoffset+60, $Xoffset+80, "20s", 35, 1, $color2);
+	      placeBox($Yoffset+60, $Xoffset+45, "1m", 35, 1, $color3);
+	      placeBox($Yoffset+60, $Xoffset+10, "5m", 35, 1, $color4);
+	      
+	      echo '<h4 style="font-family: inherit; font-weight: plain; font-style: normal;">HV status timestamp: ' . $extraction_time_HV . '</h4>';
 	    }
-	  }
+	  else placeText($Yoffset+45, $Xoffset+11, $K65_text, 140, 2, $color); // K65 voltage reading
+	}
+	      
+	//############# HV Monitoring Kal_U1 #################
 	
 	// voltage monitoring readout Kal1 e.g. JRL at PS
 	// in 2021 used for IE Common monitoring
@@ -719,19 +747,18 @@ if (($MSmode == 5) or ($MSmode == 4))
 	//if ($voltage_error*100 < 1) { $voltage_error = 0.2; }
 	if ($voltage_error*100 < 0.002) { $voltage_error = 0.002; }
 	
-	// voltage display K35
+	// voltage display
 	$link = $Kal1_link;
 	//	$text = "JRL divider at Kal1 monitoring input 436-REU-0-0501-0001, precision voltage value";
-	$text = "DVM at IE Common, 436-REU-0-0401-001, precision voltage value";
-
+	$text = "DVM at IE Common, 436-REU-0-0301-001, precision voltage value";
+	
 	if ($Kal1_RunFlag > 0)
 	{
 	  placeText(304, 815, $Kal1_text, 130, 2, $color); // Kal1 voltage reading
 	  if (abs($value) > 36000) placeText(490, 116, "calibration in progress", 170, 2, "green"); // calibration ongoing
 	  placeTextWithLink(284, 765, "U<sub>IE</sub> = ".sprintf('%.3F', $value ) . "(" . sprintf('%.0F', $voltage_error*100 ) .") V" , 230, 4, $color, $text, $link);
 	}
-
-	
+      
 	// Post Regulation Current Monitor
 
 	$U_ist = abs($adeiValue[10][0]);