From fced88ee04fb074091f61eb1c2fb8ccd579baf55 Mon Sep 17 00:00:00 2001 From: Arno Schoenmakers <schoenmakers@astron.nl> Date: Thu, 22 Jan 2015 19:43:59 +0000 Subject: [PATCH] TAsk #7055 #7064: Added two changes made by Arthur from Issue #7055 to prerelease branch --- MAC/Deployment/data/PVSS/data/MCUbase.dpdef | 2 ++ MAC/Deployment/data/PVSS/data/PVSSDataPoints.base | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MAC/Deployment/data/PVSS/data/MCUbase.dpdef b/MAC/Deployment/data/PVSS/data/MCUbase.dpdef index a50ab2b8c93..d8763371249 100644 --- a/MAC/Deployment/data/PVSS/data/MCUbase.dpdef +++ b/MAC/Deployment/data/PVSS/data/MCUbase.dpdef @@ -135,6 +135,7 @@ NavPanelConfig.NavPanelConfig 1# LOFAR_Pipelines 9# Observation_Pipelines 9# CobaltStationInput_Processes 9# + CobaltGPUProc_Processes 9# TypeName NavigatorUserSaves.NavigatorUserSaves 1# @@ -236,6 +237,7 @@ root.UniBoard_Hardware NavPanelConfig "Hardware/Station_UniBoard.pnl" root.LOFAR_Pipelines NavPanelConfig "Observations/Pipelines.pnl" root.Observation_Pipelines NavPanelConfig "Observations/Pipeline_overview.pnl" root.CobaltStationInput_Processes NavPanelConfig "Processes/ObservationIBEmbedded.pnl" +root.CobaltGPUProc_Processes NavPanelConfig "Processes/ObservationGPUProcEmbedded.pnl" rootSaves.Queries.Query NavigatorUserSaves "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 20 AND '_original.._value' < 30", "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 30 AND '_original.._value' < 40", "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 40 AND '_original.._value' < 50", "SELECT '_original.._value' FROM 'LOFAR_PIC*.status.state' REMOTE ALL WHERE '_original.._value' >= 50 AND '_original.._value' < 60" rootSaves.Queries.Short NavigatorUserSaves "All hardware in Maintenance", "All hardware in Test", "All hardware in Suspicious", "All hardware in Alarm" diff --git a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base index dc964681118..7f8780b95b2 100644 --- a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base +++ b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base @@ -72,7 +72,7 @@ CobaltRack - C N LOFAR_PIC_Cobalt CobaltNode - C N LOFAR_PIC_Cobalt_@cobaltnode@ CobaltNIC CNI C Y LOFAR_PIC_Cobalt_@cobaltnode@_@cobaltnic@ CobaltStationField - C N LOFAR_PermSW_@stationfield@ -OSCobaltNode - C N LOFAR_PermSW_@oscobaltnode@ +OSCobaltNode - C N LOFAR_ObsSW_@observation@_@oscobaltnode@ CobaltStationInput CSI C Y LOFAR_PermSW_@stationfield@_CobaltStationInput CobaltGPUProc CGP C Y LOFAR_ObsSW_@observation@_@oscobaltnode@_@cobaltgpuproc@ CobaltOutputProc COP C Y LOFAR_ObsSW_@observation@_CobaltOutputProc -- GitLab