Commit Graph

7 Commits

Author SHA1 Message Date
lhdamiani 96a9802e91 merged conflicts. assembler with external sync. 2021-07-06 14:37:41 +02:00
lhdamiani 8fd1c4cf7a detached sync and assembler with zmq recv. 2021-07-06 11:57:43 +02:00
babic_a 644d6f4f6a Improve output log 2021-07-06 11:31:28 +02:00
babic_a 6928d931ce Add marker for invalid frame_index
So far we used 0 but this is not valid int he Eiger case
where the frame_index gets set to 0 in each acquisition.
2021-07-06 11:22:38 +02:00
lhdamiani 300d992acf Merge branch 'eiger' of https://github.com/paulscherrerinstitute/sf_daq_buffer into eiger
Conflicts:
	jf-assembler/src/main.cpp
	jf-udp-recv/src/main.cpp
	std-udp-recv/src/FrameUdpReceiver.cpp
2021-07-05 22:13:15 +02:00
babic_a a64ea62c88 Isolate detector differences to FrameUdpRecv 2021-07-05 15:14:00 +02:00
babic_a 7879c3c3ea Move JF specific receiver to generic 2021-07-02 14:41:48 +02:00