Commit Graph

452 Commits

Author SHA1 Message Date
lhdamiani 034fd906a4 cleanup eiger assembler 2021-07-20 17:35:59 +02:00
babic_a 8a88a1b1da Make better error message 2021-07-19 13:11:43 +02:00
lhdamiani 2a6af029b7 eiger config json update. det writer image id bugfix 2021-07-08 18:27:05 +02:00
babic_a 30b33fed36 Small fixes 2021-07-06 17:51:36 +02:00
babic_a b4e19d620d Adjust ImageMetadata to common standard 2021-07-06 16:33:35 +02:00
babic_a 32de4886d4 Fix IPC base and URL 2021-07-06 16:02:29 +02:00
lhdamiani 71658e34e5 Merge branch 'eiger' of https://github.com/paulscherrerinstitute/sf_daq_buffer into eiger
Conflicts:
	core-buffer/test/test_RamBuffer.cpp
	jf-assembler/src/main.cpp
2021-07-06 14:41:04 +02:00
lhdamiani 96a9802e91 merged conflicts. assembler with external sync. 2021-07-06 14:37:41 +02:00
babic_a 45ca6dcd13 Fix core buffer tests 2021-07-06 12:31:51 +02:00
babic_a fb6673a32e Fix bug taking pulse_id instead of id 2021-07-06 12:03:07 +02:00
lhdamiani 8fd1c4cf7a detached sync and assembler with zmq recv. 2021-07-06 11:57:43 +02:00
babic_a cf17a379a5 Import correct headers in core tests 2021-07-06 11:55:04 +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
lhdamiani a81c1fa773 eiger image assemble routine. 2021-07-05 22:03:41 +02:00
babic_a 9ff380e78a Remove unused import 2021-07-05 16:07:47 +02:00
babic_a 64375de624 Move detector configs to common 2021-07-05 16:07:27 +02:00
babic_a 566820ed0c Remove static buffer config
This needs to be calculated based on the bit depth
2021-07-05 14:49:31 +02:00
babic_a 7b8a065d8c Remove unused include 2021-07-05 14:48:41 +02:00
babic_a 0082c30a66 Adjust the ImageMetadata format 2021-07-05 14:47:58 +02:00
babic_a 7b4b750914 Adjust formats to latest standard 2021-07-05 14:45:09 +02:00
babic_a bdd065cd42 Comment out structs not used 2021-07-02 15:15:42 +02:00
babic_a 2935739717 Move detector specific files to std receiver 2021-07-02 15:14:25 +02:00
babic_a ce93dce7cf Removed MODULE_N_BYTES requirement 2021-07-02 14:17:38 +02:00
babic_a 95be6b25e2 Remove Eiger module n_bytes and calculate correctly 2021-07-02 14:13:56 +02:00
babic_a f80fa1ca3a Adjustments to RamBuffer 2021-07-02 13:04:13 +02:00
babic_a 76fd1e923b Externalize image assembly from RamBuffer 2021-07-02 12:40:22 +02:00
lhdamiani c344daaffe bit depth parameter infrastructure. partial eiger assemble image routine. 2021-07-02 10:44:51 +02:00
lhdamiani 4b8035ab2a Merge branch 'master' into eiger 2021-04-14 18:04:40 +02:00
babic_a 246d5e7dde Add debug output to BufferUtils 2021-04-14 11:59:56 +02:00
lhdamiani 22f73b0273 controls scripts of eiger and debug msgs 2021-03-05 16:47:18 +01:00
lhdamiani edb9b94fa5 Merge with Master+RamBuffer 2021-03-03 17:55:18 +01:00
lhdamiani 9eb81caabd ModuleFrame struct with row and column 2021-03-03 17:48:57 +01:00
babic_a ee8a1fbdae Removed unused image size from config 2021-02-26 14:23:35 +01:00
babic_a b2694fb849 Add image size to detector config 2021-02-24 08:57:46 +01:00
hax_l 7db438671c more debug msgs. adjusts on streamer and assembler to work with frame_index instead of pulse_id. 2021-02-19 18:16:34 +01:00
hax_l dda2f9610e merge with current ram_buffer branch 2021-02-17 16:22:39 +01:00
hax_l 150bf41bf2 core adjustments for eiger header. more debug msgs 2021-02-17 16:08:59 +01:00
babic_a 6212869f0a Merge remote-tracking branch 'origin/ram_buffer' into ram_buffer 2021-02-17 11:52:35 +01:00
Dmitry Ozerov aba739ce87 print statistics from udp writer every N seconds (not N frames)
check that frame packets sending is finished (new frame) by new trigger number, not pulse_id
check if pulse_id of the frame is more or less correct (in case not - do not store that frame in the ram buffer)
2021-02-16 16:25:28 +01:00
hax_l 1de8f66bdc more debug info. bunch/pulseid adjusts. 2021-02-12 16:58:02 +01:00
hax_l ac442f0a00 :impl of cmake flags and usage of different detector packets. 2021-02-01 16:10:45 +01:00
hax_l 11cb0eb3ce eiger_packet definitions and initial related changes 2021-01-27 16:47:49 +00:00
babic_a b39fd93431 Add method for creating image buffer files 2021-01-20 11:10:39 +01:00
babic_a 65fb6c929f Remove hdf5 linking to core-buffer 2021-01-19 13:40:16 +01:00
babic_a 0df8598952 Separate image assembly and image retrieval in RamBuffer 2021-01-19 13:22:43 +01:00
babic_a ccca4225d4 Change bind and connect socket helper functions to take string 2021-01-19 13:02:03 +01:00
babic_a 20bf00cbbe Adjust RamBuffer test 2021-01-19 10:52:18 +01:00
babic_a e013c4a6f8 Increase number of packets read at once to 128 2021-01-15 18:18:54 +01:00
babic_a ba9532591c Add details about unexpected pulse_id in ram buffer error 2021-01-15 11:14:54 +01:00