Browse Source

update config

Jan Behrens 3 years ago
parent
commit
d035a02f3a
2 changed files with 17 additions and 15 deletions
  1. 5 5
      STS_channels.php
  2. 12 10
      STS_main.php

+ 5 - 5
STS_channels.php

@@ -3,7 +3,7 @@
 	// ########## SLOW CONTROL CHANNELS ##########
 
 	$adeiChannel = array(
-		// DPS Magnets		
+		// DPS Magnets
 		array(//0
 			/*"cscryo__ControlSystem_DPS__310_MAG_Magnetbetrieb__15", //"311-RBY-1-1051",
 			"cscryo__ControlSystem_DPS__310_MAG_Magnetbetrieb__18", //"311-RBY-1-1052",
@@ -58,14 +58,14 @@
 	);
 
 	$username = 'katrin';
-	$password = 'neutrino';
+	$password = 'katrin.Pauli%2020';
 	$context = stream_context_create(array(
 		'http' => array(
 			'header'  => "Authorization: Basic " . base64_encode("$username:$password"), "Connection: close\r\n"
 		)
 	));
 
-	
+
 	for ($id = 0; $id < sizeof($adeiChannel); $id++)
 	{
 		$adeiChannels = "";
@@ -79,7 +79,7 @@
 		$fileip = file_get_contents("https://adei-katrin.kaas.kit.edu/adei/services/getdata.php?db_server=virtual&db_name=srctree&db_group=-3&control_group=-3&virtual=srctree&srctree=" . $adeiChannels . "&rt=full&window=60,-1&format=csv", false, $context);
 		// old adei
       		//$fileip = file_get_contents("http://katrin.kit.edu/adei/services/getdata.php?db_server=virtual&db_name=srctree&db_group=-3&control_group=-3&virtual=srctree&srctree=" . $adeiChannels . "&window=60&format=csv", false, $context);
-		// backup server      		
+		// backup server
 		//$fileip = file_get_contents("http://ipekatrinbackupserv1.ipe.kit.edu/adei/services/getdata.php?db_server=virtual&db_name=srctree&db_group=-3&control_group=-3&virtual=srctree&srctree=" . $adeiChannels . "&window=60&format=csv", false, $context);
 		//echo $fileip . "<br>";
 
@@ -91,7 +91,7 @@
 			//echo $id . "," . $id2 . "," . $adeiValue[$id][$id2] . "<br>";
 		}
 	}
-	
+
 	// corresponding KATRIN numbers of sensors
 	$KatrinNumber = array(
 		// DPS Magnets

+ 12 - 10
STS_main.php

@@ -16,7 +16,9 @@
 	placeText($posYmagnetName, 240, "RSCM", 30, 5, $color);
 
 	// ########## WGTS ##########
-	placeTextWithWebsiteLink($posYCompName, 670, "WGTS", 70, 30, $color, "WGTS Status Overview", "wgts");
+	//placeTextWithWebsiteLink($posYCompName, 670, "WGTS", 70, 30, $color, "WGTS Status Overview", "wgts");
+    placeTextWithWebsiteLink($posYCompName, 670, "WGTS", 70, 30, $color, "WGTS Status Overview (BORA)", "wgts"
+"https://bora-wgts.kaas.kit.edu");
 	placeText($posYmagnetName, 340, "M5", 30, 5, $color);
 	placeText($posYmagnetName, 410, "M4", 30, 5, $color);
 	placeText($posYmagnetName, 550, "M1", 30, 5, $color);
@@ -52,12 +54,12 @@
 	placeText(0, 1570+50*($index-1), "M" . $index, 30, 5, $color);
 	placePicOrig(-15, 1580, "HorDashed20.png", "all magnets of CPS share one current");
 	placeTextWithLink(-35, 1650, sprintf('%.1F', $adeiValue[2][0])." A", 40, 3, "#FF0000", $KatrinNumber[2][0], $adeiChannel[2][0]);
-	$NlCPS = 20550 / 0.9133;	
+	$NlCPS = 20550 / 0.9133;
 	$BfieldCPS = 1.26e-6 * $adeiValue[2][0] * $NlCPS;	// mu0 * I * N/l
 	placeText(-35, 1690, "<--> ".sprintf('%.1F', $BfieldCPS)." T", 80, 3, "#FF0000");*/
-	
+
 	// ########## DPS ##########
-	placeTextWithWebsiteLink($posYCompName, 1330, "DPS", 70, 30, $color, "DPS Status Overview", 
+	placeTextWithWebsiteLink($posYCompName, 1330, "DPS", 70, 30, $color, "DPS Status Overview (BORA)",
 "https://bora-dps.kaas.kit.edu");
 	$thresDPS = 0.4; // magnet B in T
 	$tol = 180; // hall sensor B in mT 55
@@ -78,12 +80,12 @@
 		$link = $adeiChannel[0][$index-1];
 		$value = -1.26e-6 * $adeiValue[0][$index-1] * 36846.6/0.62811;	// mu0 * I * N/l
 		placeText($posYmagnetName, $posX, "M" . $index, 20, 5, $color);
-		placeTextWithLink($posYmagnetName-35, $posX, sprintf('%.1F', $value)." T", 40, 3, "#FF0000", $text, $link);		
+		placeTextWithLink($posYmagnetName-35, $posX, sprintf('%.1F', $value)." T", 40, 3, "#FF0000", $text, $link);
 	}
-	
+
 	// ########## CPS ##########
 	//placeTextWithWebsiteLink($posYCompName, 1650, "CPS", 70, 30, $color, "CPS Status Overview", "http://ipepc57.ipe.kit.edu:8888/status");
-	placeTextWithWebsiteLink($posYCompName, 1650, "CPS", 70, 30, $color, "CPS Status Overview", "https://bora-cps.kaas.kit.edu");
+	placeTextWithWebsiteLink($posYCompName, 1650, "CPS", 70, 30, $color, "CPS Status Overview (BORA)", "https://bora-cps.kaas.kit.edu");
 	$thresCPS = 0.1; // threshold magnetic field in T
 	for ($index = 1; $index <= 7; $index++)
 	{
@@ -91,7 +93,7 @@
 
 		$posX = 1570 + 50*($index-1);
 		$posY = 230+3;
-		
+
 		$link = $adeiChannel[1][0 + 2*($index-1)] . "," . $adeiChannel[1][1 + 2*($index-1)];
 		$value = ( $adeiValue[1][2*($index-1)] + $adeiChannel[1][1 + 2*($index-1)] ) /2.0 ;
 
@@ -118,10 +120,10 @@
 	placePicOrig(-15, 1754, "HorDashed20.png", "all magnets of CPS share one current");
 	placePicOrig(-15, 1840, "HorDashed10.png", "all magnets of CPS share one current");
 	placeTextWithLink(-35, 1640, sprintf('%.1F', $adeiValue[2][0])." A", 60, 3, "#FF0000", $KatrinNumber[2][0], $adeiChannel[2][0]);
-	$NlCPS = 20550 / 0.9133;	
+	$NlCPS = 20550 / 0.9133;
 	$BfieldCPS = 1.26e-6 * $adeiValue[2][0] * $NlCPS;	// mu0 * I * N/l
 	placeText(-35, 1690, "<--> ".sprintf('%.1F', $BfieldCPS)." T", 80, 3, "#FF0000");
-	
+
         // throughput & column density
         $Q = ($adeiValue[6][0]+3.2 ) * 1.0;
 	$Qtext = sprintf('%.1f', $Q)." sccm";