Commit Graph

764 Commits

Author SHA1 Message Date
leonarski_f c8680dda9f Merge branch '2404-doc' into 'main'
Updates to documentation

See merge request jungfraujoch/nextgendcu!50
2024-04-26 10:29:00 +02:00
leonarski_f 97b0d765f1 Updates to documentation 2024-04-26 10:28:31 +02:00
leonarski_f 06feb8ea30 Merge branch 'indexer-fix' into 'main'
CMake: Temporary fix for fast-feedback-indexer

See merge request jungfraujoch/nextgendcu!49
2024-04-26 08:46:10 +02:00
leonarski_f 3ca5cf1a61 CMake: Temporary fix for fast-feedback-indexer 2024-04-26 08:01:37 +02:00
leonarski_f 00facc9aef Merge branch '2404-writer-performance' into 'main'
Improvements before MAX IV test

See merge request jungfraujoch/nextgendcu!48
2024-04-25 20:11:58 +02:00
leonarski_f ea70b27e85 Improvements before MAX IV test 2024-04-25 20:11:58 +02:00
leonarski_f 2c8e1fd83d Merge branch '2404-indexing' into 'main'
Indexing improvements

See merge request jungfraujoch/nextgendcu!47
2024-04-20 13:41:41 +02:00
leonarski_f 4e8c3a88a7 Indexing improvements 2024-04-20 13:41:41 +02:00
leonarski_f 876457e9c0 Merge branch '2404-eiger-support' into 'main'
Modifications necessary for the EIGER test

See merge request jungfraujoch/nextgendcu!46
2024-04-18 15:36:52 +02:00
leonarski_f 9630c06b02 Modifications necessary for the EIGER test 2024-04-18 15:36:52 +02:00
leonarski_f 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
leonarski_f 85a169ec19 Refactor how frames are sent from receiver 2024-04-14 21:47:06 +02:00
leonarski_f 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
leonarski_f 38ed2ed56f Use internal trigger to take pedestal + fix fixedG1 pedestal with SCs 2024-04-13 14:27:37 +02:00
leonarski_f 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
leonarski_f 809441d0f0 Move back to DECTRIS flavor of NXmx 2024-04-11 16:10:21 +02:00
leonarski_f 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
leonarski_f 82a2d9a7bf 2404 indexing enable 2024-04-11 09:25:48 +02:00
leonarski_f 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
leonarski_f 006886b39f Improve preview functionality 2024-04-10 11:17:36 +02:00
leonarski_f 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
leonarski_f 344032e830 StatusVector: Use std::vector instead of std::map 2024-04-09 13:40:47 +02:00
leonarski_f 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
leonarski_f 9cff0dc6f7 OpenAPI: Add spot finding enable/disable option 2024-04-09 00:27:41 +02:00
leonarski_f 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
leonarski_f c6d2b5eedf File writer and spot finding improvements 2024-04-08 11:18:50 +02:00
leonarski_f 15d99c6162 Merge branch '2403-plots' into 'main'
Improve plotting

See merge request jungfraujoch/nextgendcu!36
2024-03-31 23:08:19 +02:00
leonarski_f 30e775d8a2 Improve plotting 2024-03-31 23:08:19 +02:00
leonarski_f 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
leonarski_f 30599e2858 Fix bug in detector initialize 2024-03-23 04:07:12 +01:00
leonarski_f 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
leonarski_f 59aacf516d Updates March 2023 2024-03-14 20:26:03 +01:00
leonarski_f 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
leonarski_f add967483b DetectorWrapper: InternalStop() should also stop detector if it is waiting for trigger 2024-03-08 12:48:24 +01:00
leonarski_f 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
leonarski_f 19dbbdd8bb ZMQImagePuller: Fix republish socket direction 2024-03-08 09:38:57 +01:00
leonarski_f 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
leonarski_f cbd953b602 2303 small fixes 2024-03-07 18:28:09 +01:00
leonarski_f 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
leonarski_f 5b91d0059e Writer error reporting improvement 2024-03-06 19:57:31 +01:00
leonarski_f 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
leonarski_f 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
leonarski_f 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
leonarski_f 8dcecb9685 Add deep learning resolution estimation model from Stanford 2024-02-08 20:15:29 +01:00
leonarski_f 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
leonarski_f 820c3616e5 Minor modifications in SwissFEL preparations 2024-02-07 09:43:52 +01:00
leonarski_f 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
leonarski_f babb1a5c8d Fixes after MAX IV experiment 2024-02-05 17:18:16 +01:00
leonarski_f 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
leonarski_f 52519fb45c jfjoch_writer improvement 2024-01-30 20:34:30 +01:00