From c1e5cfa1019eb53c3f934c99dcb20410c6a9e2bc Mon Sep 17 00:00:00 2001 From: Alice Date: Wed, 19 Nov 2025 11:08:15 +0100 Subject: [PATCH] fixed virtual detector test scripts --- tests/scripts/test_frame_synchronizer.py | 2 +- tests/scripts/test_simulators.py | 2 +- tests/scripts/utils_for_test.py | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/scripts/test_frame_synchronizer.py b/tests/scripts/test_frame_synchronizer.py index ba9bd7e67..6653c96cb 100644 --- a/tests/scripts/test_frame_synchronizer.py +++ b/tests/scripts/test_frame_synchronizer.py @@ -113,7 +113,7 @@ def startTestsForAll(args, fp): startDetectorVirtualServer(server, args.num_mods, fp) startFrameSynchronizerPullSocket(server, fp) startFrameSynchronizer(args.num_mods, fp) - d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, fp=fp, num_mods=args.num_mods, num_frames=args.num_frames) + d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=args.num_mods, num_frames=args.num_frames) loadBasicSettings(name=server, d=d, fp=fp) acquire(fp, d) testFramesCaught(server, d, args.num_frames) diff --git a/tests/scripts/test_simulators.py b/tests/scripts/test_simulators.py index 9b535c29d..7aab1d958 100644 --- a/tests/scripts/test_simulators.py +++ b/tests/scripts/test_simulators.py @@ -63,7 +63,7 @@ def startCmdTestsForAll(args, fp): cleanup(fp) startDetectorVirtualServer(name=server, num_mods=num_mods, fp=fp) startReceiver(num_mods, fp) - d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, fp=fp, num_mods=num_mods) + d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=num_mods) loadBasicSettings(name=server, d=d, fp=fp) runProcessWithLogFile('Cmd Tests (' + args.markers + ') for ' + server, cmd, fp, fname) except Exception as e: diff --git a/tests/scripts/utils_for_test.py b/tests/scripts/utils_for_test.py index 9f6a65ddc..ae9aa4559 100644 --- a/tests/scripts/utils_for_test.py +++ b/tests/scripts/utils_for_test.py @@ -16,7 +16,6 @@ SERVER_START_PORTNO=1900 init(autoreset=True) - class LogLevel(Enum): INFO = 0 INFORED = 1 @@ -229,11 +228,11 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp if name == "xilinx_ctb": d.configureTransceiver() - if name == "eiger": - d.trimen = [4500, 5400, 6400] - d.settingspath = settingsdir + '/eiger/' - d.setThresholdEnergy(4500, detectorSettings.STANDARD) - + if settingsdir is not None and name in ['eiger', 'mythen3']: + d.settingspath = settingsdir + '/' + name + '/' + d.trimen = [4500, 5400, 6400] if name == 'eiger' else [4000, 6000, 8000, 12000] + d.setThresholdEnergy(4500, detectorSettings.STANDARD) + d.frames = num_frames except Exception as e: