Added duration of generator (~exposure time) to 60 second timeout for…

… HDF writer part to enable longer exposures

malcolm/modules/ADCore/parts/hdfwriterpart.py

@@ -142,6 +142,8 @@ def configure(self, context, completed_steps, steps_to_do, part_info, params):
             file_dir, "%s-layout.xml" % self.params.mri)
         with open(self.layout_filename, "w") as f:
             f.write(xml)
+        # Store the duration of the generator for checking for timeout
+        self.generator_duration = params.generator.duration
         # We want the HDF writer to flush this often:
         flush_time = 1  # seconds
         # (In particular this means that HDF files can be read cleanly by
@@ -213,7 +215,7 @@ def run(self, context, update_completed_steps):
             self.update_completed_steps, update_completed_steps)
         # TODO: what happens if we miss the last frame?
         child.when_value_matches(
-            "uniqueId", self.done_when_reaches, event_timeout=FRAME_TIMEOUT)
+            "uniqueId", self.done_when_reaches, event_timeout=FRAME_TIMEOUT+self.generator_duration)
 
     @RunnableController.PostRunReady
     def post_run_ready(self, context):