Commit Graph

232 Commits

Author SHA1 Message Date
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 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
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
lhdamiani a81c1fa773 eiger image assemble routine. 2021-07-05 22:03:41 +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
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
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 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 ba9532591c Add details about unexpected pulse_id in ram buffer error 2021-01-15 11:14:54 +01:00
babic_a 430a1507ff Add buffer folder to detector config 2020-09-30 13:56:41 +02:00
babic_a 3d21216094 Add udp port to config file 2020-09-30 13:34:09 +02:00
babic_a ae61ccae17 Fix namespace of function 2020-09-30 11:34:54 +02:00
babic_a 9de3e896af Add configuration loading code to core-buffer 2020-09-30 10:45:40 +02:00
babic_a 3553541c96 Fix interface for reading frames 2020-09-24 11:32:44 +02:00
babic_a f16a81ed52 Change interface to use reference
This makes the receiver nicer.
2020-09-24 09:10:28 +02:00
babic_a b54f351089 Fix const correctness in buffer 2020-09-24 08:37:02 +02:00
babic_a a5629616d9 Create common connect and bind zmq methods 2020-09-24 08:33:45 +02:00
babic_a d858b4dc56 Fix memory offset bug in RamBuffer 2020-09-22 10:15:20 +02:00
babic_a 2f892539be Add reminder for improvement 2020-09-21 09:48:38 +02:00
babic_a b6360aceda Initialize the struct in case no frame is good in a slot 2020-09-04 13:11:49 +02:00
babic_a 13f46908c5 Small fixes to RamBuffer before tests 2020-09-04 13:00:31 +02:00
babic_a bf1a5a928b Remove module id from RamBuffer
Module id is already present in the buffer package.
2020-09-04 12:54:41 +02:00
babic_a 352aefef26 Add back n_slots to RamBuffer
In tests you don't want it to consume all your ram.
2020-09-04 12:45:59 +02:00
babic_a 4a031d6e62 Refactor RamBuffer 2020-09-04 12:31:57 +02:00
babic_a b3ddb922e9 Improve on shared buffer class 2020-09-04 10:35:50 +02:00
babic_a 28d407fb0e Implement common class for RamBuffer 2020-09-02 15:16:02 +02:00
babic_a 20f5557cc1 Add proper cleanup 2020-09-02 14:00:30 +02:00
babic_a 5b9b650803 Add stub implementation of RamBufferWriter 2020-09-02 13:39:26 +02:00
babic_a dbc913ee78 Update buffer folder and files naming convention
All references to folders and files inside buffer were updated.
- Base folder to write detector: detector_folder
- Name of the modules inside detector_folder: module_name
- Data grouping folders based on pulse_id: data_folder
- Data grouping files, based on pulse_id: data_file
2020-07-20 11:06:13 +02:00
babic_a 5d2871185a Move FastQueue to sf_stream 2020-06-09 10:10:19 +02:00
babic_a 6503c9b4e9 Lets make fast queue slower 2020-06-08 17:57:54 +02:00
babic_a 422b599b38 Rename core_config to buffer_config namespace 2020-06-04 11:59:05 +02:00
babic_a bbf604675e Merge buffer and writer utils 2020-06-04 10:55:43 +02:00