|
@@ -734,18 +734,19 @@ if (($MSmode == 5) or ($MSmode == 4))
|
|
|
|
|
|
// MS Tank from Precision HCP Supply or Standard HCN
|
|
|
$text = "MS TANK";
|
|
|
- $ms_hcn_soll = $adeiValue[10][1];
|
|
|
- $ms_hcp_soll = $adeiValue[10][25];
|
|
|
- $HCP = false;
|
|
|
+ $ms_hcp_soll = $adeiValue[10][1]; // [1] and [25] and HCP HCN flipped 2021-02-16 for new HCP
|
|
|
+ $ms_hcn_soll = $adeiValue[10][25];
|
|
|
+
|
|
|
+ $HCP = true;
|
|
|
if ($ms_hcn_soll == 0) {
|
|
|
if ($ms_hcp_soll == 0) { $text = $text . " OFF";}
|
|
|
else { $text = $text . " HCP"; $HCP = true; }
|
|
|
} else { $text = $text . " HCN"; $HCP = false; }
|
|
|
placeText(70, 830, $text, 100, 2, "#000000"); // mainspec tank
|
|
|
// switch values here between HCN and HCP in Value and Channel Array !!!
|
|
|
- if ($HCP) { $adeiValue[10][0] = -$adeiValue[10][24]; $adeiValue[10][1] = $adeiValue[10][25];
|
|
|
- $adeiChannel[10][0] = $adeiChannel[10][24]; $adeiChannel[10][1] = $adeiChannel[10][25]; }
|
|
|
+ //if ($HCP) { $adeiValue[10][0] = -$adeiValue[10][24]; $adeiValue[10][1] = $adeiValue[10][25]; $adeiChannel[10][0] = $adeiChannel[10][24]; $adeiChannel[10][1] = $adeiChannel[10][25]; }
|
|
|
|
|
|
+ if ($HCP) { $adeiValue[10][0] = -$adeiValue[10][0];}
|
|
|
|
|
|
placeText(110-$posY, 845, "W7-11", 70, 2, "#000000"); // w7-11
|
|
|
placeText(503+$posY+$posX, 845, "E7-11", 70, 2, "#000000"); // e7-11
|
|
@@ -1279,7 +1280,7 @@ if ($PSmode != 5)
|
|
|
|
|
|
$color = "#000000";
|
|
|
// ########## STS ##########
|
|
|
- placeTextLeftWithWebsiteLink(370, 1, "←STS", 60, 5, $color, "Link to STS Status Overview", "https://status-sts.kaas.kit.edu/");
|
|
|
+ placeTextLeftWithWebsiteLink(370, 1, "←STS", 60, 5, $color, "Link to STS Status Overview", "https://katrin.kit.edu/status-sts/");
|
|
|
|
|
|
// ########## WebTrium Link ##########
|
|
|
placeTextLeftWithWebsiteLink(20, 1450, "→ WebTrium", 155, 4, $color, "Link to WebTrium Overview", "https://webtrium.mpp.mpg.de");
|
|
@@ -1291,12 +1292,12 @@ if ($PSmode != 5)
|
|
|
placeTextLeftWithWebsiteLink(80, 1450, "→ Brew Kaffee Beans and Idle", 275, 4, $color, "Link to Brew Kaffee Beans and Idle page at UW/Seattle", "http://katana.npl.washington.edu/~sanshiro/");
|
|
|
|
|
|
// ########## MoS und HV Status ##########
|
|
|
- placeTextLeftWithWebsiteLink(110, 1450, "→ MoS and HV Status", 240, 4, $color, "Link to Monitor Spectrometer and High Voltage Status Overview", "https://bora-mos.kaas.kit.edu");
|
|
|
+ placeTextLeftWithWebsiteLink(110, 1450, "→ MoS and HV Status", 240, 4, $color, "Link to Monitor Spectrometer and High Voltage Status Overview", "https://katrin.kit.edu/bora-mos");
|
|
|
|
|
|
// ########## Magnet Overview ##########
|
|
|
- placeTextLeftWithWebsiteLink(140, 1450, "→ Magnet Control System", 270, 4, $color, "Link to Magnet Control System Status Page", "https://bora-mcs.kaas.kit.edu");
|
|
|
+ placeTextLeftWithWebsiteLink(140, 1450, "→ Magnet Control System", 270, 4, $color, "Link to Magnet Control System Status Page", "https://katrin.kit.edu/bora-mcs");
|
|
|
// ########## PS ##########
|
|
|
-// placeText(100, 170, "PS", 60, 30, $color);
|
|
|
+ // placeText(100, 170, "PS", 60, 30, $color);
|
|
|
|
|
|
|
|
|
|