Skip to content

Commit 40cfabe

Browse files
uelluesk1p
andcommitted
Don't close connection after each pass
Previously, the sim would close the connection and then start a new run upon re-connecting. That wasn't compatible with libertem-live-server prototypes and didn't seem to correspond to the behavior of the real detector software. With this change, the sim will keep starting new acquisitions on the same connection without closing it. This seems to work better. Discusson with @sk1p: We should see if and when we want to simulate the detector closing a connection. Effects of this change in the wild to be monitored! Co-authored-by: Alexander Clausen <a.clausen@fz-juelich.de>
1 parent 87664f9 commit 40cfabe

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Bugfix] Make the MIB simulator a bit more realistic
22
====================================================
33

4-
* Allow multiple acquisitions per connection in triggered mode (:pr:`159`).
4+
* Allow multiple acquisitions per connection in triggered and untriggered mode (:pr:`159`, :pr:`191`).
55
* Fix sequence number in continuous mode; fix generated acquisition header for
66
the continuous case
77
* Fix control socket handling

src/libertem_live/detectors/merlin/sim.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -580,11 +580,6 @@ def handle_conn(self, connection: socket.socket):
580580
self.trigger_event.clear()
581581
self._sim.handle_acquisition(connection)
582582
self.finish_event.set()
583-
if not (self._wait_trigger or self._manual_trigger) and not self._continuous:
584-
logger.info(
585-
"not continuous and not triggering, stopping sim for this connection"
586-
)
587-
return
588583
finally:
589584
connection.close()
590585

0 commit comments

Comments
 (0)