From d5fcdce47ca9832a41bdd92a25ca75d96b295f54 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 7 Apr 2017 14:15:24 +0000
Subject: [PATCH] Task #9893: RSP channel capacity is for all 4 boards
---
.../sql/create_add_virtual_instrument.sql.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py
index d4b9829c651..016bc654771 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py
@@ -375,15 +375,15 @@ with open("add_virtual_instrument.sql", 'w+') as output:
## RSPs
for i in xrange(num_splitter_stations):
- resource_capacities[ resources[stations[i] + 'chan0'][0] ] = (SqlKeyword('DEFAULT'), 61 * 16, 61 * 16)
- resource_capacities[ resources[stations[i] + 'bw0'][0] ] = (SqlKeyword('DEFAULT'), 3*1000*1000*1000, 3*1000*1000*1000)
- resource_capacities[ resources[stations[i] + 'chan1'][0] ] = (SqlKeyword('DEFAULT'), 61 * 16, 61 * 16)
+ resource_capacities[ resources[stations[i] + 'chan0'][0] ] = (SqlKeyword('DEFAULT'), 4 * 61 * 16, 4 * 61 * 16) # 4 RSP boards, 61 subbands/board, 16 bits/subband
+ resource_capacities[ resources[stations[i] + 'bw0'][0] ] = (SqlKeyword('DEFAULT'), 3*1000*1000*1000, 3*1000*1000*1000) # 3 Gbit/s
+ resource_capacities[ resources[stations[i] + 'chan1'][0] ] = (SqlKeyword('DEFAULT'), 4 * 61 * 16, 4 * 61 * 16)
resource_capacities[ resources[stations[i] + 'bw1'][0] ] = (SqlKeyword('DEFAULT'), 3*1000*1000*1000, 3*1000*1000*1000)
for i in xrange(num_non_splitter_stations):
j = i + num_splitter_stations
resource_capacities[ resources[stations[j] + 'bw'][0] ] = (SqlKeyword('DEFAULT'), 3*1000*1000*1000, 3*1000*1000*1000)
- resource_capacities[ resources[stations[j] + 'chan'][0] ] = (SqlKeyword('DEFAULT'), 61 * 16, 61 * 16)
+ resource_capacities[ resources[stations[j] + 'chan'][0] ] = (SqlKeyword('DEFAULT'), 4 * 61 * 16, 4 * 61 * 16)
if len(resource_capacities) != len(resources):
raise Exception('Error: resource_capacities and resources must have the same size!')
--
GitLab