detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-05 17:40:40 +02:00
Code Issues Actions Packages Releases Activity

trigger, blockingtrigger in python and m3 timefix

Browse Source
This commit is contained in:
Erik Frojdh 2023-02-22 18:01:46 +01:00
parent 7e8d11098a
commit 403989e2f8
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/scripts/compare_with_commandline.py
View File

@ -99,7 +99,6 @@ intentionally_missing = [
'temp_slowadc', 'temp_slowadc',
'temp_sodl', 'temp_sodl',
'temp_sodr', 'temp_sodr',
'trigger', #use sendSoftwareTrigger
'update', #use updateServerAndFirmare 'update', #use updateServerAndFirmare
'udp_validate', #use validateUdpConfiguration 'udp_validate', #use validateUdpConfiguration
'udp_reconfigure', #use reconfigureUdpDestination 'udp_reconfigure', #use reconfigureUdpDestination

1
python/slsdet/defines.py
View File

@ -26,6 +26,7 @@ SHORT_STR_LENGTH=20
MAX_PATTERN_LENGTH=0x2000 MAX_PATTERN_LENGTH=0x2000
MAX_PATTERN_LEVELS=6 MAX_PATTERN_LEVELS=6
M3_MAX_PATTERN_LEVELS=3 M3_MAX_PATTERN_LEVELS=3
MAX_NUM_COUNTERS=3
DEFAULT_STREAMING_TIMER_IN_MS=500 DEFAULT_STREAMING_TIMER_IN_MS=500
NUM_RX_THREAD_IDS=9 NUM_RX_THREAD_IDS=9
MAX_NUM_PACKETS=512 MAX_NUM_PACKETS=512

13
python/slsdet/detector.py
View File

@ -453,6 +453,15 @@ class Detector(CppDetectorApi):
def triggers(self, n_triggers): def triggers(self, n_triggers):
self.setNumberOfTriggers(n_triggers) self.setNumberOfTriggers(n_triggers)
def resetdacs(self, use_hardware_values):
self.resetToDefaultDacs(use_hardware_values)
def trigger(self):
self.sendSoftwareTrigger()
def blockingtrigger(self):
self.sendSoftwareTrigger(True)
@property @property
def exptime(self): def exptime(self):
""" """
@ -500,7 +509,7 @@ class Detector(CppDetectorApi):
@exptime.setter @exptime.setter
def exptime(self, t): def exptime(self, t):
if self.type == detectorType.MYTHEN3 and is_iterable(t): if self.type == detectorType.MYTHEN3 and is_iterable(t) and not isinstance(t,dict):
for i, v in enumerate(t): for i, v in enumerate(t):
if isinstance(v, int): if isinstance(v, int):
v = float(v) v = float(v)
@ -509,8 +518,6 @@ class Detector(CppDetectorApi):
ut.set_time_using_dict(self.setExptime, t) ut.set_time_using_dict(self.setExptime, t)
@property @property
def period(self): def period(self):
""" """