|
|
61f4adf743
|
Merge branch 'main' into 'fpga_hbm_cache'
# Conflicts:
# etc/broker.json
# python/jfjoch_pb2.py
# receiver/FPGAAcquisitionDevice.cpp
# receiver/FPGAAcquisitionDevice.h
# receiver/jfjoch_action_test.cpp
# tests/FPGAIntegrationTest.cpp
# tests/JFJochReceiverIntegrationTest.cpp
|
2023-10-22 13:55:41 +00:00 |
|
|
|
c1469d1e46
|
JFJochReceiver: Skip frames if acquisition finished and frames stopped earlier on the first acquisition device
|
2023-10-22 14:36:53 +02:00 |
|
|
|
bc43921004
|
JFJochReceiver: Remove local conversion (not useful -> simplify)
|
2023-10-22 13:45:47 +02:00 |
|
|
|
fe5b955289
|
GPUImageAnalysis: Spot finder again produces 1-bit result (similar to FPGA) reduced on CPU + mask is not applied on GPU
|
2023-10-22 13:42:09 +02:00 |
|
|
|
566ff52bfc
|
JFJochReceiver: Single preview, that can be switched to present all or indexed only results
|
2023-10-22 12:41:59 +02:00 |
|
|
|
ee363a8356
|
JFJochReceiver: Given firmware now masks uncollected parts of the image, receiver will accept partial modules (but not for pedestal!)
|
2023-10-21 23:01:17 +02:00 |
|
|
|
624c928c84
|
JFJochReceiver: ADU histogram saved on per module basis at the end of the measurement (but not on per image basis)
|
2023-10-21 22:31:43 +02:00 |
|
|
|
99741ae5c5
|
ADU histogram: Save
|
2023-10-21 19:51:25 +02:00 |
|
|
|
53f4f4acf9
|
RadialIntegration: Calculate only on FPGA
|
2023-10-21 19:15:42 +02:00 |
|
|
|
dd4988486c
|
RadialIntegrationMapping: No mask
|
2023-10-21 17:20:12 +02:00 |
|
|
|
b4ab3087f1
|
RadialIntegrationProfile: Extra routines to handle GPU/CPU/FPGA workflows in more versatile way
|
2023-10-21 17:14:17 +02:00 |
|
|
|
a56a54c72d
|
AcquisitionDevice: GetDeviceOutput to get the whole package
|
2023-10-18 19:42:57 +02:00 |
|
|
|
494ccba73d
|
JFJochReceiver: Handle better error in binding to NUMA policy
|
2023-09-20 14:24:31 +02:00 |
|
|
|
16bbf54f2a
|
Remove open source license (for now)
|
2023-09-15 10:47:21 +02:00 |
|
|
|
ac5052073e
|
JFJochReceiver: Option for local conversion
|
2023-08-05 15:23:45 +02:00 |
|
|
|
184d136158
|
JFJochReceiver: Prepare to have fixed_point_conversion locally
|
2023-08-04 21:41:07 +02:00 |
|
|
|
defa97c88b
|
JFJochReceiver: Use malloc (no need to init to zero)
|
2023-08-04 13:02:55 +02:00 |
|
|
|
7d945c8195
|
JFJochReceiver: send buffer is pointer with more flexibility
|
2023-08-04 12:46:58 +02:00 |
|
|
|
9d978a41f7
|
NUMAHWPolicy: Added
|
2023-07-28 11:07:15 +02:00 |
|
|
|
ac1d358700
|
AcquisitionDevice: Improve detection of erroneous frames without killing data acquisition
|
2023-07-25 12:40:57 +02:00 |
|
|
|
831c93104d
|
DiffractionExperiment: Add option to save calibration
|
2023-06-28 17:30:59 +02:00 |
|
|
|
0904e1f198
|
JFJochFrameSerializer: Using CBORImage for mask and calibration + writing calibration in HDF5 file
|
2023-06-28 17:14:09 +02:00 |
|
|
|
a43fa2a296
|
ProtoBuf: Don't use maps, as these don't preserve order of elements
|
2023-06-26 09:27:47 +02:00 |
|
|
|
945a3b9271
|
DiffractionExperiment: Enable/disable solid angle and polarization corrections
|
2023-06-19 11:36:32 +02:00 |
|
|
|
459b84d7c6
|
AcquisitionCounters: Simplify
|
2023-06-03 19:41:42 +02:00 |
|
|
|
ab6f33be84
|
AcquisitionDevice: further simplify
|
2023-06-03 18:54:05 +02:00 |
|
|
|
0ef50e06b3
|
jfjoch_receiver: Add channel for indexed images
|
2023-05-19 16:45:12 +02:00 |
|
|
|
eaccdf67b7
|
ZMQPreviewPublisher: Add spots to preview message + allow for frame number management within the ZMQPreviewPublisher
|
2023-05-18 22:36:43 +02:00 |
|
|
|
1df16b1a1e
|
JFJochReceiver: Save receiver_available_send_buffers and receiver_aq_dev_delay in HDF5 file
|
2023-05-18 12:46:58 +02:00 |
|
|
|
bb4cee9b2d
|
JFJochReceiver: Save information on crystal lattice and spot indexing status to HDF5 file
|
2023-05-18 10:46:46 +02:00 |
|
|
|
ea719742ce
|
DiffractionExperiment: Solid angle correction is saved with the master file
|
2023-05-17 22:53:41 +02:00 |
|
|
|
11e478a5d0
|
DiffractionExperiment: Solid angle correction is not anymore preference of a dataset; it can be now turned on and off when asking for plot
|
2023-05-17 22:33:03 +02:00 |
|
|
|
33b70551c5
|
CBOR: Keep base for exptime and timestamp in the ImageMessage structure
|
2023-05-17 21:54:07 +02:00 |
|
|
|
7d5694139f
|
FPGA: Save full JF timestamp and exptime
|
2023-05-17 21:30:42 +02:00 |
|
|
|
f372c0e697
|
ImageMessage: Add storage cell number
|
2023-05-17 20:40:55 +02:00 |
|
|
|
8e1b0b764a
|
JFJochReceiver: Print which storage cell (according to header) was used to calculate pedestal
|
2023-05-15 15:38:22 +02:00 |
|
|
|
bc396bfd25
|
JFJochReceiver: add bkg estimate to measurement statistics
|
2023-05-13 12:23:01 +02:00 |
|
|
|
8d154aa0a1
|
JFJochReceiver: Add per file indexing rate. Drop per file radial integration using GetPlots()
|
2023-05-10 19:09:52 +02:00 |
|
|
|
db54692735
|
JFJochReceiver: Minor change to way how radiation integration profiles are generated
|
2023-05-10 09:22:02 +02:00 |
|
|
|
e5739f5408
|
JFJochReceiver: Transfer all radial integration profiles in one ProtoBuf
|
2023-05-09 22:19:05 +02:00 |
|
|
|
2e73acef6b
|
JFJochReceiver: Use floats for indexing rate and progress
|
2023-05-09 17:12:28 +02:00 |
|
|
|
0fb5d68154
|
JFJochReceiver: Setup number of send buffers
|
2023-05-09 17:11:03 +02:00 |
|
|
|
122c58fbf7
|
JFJochReceiver: Track available send buffers
|
2023-05-09 16:44:56 +02:00 |
|
|
|
b33cc45edf
|
JFJochReceiver: Using ZeroCopyReturnValue
|
2023-05-09 16:40:47 +02:00 |
|
|
|
2c62d01759
|
JFJochFrameSerializer: Serializer buffer is managed externally
|
2023-05-09 15:36:56 +02:00 |
|
|
|
70fb7b96f8
|
RadialIntegrationProfile: Minor change to the interface
|
2023-05-09 14:47:23 +02:00 |
|
|
|
a867b1c596
|
DiffractionExperiment: solid angle correction
|
2023-05-09 14:03:59 +02:00 |
|
|
|
5d63bac30f
|
JFJochReceiver: add safety for overruninng the buffer
|
2023-05-09 12:09:23 +02:00 |
|
|
|
a9c37ce418
|
JFJochReceiver: use const for serializer buffer size
|
2023-05-09 11:48:21 +02:00 |
|
|
|
29a8eb690e
|
JFJochReceiver: Remove ZMQ zero-copy => need to design with a proper buffer and WR/WC queues
|
2023-05-09 10:30:58 +02:00 |
|
