diff --git a/LCU/checkhardware/check_hardware.py b/LCU/checkhardware/check_hardware.py index 2507149d9d23bb3f4463623817e91c0881906ce9..3296f0d5644235ce00b8c4a74301fbb51eb8dd9c 100755 --- a/LCU/checkhardware/check_hardware.py +++ b/LCU/checkhardware/check_hardware.py @@ -136,6 +136,12 @@ from checkhardware_lib import CoreStations from checkhardware_lib import RemoteStations from checkhardware_lib import LBA from checkhardware_lib import remove_all_data_files +from checkhardware_lib import SPU +from checkhardware_lib import TBB +from checkhardware_lib import activate_test_mode + + + check_version = '0516' diff --git a/LCU/checkhardware/checkhardware_lib/data.py b/LCU/checkhardware/checkhardware_lib/data.py index ae24efe2ecb807bdef7f1ca62ee7d4cfb05c6ea4..7e8d8d08ec953098d60b9c022aca703801eca4f5 100644 --- a/LCU/checkhardware/checkhardware_lib/data.py +++ b/LCU/checkhardware/checkhardware_lib/data.py @@ -351,7 +351,7 @@ class AntennaData: if freq_band in list(self.bands.keys()): band = freq_band - if isinstance(sb_set, int): + if isinstance(sb_set, int) or isinstance(sb_set, np.integer): if sb_set in sb_range: sb = sb_set else: diff --git a/LCU/checkhardware/checkhardware_lib/general.py b/LCU/checkhardware/checkhardware_lib/general.py index 1e2121019a0d7deb3c3759fea4c330e9b8c65c21..600cdc89bdd63f4d663a964dbd723974df885e3f 100644 --- a/LCU/checkhardware/checkhardware_lib/general.py +++ b/LCU/checkhardware/checkhardware_lib/general.py @@ -49,9 +49,9 @@ def run_cmd(cmd=''): cmdline = Popen(cmd_list, stdout=PIPE, stderr=PIPE) (so, se) = cmdline.communicate() if len(so) != 0: - return so + return so.decode('UTF-8') else: - return 'Error, %s' % se + return 'Error, %s' % se.decode('UTF-8') except: logger.error('Caught %s', str(sys.exc_info()[0])) logger.error(str(sys.exc_info()[1])) diff --git a/LCU/checkhardware/checkhardware_lib/lofar.py b/LCU/checkhardware/checkhardware_lib/lofar.py index 93091d0526ad3c6b9d3bcf188e2aca2b75a72ffc..92d3e6bdd690a22c38dbbf47e70f48fd6b991a2d 100644 --- a/LCU/checkhardware/checkhardware_lib/lofar.py +++ b/LCU/checkhardware/checkhardware_lib/lofar.py @@ -127,7 +127,7 @@ def read_station_config(): nhba = int(val) continue if key == "RS.HBA_SPLIT": - if string.upper(val) == "YES": + if str.upper(val) == "YES": hba_split = 1 continue return st_id, nrsp, ntbb, nlbl, nlbh, nhba, hba_split diff --git a/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py b/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py index b359238eae2a47990e532605a540e1465b7668f1..697a525ad2cc4d8eb60d1814371cd65d2b7abe92 100644 --- a/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py +++ b/LCU/checkhardware/checkhardware_lib/spectrum_checks/peakslib.py @@ -2,7 +2,7 @@ from numpy import ma, fft, power, arange, isscalar, NaN, Inf, zeros from sys import exit import logging -from lofar.lcu.checkhardware.checkhardware_lib.data import * +from checkhardware_lib.data import * logger = logging.getLogger('main.chk.pea..') logger.debug("init logger")