From f135342e907cada1deeb5f5f0fdf0b5cee5b9d82 Mon Sep 17 00:00:00 2001
From: Pieter Donker <donker@astron.nl>
Date: Wed, 25 Jun 2014 05:49:12 +0000
Subject: [PATCH] Task #1418 repaired small bug in RF signal test and turned
on screen info in service mode
---
LCU/checkhardware/doStationTest.sh | 7 ++++++-
LCU/checkhardware/lib/test_db.py | 8 ++++----
LCU/checkhardware/lib/test_lib.py | 8 ++++----
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/LCU/checkhardware/doStationTest.sh b/LCU/checkhardware/doStationTest.sh
index 30993226016..2b7ef23a410 100755
--- a/LCU/checkhardware/doStationTest.sh
+++ b/LCU/checkhardware/doStationTest.sh
@@ -79,7 +79,12 @@ then
fi
# Check hardware
-checkHardware.py $level $start $stop
+if [ $SERVICE == "yes" ]
+then
+ checkHardware.py $level $start $stop -ls=info
+else
+ checkHardware.py $level $start $stop
+fi
err=$?
echo $err
diff --git a/LCU/checkhardware/lib/test_db.py b/LCU/checkhardware/lib/test_db.py
index 248fae0e457..4ef409afb9b 100644
--- a/LCU/checkhardware/lib/test_db.py
+++ b/LCU/checkhardware/lib/test_db.py
@@ -384,12 +384,12 @@ class cDB:
valstr = ''
if tile.x.too_low or tile.x.too_high:
valstr += ",X=%3.1f %d %3.1f %3.1f %d %3.1f" %\
- (tile.x.test_signal[0], tile.x.test_subband[0], tile.x.ref_signal[0],\
- tile.x.test_signal[1], tile.x.test_subband[1], tile.x.ref_signal[1])
+ (tile.x.test_signal[0], self.hba.test_subband_x[0], self.hba.ref_signal_x[0],\
+ tile.x.test_signal[1], self.hba.test_subband_x[1], self.hba.ref_signal_x[1])
if tile.y.too_low or tile.y.too_high:
valstr += ",Y=%3.1f %d %3.1f %3.1f %d %3.1f" %\
- (tile.y.test_signal[0], tile.y.test_subband[0], tile.y.ref_signal[0],\
- tile.y.test_signal[1], tile.y.test_subband[1], tile.y.ref_signal[1])
+ (tile.y.test_signal[0], self.hba.test_subband_y[0], self.hba.ref_signal_y[0],\
+ tile.y.test_signal[1], self.hba.test_subband_y[1], self.hba.ref_signal_y[1])
if len(valstr):
log.addLine("%s,HBA,%03d,RF_FAIL%s" %(date, tile.nr, valstr))
diff --git a/LCU/checkhardware/lib/test_lib.py b/LCU/checkhardware/lib/test_lib.py
index b22d5413b0c..9a073ac1e06 100644
--- a/LCU/checkhardware/lib/test_lib.py
+++ b/LCU/checkhardware/lib/test_lib.py
@@ -964,10 +964,10 @@ class cHBA:
if (self.rcudata.testSignal_X != -1) and (self.rcudata.testSignal_Y != -1):
- self.hba.ref_signal[ctrl_nr] = self.rcudata.testSignal_X
- self.hba.ref_signal[ctrl_nr] = self.rcudata.testSignal_Y
- self.hba.test_subband[ctrl_nr] = self.rcudata.testSubband_X
- self.hba.test_subband[ctrl_nr] = self.rcudata.testSubband_Y
+ self.hba.ref_signal_x[ctrl_nr] = self.rcudata.testSignal_X
+ self.hba.ref_signal_y[ctrl_nr] = self.rcudata.testSignal_Y
+ self.hba.test_subband_x[ctrl_nr] = self.rcudata.testSubband_X
+ self.hba.test_subband_y[ctrl_nr] = self.rcudata.testSubband_Y
ssdataX = self.rcudata.getSubbandX()
ssdataY = self.rcudata.getSubbandY()
--
GitLab