|
|
e1f5dc1ef5
|
Merge branch '2404-pusher-performance' into 'main'
Refactor how frames are sent from receiver
See merge request jungfraujoch/nextgendcu!45
|
2024-04-14 21:47:06 +02:00 |
|
|
|
85a169ec19
|
Refactor how frames are sent from receiver
|
2024-04-14 21:47:06 +02:00 |
|
|
|
5a793a9260
|
Merge branch '2404-pedestal-sc-int' into 'main'
Use internal trigger to take pedestal + fix fixedG1 pedestal with SCs
See merge request jungfraujoch/nextgendcu!44
|
2024-04-13 14:27:38 +02:00 |
|
|
|
38ed2ed56f
|
Use internal trigger to take pedestal + fix fixedG1 pedestal with SCs
|
2024-04-13 14:27:37 +02:00 |
|
|
|
24029d1268
|
Merge branch '2404-dectris-format' into 'main'
Move back to DECTRIS flavor of NXmx
See merge request jungfraujoch/nextgendcu!43
|
2024-04-11 16:10:21 +02:00 |
|
|
|
809441d0f0
|
Move back to DECTRIS flavor of NXmx
|
2024-04-11 16:10:21 +02:00 |
|
|
|
c28c71a3f1
|
Merge branch '2404-indexing-enable' into 'main'
2404 indexing enable
See merge request jungfraujoch/nextgendcu!42
|
2024-04-11 09:25:49 +02:00 |
|
|
|
82a2d9a7bf
|
2404 indexing enable
|
2024-04-11 09:25:48 +02:00 |
|
|
|
f2be4c677d
|
Merge branch '2404-preview-functionality' into 'main'
Improve preview functionality
See merge request jungfraujoch/nextgendcu!41
|
2024-04-10 11:17:36 +02:00 |
|
|
|
006886b39f
|
Improve preview functionality
|
2024-04-10 11:17:36 +02:00 |
|
|
|
4db3fced94
|
Merge branch '2404-statusvector-fix-2' into 'main'
StatusVector: Use std::vector instead of std::map
See merge request jungfraujoch/nextgendcu!40
|
2024-04-09 14:14:28 +02:00 |
|
|
|
344032e830
|
StatusVector: Use std::vector instead of std::map
|
2024-04-09 13:40:47 +02:00 |
|
|
|
d1c22fe414
|
Merge branch '2404-disable-spot-finding' into 'main'
OpenAPI: Add spot finding enable/disable option
See merge request jungfraujoch/nextgendcu!39
|
2024-04-09 06:55:58 +02:00 |
|
|
|
9cff0dc6f7
|
OpenAPI: Add spot finding enable/disable option
|
2024-04-09 00:27:41 +02:00 |
|
|
|
c1e046b90d
|
Merge branch '2404-filewriter' into 'main'
File writer and spot finding improvements
See merge request jungfraujoch/nextgendcu!37
|
2024-04-08 11:18:50 +02:00 |
|
|
|
c6d2b5eedf
|
File writer and spot finding improvements
|
2024-04-08 11:18:50 +02:00 |
|
|
|
15d99c6162
|
Merge branch '2403-plots' into 'main'
Improve plotting
See merge request jungfraujoch/nextgendcu!36
|
2024-03-31 23:08:19 +02:00 |
|
|
|
30e775d8a2
|
Improve plotting
|
2024-03-31 23:08:19 +02:00 |
|
|
|
8cad89d649
|
Merge branch '2403-hostname-bug' into 'main'
Fix bug in detector initialize
See merge request jungfraujoch/nextgendcu!35
|
2024-03-23 04:07:12 +01:00 |
|
|
|
30599e2858
|
Fix bug in detector initialize
|
2024-03-23 04:07:12 +01:00 |
|
|
|
009c275c99
|
Merge branch '2403-gpu-bug' into 'main'
Updates March 2023
See merge request jungfraujoch/nextgendcu!34
|
2024-03-14 20:26:03 +01:00 |
|
|
|
59aacf516d
|
Updates March 2023
|
2024-03-14 20:26:03 +01:00 |
|
|
|
affb8d1380
|
Merge branch '2403-det-stop-bug' into 'main'
Cancel data acquisition not working when detector waits for TTL trigger
See merge request jungfraujoch/nextgendcu!33
|
2024-03-08 18:17:12 +01:00 |
|
|
|
add967483b
|
DetectorWrapper: InternalStop() should also stop detector if it is waiting for trigger
|
2024-03-08 12:48:24 +01:00 |
|
|
|
738cd26e6b
|
Merge branch '230308-repub-fix' into 'main'
ZMQImagePuller: Fix republish socket direction
See merge request jungfraujoch/nextgendcu!32
|
2024-03-08 09:40:03 +01:00 |
|
|
|
19dbbdd8bb
|
ZMQImagePuller: Fix republish socket direction
|
2024-03-08 09:38:57 +01:00 |
|
|
|
7a12617517
|
Merge branch '2303-small-fixes' into 'main'
2303 small fixes
See merge request jungfraujoch/nextgendcu!31
|
2024-03-07 18:28:10 +01:00 |
|
|
|
cbd953b602
|
2303 small fixes
|
2024-03-07 18:28:09 +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 |
|
