diff --git a/python/scripts/compare_with_commandline.py b/python/scripts/compare_with_commandline.py index c86e4c8a9..ef72bc0a6 100644 --- a/python/scripts/compare_with_commandline.py +++ b/python/scripts/compare_with_commandline.py @@ -99,7 +99,6 @@ intentionally_missing = [ 'temp_slowadc', 'temp_sodl', 'temp_sodr', - 'trigger', #use sendSoftwareTrigger 'update', #use updateServerAndFirmare 'udp_validate', #use validateUdpConfiguration 'udp_reconfigure', #use reconfigureUdpDestination diff --git a/python/slsdet/defines.py b/python/slsdet/defines.py index 4f86a03f3..244ce207e 100644 --- a/python/slsdet/defines.py +++ b/python/slsdet/defines.py @@ -26,6 +26,7 @@ SHORT_STR_LENGTH=20 MAX_PATTERN_LENGTH=0x2000 MAX_PATTERN_LEVELS=6 M3_MAX_PATTERN_LEVELS=3 +MAX_NUM_COUNTERS=3 DEFAULT_STREAMING_TIMER_IN_MS=500 NUM_RX_THREAD_IDS=9 MAX_NUM_PACKETS=512 diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 3345f729a..c4a30370a 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -453,6 +453,15 @@ class Detector(CppDetectorApi): def triggers(self, 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 def exptime(self): """ @@ -500,7 +509,7 @@ class Detector(CppDetectorApi): @exptime.setter 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): if isinstance(v, int): v = float(v) @@ -509,8 +518,6 @@ class Detector(CppDetectorApi): ut.set_time_using_dict(self.setExptime, t) - - @property def period(self): """