detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-12-21 20:11:17 +01:00
Code Issues Actions Packages Releases Activity

fixed virtual detector test scripts

Browse Source
This commit is contained in:
mazzol_a
2025-11-19 11:08:15 +01:00
parent ae8c9175bf
commit c1e5cfa101
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/scripts/test_frame_synchronizer.py
View File

@@ -113,7 +113,7 @@ def startTestsForAll(args, fp):
startDetectorVirtualServer(server, args.num_mods, fp) startDetectorVirtualServer(server, args.num_mods, fp)
startFrameSynchronizerPullSocket(server, fp) startFrameSynchronizerPullSocket(server, fp)
startFrameSynchronizer(args.num_mods, 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) loadBasicSettings(name=server, d=d, fp=fp)
acquire(fp, d) acquire(fp, d)
testFramesCaught(server, d, args.num_frames) testFramesCaught(server, d, args.num_frames)

2
tests/scripts/test_simulators.py
View File

@@ -63,7 +63,7 @@ def startCmdTestsForAll(args, fp):
cleanup(fp) cleanup(fp)
startDetectorVirtualServer(name=server, num_mods=num_mods, fp=fp) startDetectorVirtualServer(name=server, num_mods=num_mods, fp=fp)
startReceiver(num_mods, 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) loadBasicSettings(name=server, d=d, fp=fp)
runProcessWithLogFile('Cmd Tests (' + args.markers + ') for ' + server, cmd, fp, fname) runProcessWithLogFile('Cmd Tests (' + args.markers + ') for ' + server, cmd, fp, fname)
except Exception as e: except Exception as e:

7
tests/scripts/utils_for_test.py
View File

@@ -16,7 +16,6 @@ SERVER_START_PORTNO=1900
init(autoreset=True) init(autoreset=True)
class LogLevel(Enum): class LogLevel(Enum):
INFO = 0 INFO = 0
INFORED = 1 INFORED = 1
@@ -229,9 +228,9 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp
if name == "xilinx_ctb": if name == "xilinx_ctb":
d.configureTransceiver() d.configureTransceiver()
if name == "eiger": if settingsdir is not None and name in ['eiger', 'mythen3']:
d.trimen = [4500, 5400, 6400] d.settingspath = settingsdir + '/' + name + '/'
d.settingspath = settingsdir + '/eiger/' d.trimen = [4500, 5400, 6400] if name == 'eiger' else [4000, 6000, 8000, 12000]
d.setThresholdEnergy(4500, detectorSettings.STANDARD) d.setThresholdEnergy(4500, detectorSettings.STANDARD)
d.frames = num_frames d.frames = num_frames