From 6884c58319587e74e5e95eb55e61efd723e5a568 Mon Sep 17 00:00:00 2001
From: Thomas Juerges <4-jurges@users.noreply.git.astron.nl>
Date: Fri, 27 Nov 2020 23:01:32 +0100
Subject: [PATCH] Update Tango DB files for PCC arrays
---
CDB/LOFAR_ConfigDb.json | 172 +++++----------------------------------
CDB/thomas_ConfigDb.json | 170 +++++---------------------------------
2 files changed, 43 insertions(+), 299 deletions(-)
diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index a992a3fa1..16c5a6843 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -12,7 +12,7 @@
"RCUSCC": {
"PTS/RCUSCC/1": {
"attribute_properties": {
- "Attenuator1_R": {
+ "Attenuator_R": {
"event_period": [
"0"
],
@@ -21,7 +21,7 @@
"1"
]
},
- "Attenuator1_RW": {
+ "Attenuator_RW": {
"event_period": [
"0"
],
@@ -30,7 +30,7 @@
"1"
]
},
- "Attenuator2_R": {
+ "Band_R": {
"event_period": [
"0"
],
@@ -39,7 +39,7 @@
"1"
]
},
- "Attenuator2_RW": {
+ "Band_RW": {
"event_period": [
"0"
],
@@ -48,7 +48,7 @@
"1"
]
},
- "Attenuator3_R": {
+ "CLK_PLL_locked_R": {
"event_period": [
"0"
],
@@ -57,7 +57,7 @@
"1"
]
},
- "Attenuator3_RW": {
+ "LED_R": {
"event_period": [
"0"
],
@@ -66,118 +66,7 @@
"1"
]
},
- "Band1_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band1_RW": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band2_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band2_RW": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band3_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band3_RW": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Dither1_Frequency_R": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "Dither1_Frequency_RW": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "Dither2_Frequency_R": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "Dither2_Frequency_RW": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "LED0_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "LED0_RW": {
+ "LED_RW": {
"event_period": [
"0"
],
@@ -213,11 +102,11 @@
"-1",
"1"
]
- }
+ },
},
"properties": {
"OPC_Server_Name": [
- "DESPi"
+ "despi"
],
"OPC_Server_Port": [
"4842"
@@ -225,45 +114,28 @@
"OPC_Time_Out": [
"1.0"
],
- "RCU": [
- "1"
- ],
"polled_attr": [
- "attenuator1_r",
- "60000",
- "attenuator1_rw",
- "60000",
- "attenuator2_r",
- "60000",
- "attenuator2_rw",
- "60000",
- "attenuator3_r",
- "60000",
- "attenuator3_rw",
- "60000",
- "band1_r",
- "60000",
- "band1_rw",
+ "pwr_dig_r",
"60000",
- "band2_r",
+ "state",
+ "1000",
+ "status",
+ "1000",
+ "temperature_r",
"60000",
- "band2_rw",
+ "attenuator_r",
"60000",
- "band3_r",
+ "attenuator_rw",
"60000",
- "band3_rw",
+ "band_r",
"60000",
- "led0_r",
+ "band_rw",
"60000",
- "led0_rw",
+ "clk_pll_locked_r",
"60000",
- "pwr_dig_r",
+ "led_r",
"60000",
- "state",
- "1000",
- "status",
- "1000",
- "temperature_r",
+ "led_rw",
"60000"
]
}
diff --git a/CDB/thomas_ConfigDb.json b/CDB/thomas_ConfigDb.json
index 7b3fbfe9d..1dbffa725 100644
--- a/CDB/thomas_ConfigDb.json
+++ b/CDB/thomas_ConfigDb.json
@@ -12,7 +12,7 @@
"RCUSCC": {
"PTS/RCUSCC/1": {
"attribute_properties": {
- "Attenuator1_R": {
+ "Attenuator_R": {
"event_period": [
"0"
],
@@ -21,7 +21,7 @@
"1"
]
},
- "Attenuator1_RW": {
+ "Attenuator_RW": {
"event_period": [
"0"
],
@@ -30,7 +30,7 @@
"1"
]
},
- "Attenuator2_R": {
+ "Band_R": {
"event_period": [
"0"
],
@@ -39,7 +39,7 @@
"1"
]
},
- "Attenuator2_RW": {
+ "Band_RW": {
"event_period": [
"0"
],
@@ -48,7 +48,7 @@
"1"
]
},
- "Attenuator3_R": {
+ "CLK_PLL_locked_R": {
"event_period": [
"0"
],
@@ -57,7 +57,7 @@
"1"
]
},
- "Attenuator3_RW": {
+ "LED_R": {
"event_period": [
"0"
],
@@ -66,118 +66,7 @@
"1"
]
},
- "Band1_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band1_RW": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band2_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band2_RW": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band3_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Band3_RW": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "Dither1_Frequency_R": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "Dither1_Frequency_RW": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "Dither2_Frequency_R": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "Dither2_Frequency_RW": {
- "event_period": [
- "0"
- ],
- "format": [
- "%6.8f"
- ],
- "rel_change": [
- "-0.1",
- "0.1"
- ]
- },
- "LED0_R": {
- "event_period": [
- "0"
- ],
- "rel_change": [
- "-1",
- "1"
- ]
- },
- "LED0_RW": {
+ "LED_RW": {
"event_period": [
"0"
],
@@ -213,7 +102,7 @@
"-1",
"1"
]
- }
+ },
},
"properties": {
"OPC_Server_Name": [
@@ -225,45 +114,28 @@
"OPC_Time_Out": [
"1.0"
],
- "RCU": [
- "1"
- ],
"polled_attr": [
- "attenuator1_r",
- "60000",
- "attenuator1_rw",
- "60000",
- "attenuator2_r",
- "60000",
- "attenuator2_rw",
- "60000",
- "attenuator3_r",
- "60000",
- "attenuator3_rw",
- "60000",
- "band1_r",
- "60000",
- "band1_rw",
+ "pwr_dig_r",
"60000",
- "band2_r",
+ "state",
+ "1000",
+ "status",
+ "1000",
+ "temperature_r",
"60000",
- "band2_rw",
+ "attenuator_r",
"60000",
- "band3_r",
+ "attenuator_rw",
"60000",
- "band3_rw",
+ "band_r",
"60000",
- "led0_r",
+ "band_rw",
"60000",
- "led0_rw",
+ "clk_pll_locked_r",
"60000",
- "pwr_dig_r",
+ "led_r",
"60000",
- "state",
- "1000",
- "status",
- "1000",
- "temperature_r",
+ "led_rw",
"60000"
]
}
--
GitLab