HttpDetectore: sleep time depending on Detector attributes

src/sender/eventDetectors/HttpDetector.py

@@ -59,14 +59,20 @@ class EventDetector():
 
             try:
                 self.EigerIP          = self.eigerdevice.get_property('Host').get('Host')[0]
+            except:
+                self.log.error("Getting EigerIP...failed.", exc_info=True)
 
-#               self.images_per_file  = self.filewriterdevice.read_attribute("ImagesPerFile").value
+            try:
+               self.images_per_file  = self.filewriterdevice.read_attribute("ImagesPerFile").value
 #                self.NbTriggers       = self.eigerdevice.read_attribute("NbTriggers").value
 #                self.NbImages         = self.eigerdevice.read_attribute("NbImages").value
 #                self.TriggerMode      = self.eigerdevice.read_attribute("TriggerMode").value
-#                self.FrameTime        = self.eigerdevice.read_attribute("FrameTime").value
+                self.FrameTime        = self.eigerdevice.read_attribute("FrameTime").value
             except:
-                self.log.error("Getting EigerIP...failed.", exc_info=True)
+                self.log.error("Getting attributes...failed.", exc_info=True)
+                self.images_per_file = 1
+                self.FrameTime       = 0.5
+
 
             self.files_downloaded = collections.deque(maxlen=config["historySize"])
 
@@ -96,7 +102,6 @@ class EventDetector():
         files_stored = []
 
         try:
-#            self.log.debug("Getting 'FilesInBuffer'")
             # returns a tuble of the form:
             # ('testp06/37_data_000001.h5', 'testp06/37_master.h5', 'testp06/36_data_000007.h5', 'testp06/36_data_000006.h5', 'testp06/36_data_000005.h5', 'testp06/36_data_000004.h5', 'testp06/36_data_000003.h5', 'testp06/36_data_000002.h5', 'testp06/36_data_000001.h5', 'testp06/36_master.h5')
             files_stored = self.eigerdevice.read_attribute("FilesInBuffer").value
@@ -107,13 +112,9 @@ class EventDetector():
             return eventMessageList
 
         if not files_stored or set(files_stored).issubset(self.files_downloaded):
-#            self.log.debug("Sleeping")
-            time.sleep(0.5)
-#        else:
-#            self.log.debug("files_stored: " + str(list(files_stored)))
-#            self.log.debug("files_downloaded: " + str(self.files_downloaded))
+            time.sleep(self.images_per_file * self.FrameTime)
+
         ## ===== Look for current measurement files
-#        available_files = [file for file in files_stored if self.current_dataset_prefix in file]
         if files_stored:
             available_files = [file for file in files_stored if file.startswith(self.current_dataset_prefix)]
         else: