Browse Source

added orca run number, aligned icons

Thomas Thümmler 5 months ago
parent
commit
c09958f2de
1 changed files with 21 additions and 7 deletions
  1. 21 7
      SDS_status_main.php

+ 21 - 7
SDS_status_main.php

@@ -392,8 +392,8 @@ if ((substr($ip, 0, 13) == "141.52.12.158") | (substr($ip, 0, 13) == "141.52.12.
 		else if ($value == 0) { $pic = $pic . "Standby"; }
 	}
 
-	placePicWithLink(368-30, 1475, $pic . ".png", 30, "status FPD UHV cryo pump
green: on, yellow: on but isolated, red: off, grey: undefined", $adeiChannel[6][3]);
-	placeTextWithLink(368, 1455, $text, 70, 3, "#000000", "temperature FPD UHV cryo pump", $adeiChannel[6][3]);
+	placePicWithLink(345, 1480, $pic . ".png", 30, "status FPD UHV cryo pump
green: on, yellow: on but isolated, red: off, grey: undefined", $adeiChannel[6][3]);
+	placeTextWithLink(375, 1460, $text, 70, 3, "#000000", "temperature FPD UHV cryo pump", $adeiChannel[6][3]);
 
 
 
@@ -406,8 +406,8 @@ if ((substr($ip, 0, 13) == "141.52.12.158") | (substr($ip, 0, 13) == "141.52.12.
 	else if ($adeiValue[6][9] == 0 && $adeiValue[6][10] == 1) { $pic = $pic . "GIn"; $text = "IN"; }
 	else if ($adeiValue[6][9] == 0 && $adeiValue[6][10] == 0) { $pic = $pic . "Off"; $text = "IN"; }
 	$link = $adeiChannel[6][9] . "," . $adeiChannel[6][10];
-	placePicWithLink(368-30, 1510, $pic . ".png", 30, "status FPD sources (electron and gamma source)
green: retracted (out), red: inserted (in), grey: undefined", $link);
-	placeTextWithLink(368, 1490, $text, 70, 3, "#000000", "status FPD sources (electron and gamma source)", $link);
+	placePicWithLink(345, 1525, $pic . ".png", 30, "status FPD sources (electron and gamma source)
green: retracted (out), red: inserted (in), grey: undefined", $link);
+	placeTextWithLink(375, 1505, $text, 70, 3, "#000000", "status FPD sources (electron and gamma source)", $link);
 
 
 
@@ -1071,7 +1071,7 @@ if ($PSmode == 5)
        // ########## Split Ring Electrodes ##########
 
         $srPosX = array( 59, 284, 1420 );
-        $srPosY = array( 402, 402, 370 );
+        $srPosY = array( 402, 402, 377 );
         $srKATRINNumber = array( "418-EEL-3-2150", "418-EEL-3-4150", "438-EEL-3-5150" );
 
 	// CPS-PS electrode 418-EEL-2150
@@ -1122,8 +1122,8 @@ if ($PSmode == 5)
 		$link = $link . $adeiChannel[6][4 + $id] . ",";
 	}
 	$link = substr($link, 0, strlen($link) - 1);
-	placePicWithLink(200, 1600, $pic . ".png", 30, "status FPD power
green: on, red: off, grey: undefined", $link);
-	placeTextWithLink(227, 1580, $text, 70, 4, "#000000", "status FPD power", $link);
+	placePicWithLink(345, 1570, $pic . ".png", 30, "status FPD power
green: on, red: off, grey: undefined", $link);
+	placeTextWithLink(374, 1550, $text, 70, 4, "#000000", "status FPD power", $link);
 
 	// carousel
 
@@ -1137,6 +1137,20 @@ if ($PSmode == 5)
 	placeText(275, 1565, "carousel", 100, 2, "#000000");
 
 
+       // ORCA run number
+
+        $value = $adeiValue[6][13];
+	    $link = $adeiChannel[6][13];
+	    $color = "#EEEEEE";
+
+        $run_number = floor($value);
+        $subrun_number = floor(($value-$run_number)*1000);
+
+        placePicWithLink(189, 1534, "orca_icon.png", 45, "ORCA run.subrun number [530-CHN-0-0001-0001]", $link);
+        placeBox(188, 1580, "   Run: ".$run_number."  ", 85, 2, $color);
+        placeBox(203, 1580, "Subrun: ".$subrun_number."  ", 85, 2, $color);
+
+
 
 	// ########## MAGNETOMETERS ##########