|
|
19dbbdd8bb
|
ZMQImagePuller: Fix republish socket direction
|
2024-03-08 09:38:57 +01:00 |
|
|
|
48f7318438
|
Merge branch '2304-writer' into 'main'
Writer error reporting improvement
See merge request jungfraujoch/nextgendcu!30
|
2024-03-06 19:57:31 +01:00 |
|
|
|
5b91d0059e
|
Writer error reporting improvement
|
2024-03-06 19:57:31 +01:00 |
|
|
|
b36811968b
|
Merge branch '2402-swissfel-crmx' into 'main'
Modifications after SwissFEL CrMX beamtime
See merge request jungfraujoch/nextgendcu!29
|
2024-03-05 20:41:47 +01:00 |
|
|
|
d315506633
|
* Enhancements for XFEL
* Enhancements for EIGER
* Writer is more flexible and capable of handling DECTRIS data
|
2024-03-05 20:41:47 +01:00 |
|
|
|
71d862b706
|
Merge branch 'dev240207-resnet' into 'main'
Add deep learning resolution estimation model from Stanford
See merge request jungfraujoch/nextgendcu!26
|
2024-02-08 20:15:29 +01:00 |
|
|
|
8dcecb9685
|
Add deep learning resolution estimation model from Stanford
|
2024-02-08 20:15:29 +01:00 |
|
|
|
1b4ab88f54
|
Merge branch 'dev240207' into 'main'
Minor modifications in SwissFEL preparations
See merge request jungfraujoch/nextgendcu!25
|
2024-02-07 09:43:52 +01:00 |
|
|
|
820c3616e5
|
Minor modifications in SwissFEL preparations
|
2024-02-07 09:43:52 +01:00 |
|
|
|
de95928e64
|
Merge branch 'dev240131_spot_finder' into 'main'
Fixes after MAX IV experiment
See merge request jungfraujoch/nextgendcu!24
|
2024-02-05 17:18:16 +01:00 |
|
|
|
babb1a5c8d
|
Fixes after MAX IV experiment
|
2024-02-05 17:18:16 +01:00 |
|
|
|
91a0960303
|
Merge branch 'dev240129_http_writer' into 'main'
jfjoch_writer improvement
See merge request jungfraujoch/nextgendcu!23
|
2024-01-30 20:34:30 +01:00 |
|
|
|
52519fb45c
|
jfjoch_writer improvement
|
2024-01-30 20:34:30 +01:00 |
|
|
|
34dd74d8ae
|
Merge branch 'dev231218' into 'main'
FPGA: Change FIFO size to improve placing
See merge request jungfraujoch/nextgendcu!22
|
2024-01-28 20:11:39 +01:00 |
|
|
|
6e85a30930
|
FPGA: Change FIFO size to improve placing
|
2024-01-28 20:11:39 +01:00 |
|
|
|
5598a98ea4
|
Merge branch 'dev231218' into 'main'
Modifications in preparation to MAX IV experiment
See merge request jungfraujoch/nextgendcu!21
|
2024-01-27 21:23:57 +01:00 |
|
|
|
f5f86d9ab6
|
Modifications in preparation to MAX IV experiment
|
2024-01-27 21:23:56 +01:00 |
|
|
|
2446643489
|
Merge branch 'dev231218' into 'main'
Remove AN/LT capability
See merge request jungfraujoch/nextgendcu!19
|
2023-12-18 12:33:31 +01:00 |
|
|
|
07fd769102
|
Remove AN/LT capability
|
2023-12-18 12:33:31 +01:00 |
|
|
|
c04a4e8f29
|
Merge branch 'dev231215' into 'main'
Fix spot finding + fix FPGA network LEDs behavior
See merge request jungfraujoch/nextgendcu!18
|
2023-12-16 09:20:46 +01:00 |
|
|
|
d66b6b949d
|
Fix spot finding + fix FPGA network LEDs behavior
|
2023-12-16 09:20:46 +01:00 |
|
|
|
e88f00f090
|
Merge branch 'spot_finder_bug' into 'main'
Initial look into bug with spot finder
See merge request jungfraujoch/nextgendcu!17
|
2023-12-15 06:50:15 +01:00 |
|
|
|
a4e7cd54ae
|
Initial look into bug with spot finder
|
2023-12-15 06:50:14 +01:00 |
|
|
|
05563966ee
|
Merge branch 'dev231212' into 'main'
Minor fixes for CI, dependencies, and documentation
See merge request jungfraujoch/nextgendcu!16
|
2023-12-14 22:39:17 +01:00 |
|
|
|
d82bd13917
|
Minor fixes for CI and dependencies
Improvements in documentation and readability of JungfraujochDevice function
|
2023-12-14 22:39:17 +01:00 |
|
|
|
76e56cdf73
|
Merge branch 'openapi-pistache' into 'main'
New REST+OpenAPI interface
See merge request jungfraujoch/nextgendcu!15
|
2023-12-11 12:11:54 +01:00 |
|
|
|
0b69dfb290
|
New REST+OpenAPI interface
|
2023-12-11 12:11:54 +01:00 |
|
|
|
99f33eaf53
|
Merge branch 'generalized_serializer' into 'main'
Generalized serializer
See merge request jungfraujoch/nextgendcu!13
|
2023-12-11 06:49:24 +01:00 |
|
|
|
f1935526a7
|
Generalized serializer
|
2023-12-11 06:49:24 +01:00 |
|
|
|
75913b83eb
|
Merge branch 'fpga_interrupt_anlt' into 'main'
Extend FPGA functionality
See merge request jungfraujoch/nextgendcu!12
|
2023-12-09 12:08:40 +01:00 |
|
|
|
1798de247b
|
Extend FPGA functionality
|
2023-12-09 12:08:39 +01:00 |
|
|
|
35a9614f38
|
Merge branch 'maxiv_ci' into 'main'
CI: Rename MAX IV CI file
See merge request jungfraujoch/nextgendcu!11
|
2023-12-05 11:29:17 +01:00 |
|
|
|
412ee6f05c
|
CI: Rename MAX IV CI file
|
2023-12-05 11:28:15 +01:00 |
|
|
|
4df4c4779a
|
Merge branch 'maxiv_ci' into 'main'
Added Gitlab CI script specific for MAX IV
See merge request jungfraujoch/nextgendcu!10
|
2023-12-04 22:04:48 +01:00 |
|
|
|
e8e90ff623
|
Added Gitlab CI script specific for MAX IV
Signed-off-by: Filip Leonarski <filip.leonarski@psi.ch>
|
2023-12-04 22:03:16 +01:00 |
|
|
|
905c26ba88
|
CI: Remove JFJOCH_COMPILE_TESTS from cmake directives
|
2023-11-29 10:49:24 +01:00 |
|
|
|
1d3d8d081e
|
FPGA: add power report after routing
|
2023-11-28 21:30:40 +01:00 |
|
|
|
657cf802eb
|
FPGA: frame_summation_reorder_compl doesn't need ap_start
|
2023-11-23 16:39:48 +01:00 |
|
|
|
73cb5531b5
|
FPGA: Remove frame_summation_reorder_compl test bench
|
2023-11-23 16:38:29 +01:00 |
|
|
|
96c47cfd73
|
FPGAIntegrationTest: Fix test
|
2023-11-23 16:37:58 +01:00 |
|
|
|
5e7868d17d
|
FPGA: frame_summation_reorder_compl - minor change in operation order
|
2023-11-23 14:56:40 +01:00 |
|
|
|
d38a6baa59
|
FPGA: load_from_hbm: release handles before receiving start message
|
2023-11-23 14:56:21 +01:00 |
|
|
|
e254ef1a60
|
FPGA: No "trailing" address message in AXI-Stream
|
2023-11-23 14:52:53 +01:00 |
|
|
|
a7c2849a84
|
FPGA: measure pipeline beats in timer
|
2023-11-21 15:55:23 +01:00 |
|
|
|
39ca47aea9
|
FPGA: Add processing stalls
|
2023-11-21 15:42:26 +01:00 |
|
|
|
d2f1c569a7
|
FPGA: Modify FPGA register map (move action configuration to offset 0x200)
|
2023-11-21 15:24:55 +01:00 |
|
|
|
8635724ca3
|
Move FPGA register map from Definitions.h to jfjoch_drv.h
|
2023-11-21 15:20:12 +01:00 |
|
|
|
8e624b4486
|
Remove ActionConfigTest - not needed
|
2023-11-21 15:18:25 +01:00 |
|
|
|
cd69dba6ab
|
jfjoch_broker: Adding pistache as dependency
|
2023-11-21 14:12:40 +01:00 |
|
|
|
f4f35adb02
|
FPGA: load_calibration - First check if addresses are OK, then issue datamover read commands
|
2023-11-20 15:11:51 +01:00 |
|
