mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-25 07:40:03 +02:00
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
This commit is contained in:
commit
caff89a040
@ -86,8 +86,8 @@ But lets start looking at the at the manual way:
|
|||||||
|
|
||||||
#Start the measurement
|
#Start the measurement
|
||||||
t0 = time.time()
|
t0 = time.time()
|
||||||
d.start_receiver()
|
d.startDetector()
|
||||||
d.start_detector()
|
d.startReceiver()
|
||||||
|
|
||||||
#Wait for the detector to be ready or do other important stuff
|
#Wait for the detector to be ready or do other important stuff
|
||||||
time.sleep(t*n)
|
time.sleep(t*n)
|
||||||
@ -98,7 +98,7 @@ But lets start looking at the at the manual way:
|
|||||||
|
|
||||||
#Stop the receiver after we got the frames
|
#Stop the receiver after we got the frames
|
||||||
#Detector is already idle so we don't need to stop it
|
#Detector is already idle so we don't need to stop it
|
||||||
d.stop_receiver()
|
d.stopReceiver()
|
||||||
|
|
||||||
lost = d.frames_caught - n
|
lost = d.frames_caught - n
|
||||||
print(f'{n} frames of {t}s took {time.time()-t0:{.3}}s with {lost} frames lost ')
|
print(f'{n} frames of {t}s took {time.time()-t0:{.3}}s with {lost} frames lost ')
|
||||||
|
@ -240,6 +240,22 @@ class Detector(CppDetectorApi):
|
|||||||
def delayl(self):
|
def delayl(self):
|
||||||
return ut.reduce_time(self.getDelayAfterTriggerLeft())
|
return ut.reduce_time(self.getDelayAfterTriggerLeft())
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
"""Start detector"""
|
||||||
|
self.startDetector()
|
||||||
|
|
||||||
|
def rx_start(self):
|
||||||
|
"""Start receiver"""
|
||||||
|
self.startReceiver()
|
||||||
|
|
||||||
|
def rx_stop(self):
|
||||||
|
"""Stop receiver"""
|
||||||
|
self.stopReceiver()
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
"""Stop detector"""
|
||||||
|
self.stopDetector()
|
||||||
|
|
||||||
# Time
|
# Time
|
||||||
@property
|
@property
|
||||||
def rx_framescaught(self):
|
def rx_framescaught(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user