Commit Graph

538 Commits

Author SHA1 Message Date
e1a6830c50 FPGA: Add multipixel (-> TODO calculate proper number) 2023-10-24 16:43:24 +02:00
6d74732bf5 Merge branch 'fpga_hbm_cache' into 'main'
Introduce HBM cache into the design

See merge request jungfraujoch/nextgendcu!7
2023-10-22 16:11:21 +02:00
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
ea0fccecc9 JFConversionGPU: Remove 2023-10-22 14:39:03 +02: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
af27854440 Frontend: Add ADU histogram plot 2023-10-21 23:08:17 +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
a7706546b7 RadialIntegration: Remove pixel split 2023-10-21 16:18:41 +02:00
19644a1f5f FPGA: Trigger synthesis 2023-10-21 16:12:51 +02:00
c86bc4591c AcquisitionDevice: Remove automatic setup of radial integration 2023-10-21 16:08:49 +02:00
4ede0f1f15 FPGA: rename axis_256_to_512.cpp file 2023-10-21 15:38:40 +02:00
3b65e6bf88 FPGA: Integration on FPGA allows for per pixel weights (in range 1.99 - 3e-5) 2023-10-21 15:37:46 +02:00
d91eb6bdd5 FPGAIntegrationTest: Use multiple modules 2023-10-21 11:08:07 +02:00
0b5bbec1fc AcquisitionDevice: Setup rad. int. mapping automatically 2023-10-20 18:00:29 +02:00
7008703af3 FPGA: Integration is not calculating sum2 2023-10-20 14:06:58 +02:00
a338a1743b RawToConvertedGeometry: Add function to calculate location of a raw pixel in converted geometry 2023-10-20 13:27:21 +02:00
ad78fb0149 FPGA: Fixes and simplifications to spot_finder core + SNR threshold test 2023-10-20 12:23:50 +02:00
4e4a232a6d Definitions: Increase max gRPC message size to 2 GB -> need to change later how calibration is being transferred 2023-10-20 11:40:09 +02:00
45de356c16 FPGA: Minor changes 2023-10-19 22:43:35 +02:00
aa1ff0436b FPGA: Add SNR threshold to spot finder 2023-10-19 22:29:38 +02:00
60466fe146 FPGA: Add extra comment to spot_finder 2023-10-19 20:56:24 +02:00
9f48e4b317 FPGA: remove spot_finder.h 2023-10-19 20:53:38 +02:00
f04f7a274b FPGA: Name spot finder signals in consistent manner 2023-10-19 20:52:09 +02:00
67b9e08a5c FPGAIntegrationTest: Add test for spot finder based on count limit 2023-10-19 19:48:40 +02:00
90344eb251 FPGA: Basic spot finder (i.e. only based on count threshold) as a placeholder 2023-10-19 19:40:31 +02:00
c7b7abb34d FPGA: Remove register slice for strong pixel result 2023-10-19 12:14:17 +02:00
6691b01265 PCIe driver: accept spot finding parameters 2023-10-18 21:23:41 +02:00
a56a54c72d AcquisitionDevice: GetDeviceOutput to get the whole package 2023-10-18 19:42:57 +02:00
6f9f918ee6 HLS: Improve make scripts, so HLS test bench can be defined 2023-10-18 16:32:31 +02:00
736a181e5e HLS: Spot finder outputs parameters + statistics 2023-10-18 15:19:01 +02:00
ec7278bd44 HLS: Changes to allow cosimulation with Vitis HLS 2023-10-18 14:44:30 +02:00
e4ac3e8b08 FPGASpotFindingUnitTest: Very basic test for spot finder 2023-10-18 12:10:29 +02:00
6565619035 parallel_stream.h: Depth can be provided as template parameter to hls::stream (like in Vitis HLS) 2023-10-18 12:10:00 +02:00
79df7cf7d5 FPGA: Add extra AXI-Stream register slices 2023-10-17 19:40:55 +02:00
83fb1fd465 FPGA: Clean-up of prefix_sum 2023-10-17 13:22:49 +02:00
217992be94 FPGA: Second variant of prefix sum 2023-10-17 10:39:11 +02:00
05338887a7 FPGA: Spot finder accepts 16-bit number for strong pixel threshold 2023-10-16 22:07:41 +02:00
faca7a3f15 PCIe driver: Clean-up + add intermediate library between driver and AcquisitionDevice 2023-10-16 19:54:13 +02:00
2fd8d38782 PCIe driver: add basic permission handling 2023-10-16 15:13:47 +02:00
202b7ee0ca PCIe driver: clean-up 2023-10-16 15:13:47 +02:00
c5ca10792e FPGA: Clean-up of spot_finder core + update README.MD 2023-10-16 15:13:47 +02:00
9b646a4195 FPGA: Spot finder 2nd version more improved 2023-10-04 16:59:13 +02:00