From 7212a0d433b32b411804fb81a45c97ac08d39f67 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 19 Aug 2020 17:06:54 +0200 Subject: [PATCH] added start, rx_start etc --- docs/src/pyexamples.rst | 6 +++--- python/slsdet/detector.py | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/docs/src/pyexamples.rst b/docs/src/pyexamples.rst index cff5caf34..df7964ea5 100755 --- a/docs/src/pyexamples.rst +++ b/docs/src/pyexamples.rst @@ -86,8 +86,8 @@ But lets start looking at the at the manual way: #Start the measurement t0 = time.time() - d.start_receiver() - d.start_detector() + d.startDetector() + d.startReceiver() #Wait for the detector to be ready or do other important stuff 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 #Detector is already idle so we don't need to stop it - d.stop_receiver() + d.stopReceiver() lost = d.frames_caught - n print(f'{n} frames of {t}s took {time.time()-t0:{.3}}s with {lost} frames lost ') diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 3fa91f927..d33dd5129 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -240,6 +240,22 @@ class Detector(CppDetectorApi): def delayl(self): 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 @property def rx_framescaught(self):