From 33891b29262c9e56c29154e1d8a6cf9dfc0459b0 Mon Sep 17 00:00:00 2001
From: wierenga <sdos@astron.nl>
Date: Fri, 13 Oct 2006 08:43:31 +0000
Subject: [PATCH] BugID: 890
---
MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in | 56 +++++++++++--------
.../PIC/RSPDriver/src/RemoteStation.conf.in | 2 +-
MAC/APL/PIC/RSPDriver/src/rspctl.cc | 1 -
3 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in b/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in
index 1a42300a793..caad7e571a7 100644
--- a/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in
+++ b/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in
@@ -80,14 +80,14 @@ RSPDriver.MAC_ADDR_23=10:FA:00:00:17:00
# for difference between operation with data from SERDES
# ring and without.
#
-RSPDriver.LANE_0_BLET_OUT=0
-RSPDriver.LANE_1_BLET_OUT=1
-RSPDriver.LANE_2_BLET_OUT=2
-RSPDriver.LANE_3_BLET_OUT=3
-RSPDriver.LANE_0_XLET_OUT=0
-RSPDriver.LANE_1_XLET_OUT=1
-RSPDriver.LANE_2_XLET_OUT=2
-RSPDriver.LANE_3_XLET_OUT=3
+RSPDriver.LANE_0_BLET_OUT=11
+RSPDriver.LANE_1_BLET_OUT=11
+RSPDriver.LANE_2_BLET_OUT=11
+RSPDriver.LANE_3_BLET_OUT=11
+RSPDriver.LANE_0_XLET_OUT=11
+RSPDriver.LANE_1_XLET_OUT=11
+RSPDriver.LANE_2_XLET_OUT=11
+RSPDriver.LANE_3_XLET_OUT=11
RSPDriver.IGNORE_REMOTE_DATA=0
#
@@ -104,7 +104,8 @@ RSPDriver.IGNORE_REMOTE_DATA=0
#
RSPDriver.CDO_ENABLE=1
RSPDriver.CDO_N_BLOCKS=16
-RSPDriver.CDO_N_BEAMLETS=54
+#RSPDriver.CDO_N_BEAMLETS=54
+RSPDriver.CDO_N_BEAMLETS=32
RSPDriver.CDO_SRCMAC_FORMAT=10:FA:00:%02x:%02x:01
# FTS-1
@@ -112,17 +113,29 @@ RSPDriver.CDO_SRCMAC_FORMAT=10:FA:00:%02x:%02x:01
# RSPDriver.DST_MAC_ADDR_1=00:E0:81:31:DF:D4
# CS-1
RSPDriver.DST_MAC_ADDR_0=00:E0:81:34:93:3B
-RSPDriver.DST_MAC_ADDR_1=00:E0:81:31:B0:E1
-RSPDriver.DST_MAC_ADDR_2=00:E0:81:31:B2:F5
-RSPDriver.DST_MAC_ADDR_3=00:E0:81:31:DE:8B
-RSPDriver.DST_MAC_ADDR_4=00:E0:81:31:20:37
-RSPDriver.DST_MAC_ADDR_5=00:E0:81:31:DE:9B
-RSPDriver.DST_MAC_ADDR_6=00:E0:81:31:8C:D1
-RSPDriver.DST_MAC_ADDR_7=00:E0:81:31:9B:87
-RSPDriver.DST_MAC_ADDR_8=00:E0:81:31:B3:26
-RSPDriver.DST_MAC_ADDR_9=00:E0:81:31:DF:D5
-RSPDriver.DST_MAC_ADDR_10=00:E0:81:31:92:11
-RSPDriver.DST_MAC_ADDR_11=00:E0:81:31:B2:15
+RSPDriver.DST_MAC_ADDR_1=00:E0:81:34:93:3B
+RSPDriver.DST_MAC_ADDR_2=00:E0:81:31:B0:E1
+RSPDriver.DST_MAC_ADDR_3=00:E0:81:31:B0:E1
+RSPDriver.DST_MAC_ADDR_4=00:E0:81:31:B2:F5
+RSPDriver.DST_MAC_ADDR_5=00:E0:81:31:B2:F5
+RSPDriver.DST_MAC_ADDR_6=00:E0:81:34:93:3B
+RSPDriver.DST_MAC_ADDR_7=00:E0:81:34:93:3B
+RSPDriver.DST_MAC_ADDR_8=00:E0:81:31:B0:E1
+RSPDriver.DST_MAC_ADDR_9=00:E0:81:31:B0:E1
+RSPDriver.DST_MAC_ADDR_10=00:E0:81:31:B2:F5
+RSPDriver.DST_MAC_ADDR_11=00:E0:81:31:B2:F5
+
+#RSPDriver.DST_MAC_ADDR_1=00:E0:81:31:B0:E1
+#RSPDriver.DST_MAC_ADDR_2=00:E0:81:31:B2:F5
+#RSPDriver.DST_MAC_ADDR_3=00:E0:81:31:DE:8B
+#RSPDriver.DST_MAC_ADDR_4=00:E0:81:31:20:37
+#RSPDriver.DST_MAC_ADDR_5=00:E0:81:31:DE:9B
+#RSPDriver.DST_MAC_ADDR_6=00:E0:81:31:8C:D1
+#RSPDriver.DST_MAC_ADDR_7=00:E0:81:31:9B:87
+#RSPDriver.DST_MAC_ADDR_8=00:E0:81:31:B3:26
+#RSPDriver.DST_MAC_ADDR_9=00:E0:81:31:DF:D5
+#RSPDriver.DST_MAC_ADDR_10=00:E0:81:31:92:11
+#RSPDriver.DST_MAC_ADDR_11=00:E0:81:31:B2:15
RSPDriver.SRC_IP_ADDR_0=10.10.0.1
RSPDriver.SRC_IP_ADDR_1=10.10.0.2
@@ -162,8 +175,7 @@ RSPDriver.XST_FIRST_RSP_BOARD=0x00
# Ethernet interface on which to contact the RSP boards.
# This interface would normally be connected to the switch.
#
-# eth1 is live hardware
-RSPDriver.IF_NAME=eth0
+RSPDriver.IF_NAME=eth1
#
# Make sure that initially the
diff --git a/MAC/APL/PIC/RSPDriver/src/RemoteStation.conf.in b/MAC/APL/PIC/RSPDriver/src/RemoteStation.conf.in
index e7c77681084..213575127f1 100644
--- a/MAC/APL/PIC/RSPDriver/src/RemoteStation.conf.in
+++ b/MAC/APL/PIC/RSPDriver/src/RemoteStation.conf.in
@@ -10,7 +10,7 @@ RS.N_RSPBOARDS=12
#
# Specify the station id (0 <= StationId < 256)
#
-RS.STATION_ID=1
+RS.STATION_ID=11
#
# Number of BLP's per RSP board
diff --git a/MAC/APL/PIC/RSPDriver/src/rspctl.cc b/MAC/APL/PIC/RSPDriver/src/rspctl.cc
index 4fb3b756c3e..8efd6e23778 100644
--- a/MAC/APL/PIC/RSPDriver/src/rspctl.cc
+++ b/MAC/APL/PIC/RSPDriver/src/rspctl.cc
@@ -1381,7 +1381,6 @@ void StatisticsCommand::dump_statistics(Array<double, 2>& stats, const Timestamp
FILE* file = getFile(deviceout,fileName);
if (stats.extent(secondDim)
- /*!= (int)fwrite(stats(result_device, Range::all()).data(), sizeof(double),*/
!= (int)fwrite(stats(result_device, Range::all()).data(), sizeof(double), stats.extent(secondDim), file))
{
logMessage(cerr,formatString("Error: unable to write to file %s",fileName));
--
GitLab