leonarski_f
656ce44fa8
Gitea CI: Upload packages
Build Packages / Generate python client (push) Failing after 2m5s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 26m23s
Build Packages / build:rpm (rocky8) (push) Successful in 25m24s
Build Packages / build:rpm (rocky9) (push) Successful in 25m29s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 16m8s
Build Packages / Build documentation (push) Successful in 1m14s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m7s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m13s
Build Packages / Unit tests (push) Successful in 51m25s
2025-09-19 16:19:58 +02:00
leonarski_f
cad428c328
Update CI
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 15m44s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / Build documentation (push) Successful in 1m30s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m4s
Build Packages / build:rpm (rocky9) (push) Successful in 10m12s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m2s
Build Packages / Unit tests (push) Successful in 1h6m34s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 5s
Build Packages / build:rpm (rocky8) (push) Successful in 13m56s
2025-09-19 10:09:53 +02:00
leonarski_f
7a179005a9
One more try with the upload pipeline
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 0s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 0s
Build Packages / build:rpm (rocky8) (push) Failing after 1s
Build Packages / build:rpm (rocky9) (push) Failing after 1s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 1s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 1s
Build Packages / Build documentation (push) Successful in 1m19s
Build Packages / Unit tests (push) Successful in 50m23s
Build Packages / Generate python client (push) Failing after 31s
2025-09-18 22:09:43 +02:00
leonarski_f
eb40e352fb
Fixes to python client upload part
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 0s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 0s
Build Packages / build:rpm (rocky8) (push) Failing after 1s
Build Packages / build:rpm (rocky9) (push) Failing after 0s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 0s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 0s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / Unit tests (push) Successful in 52m11s
Build Packages / Generate python client (push) Failing after 56s
2025-09-18 20:14:18 +02:00
leonarski_f
d19954bb4c
Fixes to python client upload part
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 0s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 0s
Build Packages / build:rpm (rocky8) (push) Failing after 1s
Build Packages / build:rpm (rocky9) (push) Failing after 0s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 0s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 0s
Build Packages / Generate python client (push) Failing after 27s
Build Packages / Build documentation (push) Successful in 1m17s
Build Packages / Unit tests (push) Successful in 54m20s
2025-09-18 19:52:06 +02:00
leonarski_f
662ccd1fc3
Fixes to tag upload part
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 0s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 0s
Build Packages / build:rpm (rocky8) (push) Failing after 0s
Build Packages / build:rpm (rocky9) (push) Failing after 0s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 0s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 1s
Build Packages / Build documentation (push) Successful in 1m18s
Build Packages / Generate python client (push) Failing after 19s
Build Packages / Unit tests (push) Successful in 57m52s
2025-09-18 19:45:02 +02:00
leonarski_f
eb429cf014
Test documentation upload
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m58s
Build Packages / build:rpm (rocky8) (push) Successful in 10m37s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / GPU test (push) Successful in 11s
Build Packages / Build documentation (push) Failing after 56s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m37s
Build Packages / build:rpm (rocky9) (push) Successful in 11m16s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m39s
Build Packages / Unit tests (push) Has been cancelled
2025-09-18 19:16:06 +02:00
leonarski_f
6cd2ad4f9e
Run CI on tags
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m8s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m2s
Build Packages / GPU test (push) Successful in 5s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / build:rpm (rocky8) (push) Successful in 9m52s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m30s
Build Packages / build:rpm (rocky9) (push) Successful in 10m56s
Build Packages / Unit tests (push) Successful in 1h9m27s
Build Packages / Generate python client (push) Failing after 20s
2025-09-18 18:39:41 +02:00
leonarski_f
e046384d78
tag
Build Packages / Generate python client (push) Successful in 49s
Build Packages / GPU test (push) Successful in 7s
Build Packages / Build documentation (push) Successful in 1m32s
Build Packages / build:rpm (rocky8_sls9) (push) Has been cancelled
Build Packages / build:rpm (rocky8) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2204) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2404) (push) Has been cancelled
Build Packages / Unit tests (push) Has been cancelled
Build Packages / build:rpm (rocky8_nocuda) (push) Has been cancelled
Build Packages / build:rpm (rocky9) (push) Has been cancelled
2025-09-18 18:34:07 +02:00
leonarski_f
030412f244
Test tagging
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 4s
Build Packages / GPU test (push) Successful in 5s
Build Packages / Generate python client (push) Successful in 1m3s
Build Packages / Build documentation (push) Successful in 1m46s
Build Packages / build:rpm (ubuntu2404) (push) Has been cancelled
Build Packages / build:rpm (rocky9) (push) Has been cancelled
Build Packages / build:rpm (rocky8) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2204) (push) Has been cancelled
Build Packages / Unit tests (push) Has been cancelled
Build Packages / build:rpm (rocky8_nocuda) (push) Has been cancelled
2025-09-18 18:29:48 +02:00
leonarski_f
8589092216
Docker updates (rocky8: build OpenSSL from source + include more python tools for documentation; all: build and install EIGEN)
Build Packages / GPU test (push) Successful in 3m14s
Build Packages / Generate python client (push) Successful in 4m22s
Build Packages / Build documentation (push) Successful in 4m54s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m54s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m21s
Build Packages / build:rpm (rocky9) (push) Successful in 14m49s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m24s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m28s
Build Packages / build:rpm (rocky8) (push) Successful in 10m38s
Build Packages / Unit tests (push) Has been cancelled
2025-09-18 16:42:13 +02:00
leonarski_f
799e5c55ff
CI: Fixes
Build Packages / GPU test (push) Successful in 3m16s
Build Packages / Build documentation (push) Successful in 4m39s
Build Packages / Generate python client (push) Successful in 3m34s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 8m15s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 14m18s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 16m3s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 16m35s
Build Packages / build:rpm (rocky8) (push) Successful in 16m44s
Build Packages / build:rpm (rocky9) (push) Successful in 11m22s
Build Packages / Unit tests (push) Successful in 1h2m47s
2025-09-17 21:22:42 +02:00
leonarski_f
1831e65c6c
CI: Fixes
Build Packages / Build documentation (push) Failing after 3m14s
Build Packages / GPU test (push) Successful in 3m14s
Build Packages / Unit tests (push) Has been cancelled
Build Packages / build:rpm (rocky8_nocuda) (push) Has been cancelled
Build Packages / build:rpm (rocky8_sls9) (push) Has been cancelled
Build Packages / build:rpm (rocky9) (push) Has been cancelled
Build Packages / build:rpm (rocky8) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2404) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2204) (push) Has been cancelled
Build Packages / Generate python client (push) Has been cancelled
2025-09-17 21:21:30 +02:00
leonarski_f
d7c8336958
Add documentation + noCUDA + python client; remove artifact upload
2025-09-17 21:18:24 +02:00
leonarski_f
1d4df8d2ec
Update CI and docker
Build Packages / GPU test (push) Successful in 3m13s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 14m59s
Build Packages / build:rpm (rocky8) (push) Failing after 16m37s
Build Packages / build:rpm (rocky9) (push) Failing after 17m17s
Build Packages / Unit tests (push) Successful in 1h1m42s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 12m58s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 13m28s
2025-09-17 09:56:32 +02:00
leonarski_f
048416898e
Fixes (WIP... very much in progress)
Build Packages / build:rpm (ubuntu2204) (push) Failing after 16m25s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 16m36s
Build Packages / build:rpm (rocky9) (push) Failing after 17m25s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 17m56s
Build Packages / build:rpm (rocky8) (push) Failing after 19m9s
Build Packages / Unit tests (push) Failing after 1h3m26s
2025-09-16 21:18:52 +02:00
leonarski_f
d79e4969ac
CI: Try upload-artifact@v3
Build Packages / build:rpm (ubuntu2404) (push) Failing after 16m37s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 17m13s
Build Packages / build:rpm (rocky9) (push) Failing after 17m29s
Build Packages / build:rpm (rocky8) (push) Failing after 17m58s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 18m5s
Build Packages / Unit tests (push) Has been skipped
2025-09-16 20:58:13 +02:00
leonarski_f
5244e8066a
CI: Fix to copying package files
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 13m58s
Build Packages / build:rpm (rocky8) (push) Failing after 15m30s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 15m50s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 16m9s
Build Packages / build:rpm (rocky9) (push) Failing after 16m43s
Build Packages / Unit tests (push) Has been skipped
2025-09-16 20:39:10 +02:00
leonarski_f
1d859a0923
Docker: Update Dockerfile's
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 14m33s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 15m48s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 16m20s
Build Packages / build:rpm (rocky8) (push) Failing after 16m29s
Build Packages / build:rpm (rocky9) (push) Failing after 17m17s
Build Packages / Unit tests (push) Has been skipped
2025-09-16 20:23:14 +02:00
leonarski_f
331948b95a
CMake: Build both .deb and .rpm packages (depending on host OS)
2025-09-16 20:21:47 +02:00
leonarski_f
7db0e0dc9e
Gitea: Update pipeline
2025-09-16 20:21:09 +02:00
leonarski_f
e9b7417a21
Gitea: Update pipeline
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 13m27s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 14m53s
Build Packages / build:rpm (rocky8) (push) Failing after 16m14s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 14m56s
Build Packages / build:rpm (rocky9) (push) Failing after 15m44s
Build Packages / Unit tests (push) Has been skipped
2025-09-16 20:06:08 +02:00
leonarski_f
f1eba28dc1
Gitea: Add RPM C/I
Build RPMs / build:rocky8:rpm (push) Failing after 17m44s
Build RPMs / build:rocky9:rpm (push) Failing after 20m3s
2025-09-16 19:24:05 +02:00
leonarski_f
839b1c755d
Dockerfile: WIP
2025-09-16 19:24:05 +02:00
leonarski_f
07b032719d
Dockerfile: WIP
2025-09-16 19:24:05 +02:00
leonarski_f
3ded4cd3ce
Merge branch '2509-plot-nan' into 'main'
...
v1.0.0-rc.80
See merge request jungfraujoch/nextgendcu!168
2025-09-16 10:40:33 +02:00
leonarski_f
7106bd80e9
v1.0.0-rc.80
2025-09-16 10:40:32 +02:00
leonarski_f
e8cc528714
Merge branch '2509-nxmx-fix' into 'main'
...
v1.0.0-rc.79
See merge request jungfraujoch/nextgendcu!167
2025-09-15 21:38:58 +02:00
leonarski_f
caf2a9de4f
v1.0.0-rc.79
2025-09-15 21:38:58 +02:00
leonarski_f
0e31023da0
Merge branch '2509-viewer-performance' into 'main'
...
v1.0.0-rc.78
See merge request jungfraujoch/nextgendcu!166
2025-09-14 15:59:58 +02:00
leonarski_f
418d4957cf
v1.0.0-rc.78
2025-09-14 15:59:58 +02:00
leonarski_f
39367f7080
Merge branch '2509-integration-development' into 'main'
...
2509 integration development
See merge request jungfraujoch/nextgendcu!165
2025-09-12 15:21:38 +02:00
leonarski_f
3c17ce3b0b
2509 integration development
2025-09-12 15:21:38 +02:00
leonarski_f
8c8be007ce
Merge branch '2509-viewer-fixes' into 'main'
...
v1.0.0-rc.76
See merge request jungfraujoch/nextgendcu!164
2025-09-11 14:37:16 +02:00
leonarski_f
20cd8dc4ac
v1.0.0-rc.76
2025-09-11 14:37:16 +02:00
leonarski_f
a7c92923ec
Bugfix to rc.75
2025-09-11 09:58:03 +02:00
leonarski_f
ea1a9bc68a
VERSION: 1.0.0-rc.75
2025-09-11 09:02:36 +02:00
leonarski_f
e7a89e1209
DectrisSimplonClient: EIGER2 missing min threshold
2025-09-11 09:00:29 +02:00
leonarski_f
a19531ba70
Merge branch '2509-eiger-fix' into 'main'
...
v1.0.0-rc.74
See merge request jungfraujoch/nextgendcu!163
2025-09-10 12:33:39 +02:00
leonarski_f
c936e9bab7
v1.0.0-rc.74
2025-09-10 12:33:39 +02:00
leonarski_f
7e6f1933d2
Merge branch '2509-rc.73' into 'main'
...
v1.0.0-rc.73
See merge request jungfraujoch/nextgendcu!162
2025-09-09 11:24:20 +02:00
leonarski_f
a0fee8aec0
v1.0.0-rc.73
2025-09-09 11:24:19 +02:00
leonarski_f
e36bac7589
Merge branch '2509-refinement' into 'main'
...
v1.0.0-rc.72
See merge request jungfraujoch/nextgendcu!161
2025-09-08 20:28:59 +02:00
leonarski_f
c67337cfe1
v1.0.0-rc.72
2025-09-08 20:28:59 +02:00
leonarski_f
6c88c6902e
Merge branch '2508-viewer' into 'main'
...
v1.0.0-rc.71
See merge request jungfraujoch/nextgendcu!160
2025-08-28 07:07:01 +02:00
leonarski_f
dba807fadd
v1.0.0-rc.71
2025-08-28 07:07:01 +02:00
leonarski_f
4e3b54f0b0
Merge branch '2508-1.0.0-rc.70' into 'main'
...
v1.0.0-rc.70
See merge request jungfraujoch/nextgendcu!159
2025-08-27 06:21:10 +02:00
leonarski_f
bb32f27635
v1.0.0-rc.70
2025-08-27 06:21:10 +02:00
leonarski_f
06978efe6b
Merge branch '2508-calibration' into 'main'
...
v1.0.0-rc.69
See merge request jungfraujoch/nextgendcu!158
2025-08-17 21:21:20 +02:00
leonarski_f
fa95858008
v1.0.0-rc.69
2025-08-17 21:21:20 +02:00
leonarski_f
f98402043b
Merge branch '2508-det-settings' into 'main'
...
v1.0.0-rc.68
See merge request jungfraujoch/nextgendcu!157
2025-08-16 19:59:27 +02:00
leonarski_f
20973792e4
v1.0.0-rc.68
2025-08-16 19:59:27 +02:00
leonarski_f
764ca111e2
Merge branch '2507-ssl-2' into 'main'
...
v1.0.0-rc.67
See merge request jungfraujoch/nextgendcu!156
2025-08-11 11:14:00 +02:00
leonarski_f
a32cec3404
v1.0.0-rc.67
2025-08-11 11:13:59 +02:00
leonarski_f
4189fa3e3c
Merge branch '2507-indexer-thread-pool-2' into 'main'
...
1.0.0-rc.66
See merge request jungfraujoch/nextgendcu!155
2025-07-18 11:42:39 +02:00
leonarski_f
51cbef4c84
1.0.0-rc.66
2025-07-18 11:42:39 +02:00
leonarski_f
d42c606e5d
Merge branch '2507-remove-excessive-print' into 'main'
...
Fix to jfjoch_viewer excessive printing
See merge request jungfraujoch/nextgendcu!154
2025-07-17 10:49:31 +02:00
leonarski_f
3955ddb257
Fix to jfjoch_viewer excessive printing
2025-07-17 10:49:31 +02:00
leonarski_f
54264a435a
Merge branch '2507-live-viewer' into 'main'
...
1.0.0-rc.65
See merge request jungfraujoch/nextgendcu!153
2025-07-16 20:19:48 +02:00
leonarski_f
06c5b9cf7f
1.0.0-rc.65
2025-07-16 20:19:48 +02:00
leonarski_f
5a6227230a
Merge branch '2507-lite-perf' into 'main'
...
v1.0.0-rc.64
See merge request jungfraujoch/nextgendcu!152
2025-07-15 09:55:19 +02:00
leonarski_f
be6d8ad0f5
v1.0.0-rc.64
2025-07-15 09:55:19 +02:00
leonarski_f
c56d9bc1db
Merge branch '2507-1.0.0-rc.63' into 'main'
...
Fix to 1.0.0-rc.63
See merge request jungfraujoch/nextgendcu!151
2025-07-09 16:06:22 +02:00
leonarski_f
6966461da7
Fix to 1.0.0-rc.63
2025-07-09 16:06:22 +02:00
leonarski_f
1ba456308d
Merge branch '2507-1.0.0-rc.63' into 'main'
...
Fix to 1.0.0-rc.63
See merge request jungfraujoch/nextgendcu!150
2025-07-09 15:57:50 +02:00
leonarski_f
0aac045d3d
Fix to 1.0.0-rc.63
2025-07-09 15:57:50 +02:00
leonarski_f
2980badaeb
Merge branch '2507-analysis-time' into 'main'
...
v1.0.0-rc.63
See merge request jungfraujoch/nextgendcu!149
2025-07-09 14:55:28 +02:00
leonarski_f
4da526c51b
v1.0.0-rc.63
2025-07-09 14:55:28 +02:00
leonarski_f
b8a252adaa
Merge branch '2507-zmq-test' into 'main'
...
v1.0.0-rc.62
See merge request jungfraujoch/nextgendcu!148
2025-07-08 20:19:59 +02:00
leonarski_f
0b5f28f50d
v1.0.0-rc.62
2025-07-08 20:19:59 +02:00
leonarski_f
02039b9f1c
Merge branch '2507-indexing-issues' into 'main'
...
v1.0.0-rc.61
See merge request jungfraujoch/nextgendcu!147
2025-07-08 07:16:59 +02:00
leonarski_f
e4ec9fb38f
v1.0.0-rc.61
2025-07-08 07:16:59 +02:00
leonarski_f
3c67b5a900
Merge branch '2507-1.0.0-rc.60' into 'main'
...
v1.0.0-rc.60
See merge request jungfraujoch/nextgendcu!146
2025-07-05 18:52:42 +02:00
leonarski_f
fbaf15aa07
v1.0.0-rc.60
2025-07-05 18:52:42 +02:00
leonarski_f
016e86cbc5
Merge branch '2506-1.0.0-rc.59' into 'main'
...
v1.0.0-rc.59
See merge request jungfraujoch/nextgendcu!145
2025-07-03 22:32:07 +02:00
leonarski_f
f5ef540ca0
v1.0.0-rc.59
2025-07-03 22:32:07 +02:00
leonarski_f
5f8b1d7de7
Merge branch '2506-1.0.0-rc.58' into 'main'
...
v1.0.0-rc.58
See merge request jungfraujoch/nextgendcu!144
2025-07-03 15:10:05 +02:00
leonarski_f
7ad4a3337b
v1.0.0-rc.58
2025-07-03 15:10:04 +02:00
leonarski_f
1fb9919a00
Merge branch '2506-1.0.0-rc.57' into 'main'
...
v1.0.0-rc.57
See merge request jungfraujoch/nextgendcu!143
2025-07-02 20:04:35 +02:00
leonarski_f
8fa8b612bb
v1.0.0-rc.57
2025-07-02 20:04:35 +02:00
leonarski_f
81c72bcf3d
Merge branch '1.0.0-rc.56' into 'main'
...
v1.0.0-rc.56
See merge request jungfraujoch/nextgendcu!142
2025-07-02 12:40:46 +02:00
leonarski_f
05e162ea5d
v1.0.0-rc.56
2025-07-02 12:40:45 +02:00
leonarski_f
776065c636
Merge branch '2506-1.0.0-rc.55' into 'main'
...
v1.0.0-rc.55
See merge request jungfraujoch/nextgendcu!141
2025-07-01 10:03:22 +02:00
leonarski_f
9592e4ab92
NeuralNetInferenceClient: Fix wrong HTTP address
2025-07-01 09:18:44 +02:00
leonarski_f
58d68ec4bc
CHANGELOG: Update
2025-06-30 21:30:49 +02:00
leonarski_f
92288c60d7
NeuralNetInferenceClient: Accept PixelMask
2025-06-30 21:29:48 +02:00
leonarski_f
dba2544c48
VERSION: 1.0.0-rc.55
2025-06-30 21:06:53 +02:00
leonarski_f
d6dbe53955
NeuralNetInferenceClient: Handle case of unsigned data
2025-06-29 13:07:40 +02:00
leonarski_f
39faa49d86
DiffractionExperiment: Remove potential bug with control reaching function without returning value
2025-06-29 13:05:03 +02:00
leonarski_f
7d7dbbcf79
Merge branch '2506-1.0.0-rc.54' into 'main'
...
1.0.0-rc.54
See merge request jungfraujoch/nextgendcu!140
2025-06-29 10:56:38 +02:00
leonarski_f
99de57fe6f
1.0.0-rc.54
2025-06-29 10:56:38 +02:00
leonarski_f
c5b41c7830
Merge branch '2506-1.0.0-rc.53' into 'main'
...
v1.0.0-rc.53
See merge request jungfraujoch/nextgendcu!139
2025-06-24 16:43:47 +02:00
leonarski_f
c41858f80d
v1.0.0-rc.53
2025-06-24 16:43:47 +02:00
leonarski_f
a322689b2a
Merge branch '2506-viewer-fixes' into 'main'
...
v1.0.0-rc.52
See merge request jungfraujoch/nextgendcu!138
2025-06-23 20:57:00 +02:00
leonarski_f
1d256b2cf5
v1.0.0-rc.52
2025-06-23 20:57:00 +02:00
leonarski_f
a59b6a0c37
Merge branch '2506-bug-in-plots' into 'main'
...
Bug fix for plotting
See merge request jungfraujoch/nextgendcu!137
2025-06-22 19:45:55 +02:00
leonarski_f
f40d178545
Bug fix for plotting
2025-06-22 17:24:37 +02:00
leonarski_f
7184fa5b5a
Merge branch '2506-spot-filters' into 'main'
...
v1.0.0-rc.51
See merge request jungfraujoch/nextgendcu!136
2025-06-22 13:15:10 +02:00
leonarski_f
50eaaaaf29
v1.0.0-rc.51
2025-06-22 13:15:10 +02:00
leonarski_f
aa13b1cd0b
Merge branch '2506-test-bug' into 'main'
...
v1.0.0-rc.50
See merge request jungfraujoch/nextgendcu!135
2025-06-20 09:52:26 +02:00
leonarski_f
0d1b388f4d
v1.0.0-rc.50
2025-06-20 09:52:26 +02:00
leonarski_f
2bd9f4a424
Merge branch '2506-ring-current' into 'main'
...
v1.0.0-rc49
See merge request jungfraujoch/nextgendcu!134
2025-06-18 15:19:18 +02:00
leonarski_f
fb87f376c8
v1.0.0-rc49
2025-06-18 15:19:18 +02:00
leonarski_f
c464c00906
Merge branch '2506-uc-bug' into 'main'
...
VERSION to 1.0.0-rc.48
See merge request jungfraujoch/nextgendcu!133
2025-06-17 19:29:44 +02:00
leonarski_f
259e17e483
VERSION to 1.0.0-rc.48
2025-06-17 17:20:43 +02:00
leonarski_f
42c2edc2e5
Merge branch '2506-minor-fixes' into 'main'
...
v1.0.0-rc.47
See merge request jungfraujoch/nextgendcu!132
2025-06-17 16:28:28 +02:00
leonarski_f
8e449fc581
v1.0.0-rc.47
2025-06-17 16:28:28 +02:00
leonarski_f
29a3dde4df
Merge branch '2506-viewer-dependencies' into 'main'
...
v1.0.0-rc.46
See merge request jungfraujoch/nextgendcu!131
2025-06-17 14:56:48 +02:00
leonarski_f
9b8f7a7f88
v1.0.0-rc.46
2025-06-17 14:56:48 +02:00
leonarski_f
7d0f783767
Merge branch '2506-missing-commit' into 'main'
...
v1.0.0-rc.45: missing commits
See merge request jungfraujoch/nextgendcu!130
2025-06-16 14:10:37 +02:00
leonarski_f
07b78f846c
v1.0.0-rc.45: missing commits
2025-06-16 14:10:36 +02:00
leonarski_f
e018e5a9a1
Merge branch '2506-pixel-size-det' into 'main'
...
v1.0.0-rc.45
See merge request jungfraujoch/nextgendcu!129
2025-06-16 12:48:17 +02:00
leonarski_f
ab5f502c8e
v1.0.0-rc.45
2025-06-16 12:48:17 +02:00
leonarski_f
da4d8868b3
Merge branch '2506-grid-scan-result' into 'main'
...
v1.0.0-rc.44
See merge request jungfraujoch/nextgendcu!128
2025-06-15 17:46:46 +02:00
leonarski_f
b59a03ff02
v1.0.0-rc.44
2025-06-15 17:46:46 +02:00
leonarski_f
50fd15c678
Merge branch '2506-raster-scan-result' into 'main'
...
v1.0.0-rc.43
See merge request jungfraujoch/nextgendcu!127
2025-06-13 16:00:50 +02:00
leonarski_f
80251cc5b8
v1.0.0-rc.43
2025-06-13 16:00:50 +02:00
leonarski_f
32c9e6926e
Merge branch '2506-Isigma' into 'main'
...
v1.0.0-rc.42
See merge request jungfraujoch/nextgendcu!126
2025-06-11 19:53:33 +02:00
leonarski_f
a9c7d23b9e
v1.0.0-rc.42
2025-06-11 19:53:33 +02:00
leonarski_f
dc90b05512
Merge branch '2506-Bragg-prediction' into 'main'
...
v1.0.0-rc.41
See merge request jungfraujoch/nextgendcu!125
2025-06-10 18:14:04 +02:00
leonarski_f
41a3e671f4
v1.0.0-rc.41
2025-06-10 18:14:04 +02:00
leonarski_f
72cdbd04a5
Merge branch '2405-grid-scan' into 'main'
...
v1.0.0-rc.40
See merge request jungfraujoch/nextgendcu!124
2025-05-28 18:49:27 +02:00
leonarski_f
53c90ee5d8
v1.0.0-rc.40
2025-05-28 18:49:27 +02:00
leonarski_f
aaae74e70b
Merge branch '2505-fpga-sum-analysis' into 'main'
...
v1.0.0-rc.39
See merge request jungfraujoch/nextgendcu!123
2025-05-14 23:28:10 +02:00
leonarski_f
18b50e9472
v1.0.0-rc.39
2025-05-14 23:28:10 +02:00
leonarski_f
01877ffe60
Merge branch '2505-resonet-python' into 'main'
...
v1.0.0-rc.38
See merge request jungfraujoch/nextgendcu!122
2025-05-12 14:17:24 +02:00
leonarski_f
b245967df3
v1.0.0-rc.38
2025-05-12 14:17:24 +02:00
leonarski_f
19d6f22136
Merge branch '2405-eiger-mask' into 'main'
...
patch to 1.0.0-rc.36
See merge request jungfraujoch/nextgendcu!121
2025-05-07 16:24:35 +02:00
leonarski_f
29ecd3515a
patch to 1.0.0-rc.36
2025-05-07 16:24:35 +02:00
leonarski_f
2533499acc
Merge branch 'jfjoch_lite' into 'main'
...
v1.0.0-rc.36
See merge request jungfraujoch/nextgendcu!120
2025-05-05 19:32:23 +02:00
leonarski_f
040cf08386
v1.0.0-rc.36
2025-05-05 19:32:22 +02:00
leonarski_f
759243d1bf
Merge branch '2404-test-ignore-frames' into 'main'
...
jfjoch_tests: Add test for missing modules with data acquistion continuing
See merge request jungfraujoch/nextgendcu!119
2025-04-23 17:22:11 +02:00
leonarski_f
b3898b1915
jfjoch_tests: Add test for missing modules with data acquistion continuing
2025-04-23 17:22:11 +02:00
leonarski_f
7c42c00fa9
Merge branch '2504-aq-dev-ret-handle' into 'main'
...
jfjoch_broker: acquisition device handles ignored if module is falling behind
See merge request jungfraujoch/nextgendcu!118
2025-04-23 16:01:22 +02:00
leonarski_f
5c1650e71b
jfjoch_broker: acquisition device handles ignored if module is falling behind
2025-04-23 15:13:13 +02:00
leonarski_f
ec69e1ac95
Merge branch '2504-writer-mod' into 'main'
...
v1.0.0-rc.35
See merge request jungfraujoch/nextgendcu!117
2025-04-22 14:42:15 +02:00
leonarski_f
9bec33290c
v1.0.0-rc.35
2025-04-22 14:42:14 +02:00
leonarski_f
2a1807f4bd
Merge branch '2503-post-maxiv' into 'main'
...
v1.0.0-rc.34
See merge request jungfraujoch/nextgendcu!116
2025-04-14 11:52:06 +02:00
leonarski_f
b0607ab3ca
v1.0.0-rc.34
2025-04-14 11:52:06 +02:00
leonarski_f
708b5fbc4b
Merge branch '2503-eiger-trim-fix' into 'main'
...
v1.0.0-rc.32
See merge request jungfraujoch/nextgendcu!115
2025-03-24 18:08:05 +01:00
leonarski_f
3f6be4c7a0
v1.0.0-rc.32
2025-03-24 18:08:05 +01:00
leonarski_f
118e2f7992
Merge branch '2503-1.0.0-rc.32-2' into 'main'
...
v.1.0.0-rc.32
See merge request jungfraujoch/nextgendcu!114
2025-03-24 12:16:33 +01:00
leonarski_f
a30707964d
v.1.0.0-rc.32
2025-03-24 12:16:33 +01:00
leonarski_f
19be3575f0
Merge branch '2502-release-script' into 'main'
...
Update FPGA version in the upload script
See merge request jungfraujoch/nextgendcu!113
2025-03-02 14:15:49 +01:00
leonarski_f
d7b586452a
Update FPGA version in the upload script
2025-03-02 14:15:11 +01:00
leonarski_f
fbdb3de175
Merge branch '2505-fpga-revid-5' into 'main'
...
v1.0.0-rc.31
See merge request jungfraujoch/nextgendcu!112
2025-03-02 13:15:28 +01:00
leonarski_f
ddf4c75645
v1.0.0-rc.31
2025-03-02 13:15:28 +01:00
leonarski_f
aeabc81a4c
Merge branch '2502-fix-pedestal-auto-count-time' into 'main'
...
DiffractionExperiment: Fix error in pedestal G1/G2 count time
See merge request jungfraujoch/nextgendcu!110
2025-02-14 12:50:32 +01:00
leonarski_f
2fec68d3b9
DiffractionExperiment: Fix error in pedestal G1/G2 count time
2025-02-14 10:21:38 +01:00
leonarski_f
1737f410d5
Merge branch '2501-pedestal-bug' into 'main'
...
Fix bug: Pixel mask applied + error in pedestal
See merge request jungfraujoch/nextgendcu!109
2025-01-21 16:53:40 +01:00
leonarski_f
a059b66a3c
AcquisitionDevice: Fix bug, when pixel mask was applied; in a situation of a bad pedestal run the system went into bad loop (given mask affected pedestal calculation, there was no way to actually take meaningful pedestal and update the mask)
2025-01-21 16:09:59 +01:00
leonarski_f
f1e04d7d56
Merge branch '2412-writer' into 'main'
...
version 1.0.0-rc.30
See merge request jungfraujoch/nextgendcu!108
2024-12-09 20:34:58 +01:00
leonarski_f
d5d7072a9f
version 1.0.0-rc.30
2024-12-09 20:34:58 +01:00
leonarski_f
483c12ca86
Merge branch '2412-warning-lost-frames' into 'main'
...
version 1.0.0-rc.29
See merge request jungfraujoch/nextgendcu!107
2024-12-08 13:26:13 +01:00
leonarski_f
7564619574
version 1.0.0-rc.29
2024-12-08 13:26:13 +01:00
leonarski_f
6ec126d65a
Merge branch '2412-1.0.0-rc.28' into 'main'
...
version 1.0.0-rc.28
See merge request jungfraujoch/nextgendcu!106
2024-12-05 16:41:04 +01:00
leonarski_f
e5a775b4a3
version 1.0.0-rc.28
2024-12-05 16:41:04 +01:00
leonarski_f
381e44e944
Merge branch '2412-fix-no-cuda-compilation' into 'main'
...
version 1.0.0-rc.27 minor fixes
See merge request jungfraujoch/nextgendcu!105
2024-12-04 20:58:51 +01:00
leonarski_f
89a77ceec7
version 1.0.0-rc.27 minor fixes
2024-12-04 20:58:51 +01:00
leonarski_f
762bb1b9c0
Merge branch '2412-fix-one-test' into 'main'
...
version 1.0.0-rc.27 quick fix
See merge request jungfraujoch/nextgendcu!104
2024-12-03 09:27:54 +01:00
leonarski_f
ed89fe2619
jfjoch_test: ZMQImageCommTest_NoWriter could potentially contain values that cannot be represented by CBOR
2024-12-03 08:57:56 +01:00
leonarski_f
6f744fd86d
Merge branch '2411-rc.1.0.0-rc.27' into 'main'
...
version 1.0.0-rc.27
See merge request jungfraujoch/nextgendcu!103
2024-12-02 21:17:14 +01:00
leonarski_f
71290f374a
version 1.0.0-rc.27
2024-12-02 21:17:14 +01:00
leonarski_f
c3d6c280b8
Merge branch '2411-NXmx-docs' into 'main'
...
version 1.0.0-rc.26 minor fixes
See merge request jungfraujoch/nextgendcu!102
2024-11-27 16:27:41 +01:00
leonarski_f
db5ee64f74
version 1.0.0-rc.26 minor fixes
2024-11-27 16:27:41 +01:00
leonarski_f
6a4a2c54ff
Merge branch '2411-status-vector-fix' into 'main'
...
version 1.0.0-rc.26 quick fixes
See merge request jungfraujoch/nextgendcu!101
2024-11-27 11:46:58 +01:00
leonarski_f
50ef79e621
version 1.0.0-rc.26 quick fixes
2024-11-27 11:46:58 +01:00
leonarski_f
deba54db4e
Merge branch '2411-cbor-plots' into 'main'
...
version 1.0.0-rc.26
See merge request jungfraujoch/nextgendcu!100
2024-11-26 16:04:38 +01:00
leonarski_f
b3e745a8dd
version 1.0.0-rc.26
2024-11-26 16:04:38 +01:00
leonarski_f
9ab5206c12
Merge branch '2411-documentation' into 'main'
...
version 1.0.0-rc.25
See merge request jungfraujoch/nextgendcu!99
2024-11-22 21:25:20 +01:00
leonarski_f
28d224afab
version 1.0.0-rc.25
2024-11-22 21:25:20 +01:00
leonarski_f
bebcc634da
Merge branch '2411-1.0.0-rc.24-fixes' into 'main'
...
Fix to CI (no new release)
See merge request jungfraujoch/nextgendcu!98
2024-11-17 15:47:52 +01:00
leonarski_f
b56d3a1461
FIX CI
2024-11-17 15:45:15 +01:00
leonarski_f
6912541107
Merge branch '2410-new-fpga-release' into 'main'
...
version 1.0.0-rc.24
See merge request jungfraujoch/nextgendcu!97
2024-11-17 14:55:09 +01:00
leonarski_f
adc13ff33e
version 1.0.0-rc.24
2024-11-17 14:55:09 +01:00
leonarski_f
aeeae33ad9
Merge branch '2410-python-client-build' into 'main'
...
Python client is built in CI (no new release)
See merge request jungfraujoch/nextgendcu!96
2024-10-23 21:13:22 +02:00
leonarski_f
24bb82c8f7
Python client is built in CI (no new release)
2024-10-23 21:13:22 +02:00
leonarski_f
b32a37da32
Merge branch '2410-ci-git-psi-ch-fix' into 'main'
...
Fix for pipeline (no new release!)
See merge request jungfraujoch/nextgendcu!95
2024-10-23 20:05:05 +02:00
leonarski_f
631a9d5312
Fix for pipeline (no new release!)
2024-10-23 20:05:05 +02:00
leonarski_f
89b692551b
Merge branch '2410-count-time-error' into 'main'
...
Version 1.0.0-rc.23
See merge request jungfraujoch/nextgendcu!94
2024-10-23 19:03:09 +02:00
leonarski_f
4e57c3cda4
Version 1.0.0-rc.23
2024-10-23 19:03:09 +02:00
leonarski_f
c0fd38880c
Merge branch '2410-raw-data-fix' into 'main'
...
Fix seg fault with raw data
See merge request jungfraujoch/nextgendcu!93
2024-10-23 16:20:48 +02:00
leonarski_f
5034121c0b
Fix seg fault with raw data + improve data processing settings display in Frontend
2024-10-23 16:20:48 +02:00
leonarski_f
72e3aae608
Merge branch '2410-1.0.0-rc.21' into 'main'
...
version 1.0.0-rc.21
See merge request jungfraujoch/nextgendcu!92
2024-10-23 10:16:37 +02:00
leonarski_f
36e3a59802
version 1.0.0-rc.21
2024-10-23 10:16:37 +02:00
leonarski_f
950c580558
Merge branch '2410-release-fix' into 'main'
...
CI: Remove FPGA build from CI
See merge request jungfraujoch/nextgendcu!91
2024-10-22 08:52:07 +02:00
leonarski_f
3c556c69c5
CI: Remove FPGA build from CI
2024-10-22 08:18:55 +02:00
leonarski_f
0f6d02a878
Merge branch '2410-rx19-fixes' into 'main'
...
version 1.0.0-rc.20
See merge request jungfraujoch/nextgendcu!90
2024-10-21 13:30:56 +02:00
leonarski_f
40c1e3d49f
version 1.0.0-rc.20
2024-10-21 13:30:56 +02:00
leonarski_f
abf7072ee1
Merge branch '2410-rc.18-quick-fixes' into 'main'
...
version 1.0.0-rc.19
See merge request jungfraujoch/nextgendcu!89
2024-10-18 20:17:29 +02:00
leonarski_f
2e62cb1738
version 1.0.0-rc.19
2024-10-18 20:17:29 +02:00
leonarski_f
e6eb7af5ae
Merge branch '2410-1.0.0.rc-18.fixes' into 'main'
...
Fixes to version 1.0.0-rc.18
See merge request jungfraujoch/nextgendcu!88
2024-10-17 16:29:39 +02:00
leonarski_f
c9eb2ca65d
Fixes to version 1.0.0-rc.18
2024-10-17 16:29:38 +02:00
leonarski_f
3d9c93c32a
Merge branch '2410-1.0.0-rc.18' into 'main'
...
version 1.0.0-rc.18
See merge request jungfraujoch/nextgendcu!87
2024-10-16 19:52:01 +02:00
leonarski_f
1d7e5f173d
version 1.0.0-rc.18
2024-10-16 19:52:01 +02:00
leonarski_f
bc8afdcb55
Merge branch '2410-fpga-8x10g' into 'main'
...
Fixes to 8x10g FPGA image and frontend
See merge request jungfraujoch/nextgendcu!86
2024-10-16 09:12:24 +02:00
leonarski_f
4ae0668f2f
Fixes to 8x10g FPGA image and frontend
2024-10-16 09:12:24 +02:00
leonarski_f
4cf20ae71b
Merge branch '2410-rc.17-fixes' into 'main'
...
xbflash.qspi: Add tool from Xilinx to flash cards (it is a nightmare to...
See merge request jungfraujoch/nextgendcu!85
2024-10-15 09:27:22 +02:00
leonarski_f
c7d255de6f
xbflash.qspi: Add tool from Xilinx to flash cards (it is a nightmare to...
2024-10-15 09:27:22 +02:00
leonarski_f
7cc6f4508a
Merge branch '2410-1.0.0-rc.17-2' into 'main'
...
version 1.0.0-rc.17
See merge request jungfraujoch/nextgendcu!84
2024-10-14 15:03:38 +02:00
leonarski_f
ce19996874
version 1.0.0-rc.17
2024-10-14 15:03:38 +02:00
leonarski_f
ad579f5d22
Merge branch '2410-pistache-version' into 'main'
...
version1.0.0-rc.16 fixes
See merge request jungfraujoch/nextgendcu!83
2024-10-11 16:43:06 +02:00
leonarski_f
26408608d4
version1.0.0-rc.16 fixes
2024-10-11 16:43:06 +02:00
leonarski_f
e92169a244
Merge branch '2410-1.0.0-rc.16-fixes' into 'main'
...
version1.0.0-rc.16 fixes
See merge request jungfraujoch/nextgendcu!82
2024-10-11 13:21:26 +02:00
leonarski_f
6aa43e6b7e
version1.0.0-rc.16 fixes
2024-10-11 13:21:26 +02:00
leonarski_f
2203513ffb
Merge branch '2410-1.0.0-rc.16' into 'main'
...
version 1.0.0-rc.16
See merge request jungfraujoch/nextgendcu!81
2024-10-11 11:11:37 +02:00
leonarski_f
b605b95127
version 1.0.0-rc.16
2024-10-11 11:11:37 +02:00
leonarski_f
040c43084e
Merge branch '2410-eiger-test' into 'main'
...
version 1.0.0-rc.15
See merge request jungfraujoch/nextgendcu!80
2024-10-08 21:04:09 +02:00
leonarski_f
95eaad3d35
version 1.0.0-rc.15
2024-10-08 21:04:09 +02:00
leonarski_f
7a23eade30
Merge branch '2410-pedestal-no-window' into 'main'
...
version 1.0.0-rc.14
See merge request jungfraujoch/nextgendcu!79
2024-10-07 11:56:40 +02:00
leonarski_f
3be959f272
version 1.0.0-rc.14
2024-10-07 11:56:40 +02:00
leonarski_f
9e21d312b2
Merge branch '2410-first-release' into 'main'
...
version 1.0.0-rc.13
See merge request jungfraujoch/nextgendcu!78
2024-10-05 13:14:49 +02:00
leonarski_f
e812918e2e
version 1.0.0-rc.13
2024-10-05 13:14:49 +02:00
leonarski_f
e03a41ec73
Merge branch '2408-maxiv-ci' into 'main'
...
MAXIV CI: Add docker-shared tag
See merge request jungfraujoch/nextgendcu!77
2024-08-08 12:37:51 +02:00
leonarski_f
f7ae0546bd
MAXIV CI: Add docker-shared tag
2024-08-08 12:18:31 +02:00
leonarski_f
e1045ee3b6
Merge branch '2407-minor-fix' into 'main'
...
1.0.0-rc.12 Minor fixes
See merge request jungfraujoch/nextgendcu!76
2024-07-08 19:58:27 +02:00
leonarski_f
3e5ed2e9f9
1.0.0-rc.12 Minor fixes
2024-07-08 19:58:27 +02:00
leonarski_f
3a08733872
Merge branch '2407-versioning' into 'main'
...
1.0.0-rc.12: Fixes to versioning
See merge request jungfraujoch/nextgendcu!75
2024-07-06 10:56:55 +02:00
leonarski_f
00be0bb224
1.0.0-rc.12: Fixes to versioning
2024-07-06 10:56:54 +02:00
leonarski_f
c4fc178f7a
Merge branch '2406-sqroot' into 'main'
...
Version 1.0.0-rc.12
See merge request jungfraujoch/nextgendcu!74
2024-07-06 09:34:44 +02:00
leonarski_f
6b5fddf2b7
Version 1.0.0-rc.12
2024-07-06 09:34:44 +02:00
leonarski_f
2b9ce9a26e
Merge branch '2406-more-minor-stuff' into 'main'
...
v1.0.0_rc.11
See merge request jungfraujoch/nextgendcu!73
2024-06-30 17:48:35 +02:00
leonarski_f
3035d9e144
v1.0.0_rc.11
2024-06-30 17:48:35 +02:00
leonarski_f
53b5a304d3
Merge branch '2406-openapi-python-client' into 'main'
...
Minor modifications to jfjoch_writer and OpenAPI
See merge request jungfraujoch/nextgendcu!72
2024-06-28 20:44:51 +02:00
leonarski_f
30a92d8eb9
Minor modifications to jfjoch_writer and OpenAPI
2024-06-28 20:44:51 +02:00
leonarski_f
81df571961
Merge branch '2406-after-crmx' into 'main'
...
Modifications after CristallinaMX beamtime
See merge request jungfraujoch/nextgendcu!71
2024-06-27 20:26:11 +02:00
leonarski_f
1717e171b9
Modifications after CristallinaMX beamtime
2024-06-27 20:26:11 +02:00
leonarski_f
4e59930972
Merge branch '2406-crmx' into 'main'
...
Release 1.0.0_rc.9
See merge request jungfraujoch/nextgendcu!70
2024-06-20 11:26:40 +02:00
leonarski_f
a32c7274a6
Release 1.0.0_rc.9
2024-06-20 11:26:40 +02:00
leonarski_f
8809b8d0d5
Merge branch '2405-writer-metadata' into 'main'
...
Extra metadata in HDF5 writer completed file stream
See merge request jungfraujoch/nextgendcu!69
2024-06-05 18:18:12 +02:00
leonarski_f
86b3934387
Extra metadata in HDF5 writer completed file stream
2024-06-05 18:18:12 +02:00
leonarski_f
7d9dcf2721
Merge branch '2405-maxiv-day-5' into 'main'
...
Updates after MAX IV experiment
See merge request jungfraujoch/nextgendcu!68
2024-06-03 10:56:43 +02:00
leonarski_f
953c3fa972
Updates after MAX IV experiment
2024-06-03 10:56:43 +02:00
leonarski_f
5d7a4e1ff2
Merge branch '2405-maxiv-day-3-2' into 'main'
...
PreviewImage: remove mutex
See merge request jungfraujoch/nextgendcu!67
2024-05-23 22:58:52 +02:00
leonarski_f
f85b87bfd2
PreviewImage: remove mutex
2024-05-23 22:58:52 +02:00
leonarski_f
500222bdcc
Merge branch '2405-maxiv-day-3' into 'main'
...
Minor modifications
See merge request jungfraujoch/nextgendcu!66
2024-05-23 17:11:14 +02:00
leonarski_f
c4d677f05b
Minor modifications
2024-05-23 17:11:14 +02:00
leonarski_f
76ff39c012
Merge branch '2405-maxiv-day-2' into 'main'
...
MAX IV experiment day 2 corrections
See merge request jungfraujoch/nextgendcu!65
2024-05-23 12:15:36 +02:00
leonarski_f
3ef89483e8
MAX IV experiment day 2 corrections
2024-05-23 12:15:36 +02:00
leonarski_f
e185fbb3f5
Merge branch '2405-maxiv-day-1' into 'main'
...
MAX IV test day 1 modifications
See merge request jungfraujoch/nextgendcu!64
2024-05-21 10:22:37 +02:00
leonarski_f
701c083739
MAX IV test day 1 modifications
2024-05-21 10:22:37 +02:00
leonarski_f
03662506c6
Merge branch '2405-writer-no-common' into 'main'
...
Simplify dependencies for jfjoch_writer
See merge request jungfraujoch/nextgendcu!63
2024-05-20 18:05:36 +02:00
leonarski_f
1b297babe9
Simplify dependencies for jfjoch_writer
2024-05-20 18:05:36 +02:00
leonarski_f
adc7aa7c7d
Merge branch '2405-dependencies-3' into 'main'
...
Build RPM for DKMS driver
See merge request jungfraujoch/nextgendcu!62
2024-05-20 11:40:30 +02:00
leonarski_f
27e17c316d
Build RPM for DKMS driver
2024-05-20 11:40:30 +02:00
leonarski_f
d7d66dc85c
Merge branch '2405-dependencies-2' into 'main'
...
Minor fixes for dependencies
See merge request jungfraujoch/nextgendcu!61
2024-05-19 14:09:00 +02:00
leonarski_f
2a8fc3a466
Minor fixes for dependencies
2024-05-19 14:09:00 +02:00
leonarski_f
e4acd93b88
Merge branch '2405-dependencies' into 'main'
...
Change the way dependencies are handled
See merge request jungfraujoch/nextgendcu!60
2024-05-17 19:19:17 +02:00
leonarski_f
4ca397bd42
Change the way dependencies are handled
2024-05-17 19:19:17 +02:00
leonarski_f
4d780c1dda
Merge branch '2405-zmq-preview' into 'main'
...
1.0.0-rc2: Fixes in preview
See merge request jungfraujoch/nextgendcu!59
2024-05-16 17:41:47 +02:00
leonarski_f
949f693311
1.0.0-rc2: Fixes in preview
2024-05-16 17:41:47 +02:00
leonarski_f
2b945f6dfa
Merge branch '2405-versioning' into 'main'
...
Improve release/versioning of Jungfraujoch repository
See merge request jungfraujoch/nextgendcu!58
2024-05-15 11:29:01 +02:00
leonarski_f
91fd44bff7
Improve release/versioning of Jungfraujoch repository
2024-05-15 11:29:01 +02:00
leonarski_f
3693cae440
Merge branch '2405-building-improvements' into 'main'
...
Improvements in building Jungfraujoch
See merge request jungfraujoch/nextgendcu!57
2024-05-06 21:28:55 +02:00
leonarski_f
5312f3ea6a
Improvements in building Jungfraujoch
2024-05-06 21:28:55 +02:00
leonarski_f
d4176ca9d3
Merge branch '2405-writer-2' into 'main'
...
HDF5DataFilePluginJUNGFRAU: Save free send buffers in the HDF5 file
See merge request jungfraujoch/nextgendcu!56
2024-05-04 20:40:47 +02:00
leonarski_f
6e30126dc8
HDF5DataFilePluginJUNGFRAU: Save free send buffers
2024-05-03 19:35:08 +02:00
leonarski_f
ecb3a4f5a9
Merge branch '2405-writer' into 'main'
...
jfjoch_writer updates
See merge request jungfraujoch/nextgendcu!55
2024-05-03 15:46:21 +02:00
leonarski_f
f1472a5fe1
jfjoch_writer updates
...
* Writer can send a PUB message with information on closed file
* Writer uses getopt to format input parameters
* DiffractionExperiment: Add frame number limit
2024-05-03 15:46:21 +02:00
leonarski_f
932ccce2e8
Merge branch '2404-preview' into 'main'
...
Preview improvements
See merge request jungfraujoch/nextgendcu!54
2024-05-02 17:16:23 +02:00
leonarski_f
ca54d66841
Preview improvements
2024-05-02 17:16:23 +02:00
leonarski_f
0cf7886821
Merge branch '2404-small-fixes' into 'main'
...
Small fixes
See merge request jungfraujoch/nextgendcu!53
2024-05-01 20:24:11 +02:00
leonarski_f
ea667f3313
Small fixes
2024-05-01 20:24:11 +02:00
leonarski_f
bd9e07932d
Merge branch '2404-fixed-g1' into 'main'
...
Further enhacements
See merge request jungfraujoch/nextgendcu!52
2024-04-29 14:13:35 +02:00
leonarski_f
64dbd2291e
Further enhacements
2024-04-29 14:13:35 +02:00
leonarski_f
870d0c4e43
Merge branch '2404-minor-fixes' into 'main'
...
2404 minor fixes
See merge request jungfraujoch/nextgendcu!51
2024-04-26 12:11:48 +02:00
leonarski_f
2ce574a6c7
2404 minor fixes
2024-04-26 12:11:48 +02:00
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
leonarski_f
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
leonarski_f
6e85a30930
FPGA: Change FIFO size to improve placing
2024-01-28 20:11:39 +01:00
leonarski_f
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
leonarski_f
f5f86d9ab6
Modifications in preparation to MAX IV experiment
2024-01-27 21:23:56 +01:00
leonarski_f
2446643489
Merge branch 'dev231218' into 'main'
...
Remove AN/LT capability
See merge request jungfraujoch/nextgendcu!19
2023-12-18 12:33:31 +01:00
leonarski_f
07fd769102
Remove AN/LT capability
2023-12-18 12:33:31 +01:00
leonarski_f
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
leonarski_f
d66b6b949d
Fix spot finding + fix FPGA network LEDs behavior
2023-12-16 09:20:46 +01:00
leonarski_f
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
leonarski_f
a4e7cd54ae
Initial look into bug with spot finder
2023-12-15 06:50:14 +01:00
leonarski_f
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
leonarski_f
d82bd13917
Minor fixes for CI and dependencies
...
Improvements in documentation and readability of JungfraujochDevice function
2023-12-14 22:39:17 +01:00
leonarski_f
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
leonarski_f
0b69dfb290
New REST+OpenAPI interface
2023-12-11 12:11:54 +01:00
leonarski_f
99f33eaf53
Merge branch 'generalized_serializer' into 'main'
...
Generalized serializer
See merge request jungfraujoch/nextgendcu!13
2023-12-11 06:49:24 +01:00
leonarski_f
f1935526a7
Generalized serializer
2023-12-11 06:49:24 +01:00
leonarski_f
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
leonarski_f
1798de247b
Extend FPGA functionality
2023-12-09 12:08:39 +01:00
leonarski_f
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
leonarski_f
412ee6f05c
CI: Rename MAX IV CI file
2023-12-05 11:28:15 +01:00
leonarski_f
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
leonarski_f
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
leonarski_f
905c26ba88
CI: Remove JFJOCH_COMPILE_TESTS from cmake directives
2023-11-29 10:49:24 +01:00
leonarski_f
1d3d8d081e
FPGA: add power report after routing
2023-11-28 21:30:40 +01:00
leonarski_f
657cf802eb
FPGA: frame_summation_reorder_compl doesn't need ap_start
2023-11-23 16:39:48 +01:00
leonarski_f
73cb5531b5
FPGA: Remove frame_summation_reorder_compl test bench
2023-11-23 16:38:29 +01:00
leonarski_f
96c47cfd73
FPGAIntegrationTest: Fix test
2023-11-23 16:37:58 +01:00
leonarski_f
5e7868d17d
FPGA: frame_summation_reorder_compl - minor change in operation order
2023-11-23 14:56:40 +01:00
leonarski_f
d38a6baa59
FPGA: load_from_hbm: release handles before receiving start message
2023-11-23 14:56:21 +01:00
leonarski_f
e254ef1a60
FPGA: No "trailing" address message in AXI-Stream
2023-11-23 14:52:53 +01:00
leonarski_f
a7c2849a84
FPGA: measure pipeline beats in timer
2023-11-21 15:55:23 +01:00
leonarski_f
39ca47aea9
FPGA: Add processing stalls
2023-11-21 15:42:26 +01:00
leonarski_f
d2f1c569a7
FPGA: Modify FPGA register map (move action configuration to offset 0x200)
2023-11-21 15:24:55 +01:00
leonarski_f
8635724ca3
Move FPGA register map from Definitions.h to jfjoch_drv.h
2023-11-21 15:20:12 +01:00
leonarski_f
8e624b4486
Remove ActionConfigTest - not needed
2023-11-21 15:18:25 +01:00
leonarski_f
cd69dba6ab
jfjoch_broker: Adding pistache as dependency
2023-11-21 14:12:40 +01:00
leonarski_f
f4f35adb02
FPGA: load_calibration - First check if addresses are OK, then issue datamover read commands
2023-11-20 15:11:51 +01:00
leonarski_f
ba70aa1915
FPGA: Load calibration issues datamover commands first
2023-11-18 22:44:37 +01:00
leonarski_f
7ebb2f967c
FPGA: Add extra safety in load_calibration
2023-11-18 19:20:00 +01:00
leonarski_f
e5397e68cf
FPGA: Clean-up of HDL modules
2023-11-18 19:18:26 +01:00
leonarski_f
ccf5a9ff1a
CMake: writer deps
2023-11-18 16:27:09 +01:00
leonarski_f
95058de3ca
PCIe driver: generalize code to load things from host memory
2023-11-18 16:16:21 +01:00
leonarski_f
b7e09f20ac
PCIe driver: add check of REG_MAP bit in CMS after startup
2023-11-18 16:05:43 +01:00
leonarski_f
7d48c5f2cd
PCIe driver: fix load routines
2023-11-18 14:59:41 +01:00
leonarski_f
c51bfcb95a
PCIe driver: more verbose
2023-11-18 14:42:08 +01:00
leonarski_f
4edc6a0573
CMake: Add extra libraries to HDF5
2023-11-18 12:34:42 +01:00
leonarski_f
402e21f6de
CMake: Remove jfjoch_receiver + fix jfjoch_action_test dependcy
2023-11-18 12:34:29 +01:00
leonarski_f
6828d82501
Remove PreviewTest
2023-11-18 11:52:55 +01:00
leonarski_f
760484635e
PCIe driver: show max modules as decimal
2023-11-17 16:48:53 +01:00
leonarski_f
b69d9cb477
FPGA: Fix setup_action.sh
2023-11-17 16:48:27 +01:00
leonarski_f
6b2f6ef3d1
PCIe driver: remove depmod call
2023-11-17 16:46:32 +01:00
leonarski_f
fc75f4ea96
FPGA: Clean-up unnecessary comment
2023-11-17 13:04:29 +01:00
leonarski_f
01af2e497b
FPGA: Fix ADU histogram for high summation
2023-11-17 13:04:12 +01:00
leonarski_f
3012079605
jfjoch_action_test: Add summation and force 32-bit output
2023-11-17 12:27:45 +01:00
leonarski_f
1e6f64b4da
FPGA: Increase max summation to 256
2023-11-16 21:32:37 +01:00
leonarski_f
4bb306d071
Fix JFJochStateMachineTest
2023-11-16 20:38:17 +01:00
leonarski_f
de5ebbeb1d
Fix JFJochFullIntegrationTest
2023-11-16 20:25:16 +01:00
leonarski_f
bef9f440ce
CompressionAlgorithm: Make BSHUF_LZ4 default
2023-11-16 19:59:33 +01:00
leonarski_f
0d3cb19a2e
Fix tests + trim unnecessary variables in DataProcessingSettings
2023-11-16 19:58:24 +01:00
leonarski_f
4307a670eb
gRPC is necessary only for JFJochBroker
2023-11-16 18:47:53 +01:00
leonarski_f
0babc43637
fpga/README.md: Update instructions to find xbflash2
2023-11-16 16:26:07 +01:00
leonarski_f
03d2acfbe2
JFJochStateMachine: Limit ProtoBuf structures
2023-11-16 16:20:01 +01:00
leonarski_f
59765091b9
Fix test
2023-11-16 14:27:24 +01:00
leonarski_f
80583279e9
JFJochStateMachine: Remove fetchign pedestal/mask through broker
2023-11-16 14:27:18 +01:00
leonarski_f
f7069ebf5e
JFJochStateMachine: Reduce reliance on ProtoBuf (work in progress)
2023-11-16 13:57:15 +01:00
leonarski_f
c5f6119455
Remove DataAnalysisPerfTest from CI
2023-11-16 13:45:37 +01:00
leonarski_f
7c57f16d59
Remove GPU spot finder
2023-11-15 21:37:20 +01:00
leonarski_f
bb8e0f7b84
Fix unnecessary JSON <-> gRPC headers
2023-11-15 21:24:42 +01:00
leonarski_f
611a0819c9
jfjoch_broker: Reading configuration file
2023-11-15 21:16:08 +01:00
leonarski_f
9b59482b8d
CMake: Merged into option JFJOCH_WRITER_ONLY
2023-11-15 11:19:49 +01:00
leonarski_f
e8d576a563
jfjoch_writer: Not dependent on gRPC
2023-11-15 10:40:03 +01:00
leonarski_f
049dffe91e
JFJochStateMachine: Fix non-existing UnitCell constructor
2023-11-14 19:59:35 +01:00
leonarski_f
3f7fc04d84
Monolithic design achieved! (jfjoch_broker is NOT up to date!)
2023-11-14 18:23:43 +01:00
leonarski_f
2b6901af58
DiffractionExperiment: Move DetectorSettings and DatasetSettings to JFJochStateMachine
2023-11-14 16:33:19 +01:00
leonarski_f
6b2ff27f31
CMake: Modify dependencies
2023-11-14 16:00:27 +01:00
leonarski_f
9bf11a451d
CMake: Include receiver as dependency for jfjoch_broker
2023-11-14 14:07:08 +01:00
leonarski_f
f778a35e6f
DiffractionExperiment: Move internal variables to a C++ structure
2023-11-14 13:17:58 +01:00
leonarski_f
e85988dfa2
DiffractionExperiment: Clean-up Compression and UnitCell
2023-11-13 17:06:34 +01:00
leonarski_f
2f87b4c1b1
JFCalibration: Remove ProtoBuf bindings
2023-11-13 16:38:56 +01:00
leonarski_f
dbef6a3b17
JFJochReceiver is directly invoked by the broker
2023-11-13 16:08:28 +01:00
leonarski_f
3725ec5a73
JFJochServices: ProtoBuf JFJochFullBrokerStatus becomes C++ struct + remove writer stats
2023-11-13 14:45:00 +01:00
leonarski_f
13d22493c1
AcquisitionDeviceGroup: added GetNetworkConfig()
2023-11-13 13:01:37 +01:00
leonarski_f
b270b8857a
TestImagePusher: Increase tolerance for conversion errors in summation
2023-11-12 13:32:44 +01:00
leonarski_f
3e4eb449de
AcquisitionDeviceGroup: Used to simplify handling multiple aq devices
2023-11-12 13:32:24 +01:00
leonarski_f
a0c5223512
Fix DataAnalysisPerfTest
2023-11-11 23:07:00 +01:00
leonarski_f
f814346fa2
Fix GPUImageAnalysis
2023-11-11 22:57:55 +01:00
leonarski_f
834d8e8dcd
ADUHistogram: Fix return missing
2023-11-11 22:43:15 +01:00
leonarski_f
4cb4792432
JFJochReceiverService: Enable using C++ structs
2023-11-11 22:43:15 +01:00
leonarski_f
eaf7792459
DataProcessingSettings has equivalent C++ and ProtoBuf structures
2023-11-11 18:48:38 +01:00
leonarski_f
f505ec6532
Fix jfjoch_action_test
2023-11-11 17:42:06 +01:00
leonarski_f
652fc80b5d
Fix jfjoch_receiver
2023-11-11 17:41:44 +01:00
leonarski_f
d83b8d465d
JFJochReceiver: Plot is C++ struct
2023-11-10 21:22:42 +01:00
leonarski_f
04c251d16a
gRPC: Remove optional variables from ProtoBuf
2023-11-10 17:43:51 +01:00
leonarski_f
d23bcb564d
JFJochReceiver: output is standard C++ structure
2023-11-10 14:16:23 +01:00
leonarski_f
6008fbea35
JFJochReceiver: Use DiffractionExperiment and JFCalibration, instead of ProtoBuf structure
2023-11-10 12:27:35 +01:00
leonarski_f
4efcdaab74
AcqusitionDevice: Moved to dedicated directory
2023-11-10 11:45:16 +01:00
leonarski_f
04c2e41cf5
AcquisitionDevice: Remove copy constructor/assignment operator
2023-11-10 11:36:41 +01:00
leonarski_f
7993efb047
DetectorSettings: remove optional fields
2023-11-09 20:51:37 +01:00
leonarski_f
4bc61de084
AcquisitionDevice no longer depends on ProtoBuf (at least directly)
2023-11-08 21:51:42 +01:00
leonarski_f
050d762187
Remove FPGAStatus - replace it with non-ProtoBuf version
2023-11-08 21:01:36 +01:00
leonarski_f
56476e3e5f
ZMQPreviewPublisher: Stream CBOR data
2023-11-08 19:19:32 +01:00
leonarski_f
cc34a9801e
gRPC: not using pyPAI (as this requires recent ProtoBuf)
2023-11-08 18:40:34 +01:00
leonarski_f
7411d0fd69
gRPC: Only OS gRPC is supported
2023-11-08 18:39:55 +01:00
leonarski_f
98cb58d199
PCIe driver: Fix addresses for calibration and frame generator
2023-11-08 14:36:36 +01:00
leonarski_f
427f0f7a45
Fix tests + re-run FPGA synthesis
2023-11-07 21:42:16 +01:00
leonarski_f
adc0a1bab6
Fix tests + re-run FPGA synthesis
2023-11-07 21:36:22 +01:00
leonarski_f
a4af0b380c
FPGAIntegrationTest: Fix excesive test output
2023-11-07 19:18:25 +01:00
leonarski_f
41985b6c29
FPGA: Increase data width of conversion to 18-bit. This allows to use full unsigned precision + raw data are handled properly.
2023-11-07 19:11:37 +01:00
leonarski_f
2dfd878d01
JFConversionFloatingPoint: Integrate other bit depths/signs
2023-11-07 15:36:49 +01:00
leonarski_f
be546e9f76
JFConversionFloatingPoint: Move to double type (32-bit special values can be only exact in double type)
2023-11-07 14:31:59 +01:00
leonarski_f
de317c29d5
JFConversion: Clean-up
2023-11-07 13:28:27 +01:00
leonarski_f
310d77a57f
JFJochReceiver: No access to preview frame via gRPC
2023-11-07 10:13:19 +01:00
leonarski_f
552597523d
ImagePusher: Serialization of StartMessage is handled outside of the class
2023-11-06 20:21:27 +01:00
leonarski_f
591e724cf6
DiffractionExperiment: Rename GetFPGAOutputDepth -> GetPixelDepth and GetFPGASummation -> GetSummation
2023-11-06 18:01:53 +01:00
leonarski_f
dec3eb15de
FrameTransformation: Add two tests for int32 and uint16
2023-11-06 17:43:14 +01:00
leonarski_f
d6c1b19599
DiffractionExperiment: Remove ROI-mask function
2023-11-06 16:51:34 +01:00
leonarski_f
b2743072e6
DiffractionExperiment: Remove frame summation (summation only on FPGA)
2023-11-06 16:09:08 +01:00
leonarski_f
fcd7612656
DiffractionExperiment: Remove 2x2 binning to simplify transformation code
2023-11-06 14:16:15 +01:00
leonarski_f
e6442f6384
ZMQPreviewPublisher: Support both 16-bit and 32-bit images in preview
2023-11-03 17:38:23 +01:00
leonarski_f
50556932fb
DiffractionExperiment: Remove spot finder stride
2023-11-03 16:56:50 +01:00
leonarski_f
72045655b4
JFJochReceiver: Use FPGA based spot finder
2023-11-03 12:39:12 +01:00
leonarski_f
ca4b940904
StrongPixelSet: ReadFPGAOutput (not tested)
2023-11-03 12:09:33 +01:00
leonarski_f
71960d5496
JFJochReceiver: Remove MiniSummationThread (as summation is anyway handled on FPGA)
2023-11-03 11:25:14 +01:00
leonarski_f
3d7c7b0779
Implement FPGA summation
2023-11-02 20:41:37 +01:00
leonarski_f
1b2b8f5863
FPGA: Fix problems in summation and related cores
2023-11-02 20:25:29 +01:00
leonarski_f
c66c06e8f5
FPGA: Fix setup action
2023-11-02 15:09:04 +01:00
leonarski_f
8cd0d497ad
FPGA: Allow saving 32-bit unsigned.
2023-11-02 13:32:29 +01:00
leonarski_f
f21f226a59
Move MAX_FPGA_SUMMATION to Definitions.h
2023-11-02 12:55:52 +01:00
leonarski_f
b3eceef7cd
FPGA: Max module number is 32
2023-11-01 15:55:06 +01:00
leonarski_f
9f110f3c1a
FPGA: nmodules is actually module - 1 (there will be never 0 modules, while it can encode 32)
2023-11-01 14:28:32 +01:00
leonarski_f
112a62fc7f
FPGA: remove limit of modules for frame_generator
2023-11-01 14:20:43 +01:00
leonarski_f
8f2b01be80
FPGA: frame_generator and load_calibration return value for error checking
2023-11-01 13:31:41 +01:00
leonarski_f
a71121482e
FPGAIntegrationTest: More parameters in packet generator custom frame test
2023-11-01 13:29:06 +01:00
leonarski_f
31304553be
FPGA: sls_detector had hardcoded max module number -> fixed
2023-11-01 13:28:17 +01:00
leonarski_f
3940f067a8
MAX_MODULES_FPGA moved to Definitions.h => This needs to be const for RELEASE_LEVEL
2023-11-01 13:16:22 +01:00
leonarski_f
b84febed5c
FPGA: Update max summation to 128
2023-11-01 12:23:25 +01:00
leonarski_f
a17b75862e
Update CI scripts. Remove retaining .bit files (large and not useful) and remove RHEL7 specific parts.
2023-11-01 12:18:37 +01:00
leonarski_f
e0ef39a9ec
Update README.md
2023-11-01 12:18:37 +01:00
leonarski_f
f9ac919e3c
Merge branch 'fpga_multipixel' into 'main'
...
FPGA: Add capability for auto-summation and image processing to the FPGA
See merge request jungfraujoch/nextgendcu!9
2023-10-29 11:29:46 +01:00
leonarski_f
05a35855eb
Extend frame summation to 64
2023-10-28 17:07:22 +02:00
leonarski_f
270dd1224b
Receiver: remove JF conversion on CPU
2023-10-28 17:00:04 +02:00
leonarski_f
c8862c8aa6
Receiver: remove Mellanox device and Linux socket (both are much less functional as compared to FPGA)
2023-10-28 16:50:55 +02:00
leonarski_f
2ed91c1849
FPGA: transfer for image and processing results are separate DMA transactions
2023-10-28 16:47:06 +02:00
leonarski_f
961c17c4d0
FPGA: data analysis is done based on 24-bit numbers - allowing frame summation
2023-10-28 16:35:33 +02:00
leonarski_f
fbc4f79a40
FPGA: Frame_summation operates internally on 24-bit integers
2023-10-28 06:22:06 +02:00
leonarski_f
4fbd747341
FPGA: Remove multipixel from the pipeline
2023-10-27 20:47:44 +02:00
leonarski_f
d562a4b435
FPGA driver: Remove TODO for sysfs from README
2023-10-27 19:51:59 +02:00
leonarski_f
28673ffc63
Merge branch 'pcie_driver_sysfs' into 'main'
...
PCIe driver: Added sysfs bindings
See merge request jungfraujoch/nextgendcu!8
2023-10-27 19:49:47 +02:00
leonarski_f
673e0f610a
FPGA driver: Read MAC address from CMS on card initialization
2023-10-27 19:48:40 +02:00
leonarski_f
4978149fdd
FPGA: Add register slice in the data pipeline
2023-10-27 19:43:40 +02:00
leonarski_f
c896ec5659
FPGA: Remove bitshuffle from the pipeline
2023-10-27 19:41:02 +02:00
leonarski_f
f46a8e47a0
FPGA: Use AggressiveExplore for routing
2023-10-27 19:12:27 +02:00
leonarski_f
817d541fb0
HLS: save_to_hbm.cpp send frames in proper order
2023-10-27 16:02:23 +02:00
leonarski_f
08c2427fc7
FPGA: Refactor FPGA (add two hierarchy groups for jungfraujoch) + change order similar to HLSSimulatedDesign
2023-10-27 15:42:24 +02:00
leonarski_f
e06086e956
HLSSimulatedDevice: Change order integration -> frame_summation -> spot finding
2023-10-27 15:41:09 +02:00
leonarski_f
b08071887b
HLSSimulatedDevice: Add frame_summation
2023-10-27 15:36:19 +02:00
leonarski_f
700d5b25af
HLSSimulatedDevice: Add frame_summation_reoder_compl
2023-10-27 15:33:29 +02:00
leonarski_f
3b802effa8
HLSSimulatedDevice: Remove module_upside_down
2023-10-27 15:28:49 +02:00
leonarski_f
7973c2ca81
HLS: Minor fixes to adu_histo.cpp
2023-10-27 15:27:36 +02:00
leonarski_f
4fbac629d6
HLS: Use U55C part number for proper usage statistics
2023-10-27 13:54:35 +02:00
leonarski_f
b022dd0055
Improved FPGA README.md
2023-10-27 12:24:50 +02:00
leonarski_f
cf69aef472
FPGA: Add extra register slices for upside_down
2023-10-26 22:36:08 +02:00
leonarski_f
2268486824
HLS: Added frame_summation core
2023-10-26 22:31:09 +02:00
leonarski_f
4011c4541d
HLS: frames inside HLS logic are counted from 0, even if JUNGFRAU counts them from 1
2023-10-26 19:42:15 +02:00
leonarski_f
473bf17ae7
HLS: axis_completion has extra parameter (ignore) that makes the frame ignored by load_from_hbm, but HBM handle is still recovered
2023-10-26 18:14:35 +02:00
leonarski_f
efac89f89e
FPGAIntegrationTest: Add invert and bitshuffle tests
2023-10-25 22:37:25 +02:00
leonarski_f
7df76a5c76
FPGAAcquisitionDevice: add option to customize execution flags
2023-10-25 22:28:13 +02:00
leonarski_f
4e60bb2f9e
FPGA: Add option to invert modules upside down
2023-10-25 22:20:45 +02:00
leonarski_f
439d6fa12a
FPGA: Spot finder won't use multipixels for mean/variance calculation
2023-10-25 18:18:29 +02:00
leonarski_f
6bcf54f603
FPGA: Add bitshuffle to the design (warning! no test for full integration!)
2023-10-25 11:07:21 +02:00
leonarski_f
a611d3f08b
FPGA: Adapt host writer to multipixel core. (TODO -> multipixels should be masked for rad. int. and spot finding)
2023-10-24 19:11:23 +02:00
leonarski_f
d408b3ed2a
FPGA: Integrate add multipixel into the design
2023-10-24 18:58:59 +02:00
leonarski_f
b33e996569
FPGA: Add multipixel - add test.
2023-10-24 18:05:59 +02:00
leonarski_f
c37a9fa768
FPGA: Add multipixel - handle division by 2 and 4 for multipixels.
2023-10-24 18:05:48 +02:00
leonarski_f
e195432aea
RawToConvertedGeometry: Separate core functions that require minimum headers
2023-10-24 17:54:14 +02:00
leonarski_f
e1a6830c50
FPGA: Add multipixel (-> TODO calculate proper number)
2023-10-24 16:43:24 +02:00
leonarski_f
79d7254555
PCIe driver: Added sysfs bindings
2023-10-24 09:25:43 +02:00
leonarski_f
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
leonarski_f
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
leonarski_f
ea0fccecc9
JFConversionGPU: Remove
2023-10-22 14:39:03 +02:00
leonarski_f
c1469d1e46
JFJochReceiver: Skip frames if acquisition finished and frames stopped earlier on the first acquisition device
2023-10-22 14:36:53 +02:00
leonarski_f
bc43921004
JFJochReceiver: Remove local conversion (not useful -> simplify)
2023-10-22 13:45:47 +02:00
leonarski_f
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
leonarski_f
566ff52bfc
JFJochReceiver: Single preview, that can be switched to present all or indexed only results
2023-10-22 12:41:59 +02:00
leonarski_f
af27854440
Frontend: Add ADU histogram plot
2023-10-21 23:08:17 +02:00
leonarski_f
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
leonarski_f
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
leonarski_f
99741ae5c5
ADU histogram: Save
2023-10-21 19:51:25 +02:00
leonarski_f
53f4f4acf9
RadialIntegration: Calculate only on FPGA
2023-10-21 19:15:42 +02:00
leonarski_f
dd4988486c
RadialIntegrationMapping: No mask
2023-10-21 17:20:12 +02:00
leonarski_f
b4ab3087f1
RadialIntegrationProfile: Extra routines to handle GPU/CPU/FPGA workflows in more versatile way
2023-10-21 17:14:17 +02:00
leonarski_f
a7706546b7
RadialIntegration: Remove pixel split
2023-10-21 16:18:41 +02:00
leonarski_f
19644a1f5f
FPGA: Trigger synthesis
2023-10-21 16:12:51 +02:00
leonarski_f
c86bc4591c
AcquisitionDevice: Remove automatic setup of radial integration
2023-10-21 16:08:49 +02:00
leonarski_f
4ede0f1f15
FPGA: rename axis_256_to_512.cpp file
2023-10-21 15:38:40 +02:00
leonarski_f
3b65e6bf88
FPGA: Integration on FPGA allows for per pixel weights (in range 1.99 - 3e-5)
2023-10-21 15:37:46 +02:00
leonarski_f
d91eb6bdd5
FPGAIntegrationTest: Use multiple modules
2023-10-21 11:08:07 +02:00
leonarski_f
0b5bbec1fc
AcquisitionDevice: Setup rad. int. mapping automatically
2023-10-20 18:00:29 +02:00
leonarski_f
7008703af3
FPGA: Integration is not calculating sum2
2023-10-20 14:06:58 +02:00
leonarski_f
a338a1743b
RawToConvertedGeometry: Add function to calculate location of a raw pixel in converted geometry
2023-10-20 13:27:21 +02:00
leonarski_f
ad78fb0149
FPGA: Fixes and simplifications to spot_finder core + SNR threshold test
2023-10-20 12:23:50 +02:00
leonarski_f
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
leonarski_f
45de356c16
FPGA: Minor changes
2023-10-19 22:43:35 +02:00
leonarski_f
aa1ff0436b
FPGA: Add SNR threshold to spot finder
2023-10-19 22:29:38 +02:00
leonarski_f
60466fe146
FPGA: Add extra comment to spot_finder
2023-10-19 20:56:24 +02:00
leonarski_f
9f48e4b317
FPGA: remove spot_finder.h
2023-10-19 20:53:38 +02:00
leonarski_f
f04f7a274b
FPGA: Name spot finder signals in consistent manner
2023-10-19 20:52:09 +02:00
leonarski_f
67b9e08a5c
FPGAIntegrationTest: Add test for spot finder based on count limit
2023-10-19 19:48:40 +02:00
leonarski_f
90344eb251
FPGA: Basic spot finder (i.e. only based on count threshold) as a placeholder
2023-10-19 19:40:31 +02:00
leonarski_f
c7b7abb34d
FPGA: Remove register slice for strong pixel result
2023-10-19 12:14:17 +02:00
leonarski_f
6691b01265
PCIe driver: accept spot finding parameters
2023-10-18 21:23:41 +02:00
leonarski_f
a56a54c72d
AcquisitionDevice: GetDeviceOutput to get the whole package
2023-10-18 19:42:57 +02:00
leonarski_f
6f9f918ee6
HLS: Improve make scripts, so HLS test bench can be defined
2023-10-18 16:32:31 +02:00
leonarski_f
736a181e5e
HLS: Spot finder outputs parameters + statistics
2023-10-18 15:19:01 +02:00
leonarski_f
ec7278bd44
HLS: Changes to allow cosimulation with Vitis HLS
2023-10-18 14:44:30 +02:00
leonarski_f
e4ac3e8b08
FPGASpotFindingUnitTest: Very basic test for spot finder
2023-10-18 12:10:29 +02:00
leonarski_f
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
leonarski_f
79df7cf7d5
FPGA: Add extra AXI-Stream register slices
2023-10-17 19:40:55 +02:00
leonarski_f
83fb1fd465
FPGA: Clean-up of prefix_sum
2023-10-17 13:22:49 +02:00
leonarski_f
217992be94
FPGA: Second variant of prefix sum
2023-10-17 10:39:11 +02:00
leonarski_f
05338887a7
FPGA: Spot finder accepts 16-bit number for strong pixel threshold
2023-10-16 22:07:41 +02:00
leonarski_f
faca7a3f15
PCIe driver: Clean-up + add intermediate library between driver and AcquisitionDevice
2023-10-16 19:54:13 +02:00
leonarski_f
2fd8d38782
PCIe driver: add basic permission handling
2023-10-16 15:13:47 +02:00
leonarski_f
202b7ee0ca
PCIe driver: clean-up
2023-10-16 15:13:47 +02:00
leonarski_f
c5ca10792e
FPGA: Clean-up of spot_finder core + update README.MD
2023-10-16 15:13:47 +02:00
leonarski_f
9b646a4195
FPGA: Spot finder 2nd version more improved
2023-10-04 16:59:13 +02:00
leonarski_f
7889f1666a
FPGA: Spot finder 2nd version improved
2023-10-04 12:12:43 +02:00
leonarski_f
5460c10f76
FPGA: Spot finder 2nd version
2023-10-03 22:14:11 +02:00
leonarski_f
81c1502d52
FPGA: Added spot_finder_line_sum (work in progress)
2023-10-03 18:51:26 +02:00
leonarski_f
f301923c72
FPGA: Added spot_finder_update_sum function, as first step for versatile spot finder
2023-10-03 14:28:39 +02:00
leonarski_f
c6afbebd13
FPGA: add old spot finder to the design (work in progress! - seems very high resource utilization + it is offset from proper result)
2023-10-02 22:34:49 +02:00
leonarski_f
98fe70315b
FPGA: add bitshuffle to HLS modules (don't integrate at the moment into the whole design)
2023-09-30 11:28:01 +02:00
leonarski_f
59d0850b1f
FPGA: integration results are reduced to cover two bins per 512-bit
2023-09-29 22:08:55 +02:00
leonarski_f
ca118f26d5
FPGA: integration results are reduced to cover two bins per 512-bit
2023-09-29 22:07:52 +02:00
leonarski_f
8831ad380f
FPGA: Fix bug in adu_histo + add test + add access from AcquisitionDevice
2023-09-29 18:34:29 +02:00
leonarski_f
549cc6a887
FPGA: Add ADU histogram (work in progress; needs test)
2023-09-29 16:55:37 +02:00
leonarski_f
5bb92aed61
FPGA: Modify HLS for jf_conversion, so it is running after HBM buffer
2023-09-29 14:44:08 +02:00
leonarski_f
79aef71ce3
FPGA: spot_finder added
2023-09-26 18:54:31 +02:00
leonarski_f
84bf69b8a6
FPGA: frame generator reads from HBM (work in progress)
2023-09-26 13:14:43 +02:00
leonarski_f
0f7c14c267
FPGA: integration calculates sum^2
2023-09-25 22:23:06 +02:00
leonarski_f
7e3b9cfeba
Revert "FPGA: add spot finder to the design"
...
This reverts commit df0b0d8b96
2023-09-25 21:52:55 +02:00
leonarski_f
027b3aa943
Revert "FPGA: add register slices"
...
This reverts commit cf2163a402
2023-09-25 21:52:54 +02:00
leonarski_f
4028a59c4a
PCIe driver: add option to read/write register
2023-09-24 22:58:16 +02:00
leonarski_f
556c4c4aec
PCIe driver: move include for common/Definitions.h
2023-09-24 22:46:50 +02:00
leonarski_f
cf2163a402
FPGA: add register slices
2023-09-24 20:28:35 +02:00
leonarski_f
df0b0d8b96
FPGA: add spot finder to the design
2023-09-24 19:04:58 +02:00
leonarski_f
f4f4b50be7
FPGA: frame_generator has 8 module specific frames
2023-09-24 15:43:04 +02:00
leonarski_f
ae6e036628
FPGA: increase frame_generator memory to 8 MiB
2023-09-24 14:39:46 +02:00
leonarski_f
4dfc8a1a59
FPGA: spot_finder threshold can be set externally
2023-09-23 15:17:35 +02:00
leonarski_f
a70e3cf444
FPGA: integration & jf_conversion use hbm_size_bytes as external signal - hbm_size_bytes is constant, so to allow constant propagation in synthesis
2023-09-22 21:49:41 +02:00
leonarski_f
2cfde3a82d
FPGA: spot_finder early work in progress
2023-09-22 20:43:52 +02:00
leonarski_f
5cf0d30603
AcquisitionDevice: Enable access to integration results
2023-09-22 20:32:13 +02:00
leonarski_f
3f3ce6f354
FPGA: fix integration bug
2023-09-22 20:32:12 +02:00
leonarski_f
f06e92fd1b
FPGA: load_calibration allows to upload integration map
2023-09-22 18:28:35 +02:00
leonarski_f
2c9d623265
integration: use separate FIFO for integration results
2023-09-22 17:49:14 +02:00
leonarski_f
bb29e7e646
HLS_C_Simulation_check_single_packet: check for memory content for missed packets
2023-09-21 18:39:05 +02:00
leonarski_f
2eb85496f2
FPGA: add integration routine (work in progress)
2023-09-21 17:12:01 +02:00
leonarski_f
21bed7ee72
FPGA: host_writer writes module statistics
2023-09-21 13:19:23 +02:00
leonarski_f
2a0122393c
FPGA: Fix license
2023-09-21 13:10:55 +02:00
leonarski_f
a5aed37100
Definitions.h: Increase space for data processing results
2023-09-21 10:08:53 +02:00
leonarski_f
ffa3a2cdac
FPGAAcquisitionDevice: Put warning for wrong data collection ID
2023-09-20 16:52:59 +02:00
leonarski_f
8c1bc9d89d
FPGA: Remove non-blocking mode
2023-09-20 16:41:14 +02:00
leonarski_f
88e837a33a
FPGAAcquisitionDevice: Remove non-blocking mode
2023-09-20 16:29:50 +02:00
leonarski_f
ac2181e276
FPGAAcquisitionDevice: Remove non-blocking mode
2023-09-20 16:26:53 +02:00
leonarski_f
89bd3e5081
broker.json: Fix IP addresses for writer
2023-09-20 15:32:55 +02:00
leonarski_f
1d1f6125f0
broker.json: Add 6M and 7.5M ROI
2023-09-20 15:27:37 +02:00
leonarski_f
784b1f41ed
jfjoch_receiver: Allow to set NUMA policy
2023-09-20 14:28:24 +02:00
leonarski_f
494ccba73d
JFJochReceiver: Handle better error in binding to NUMA policy
2023-09-20 14:24:31 +02:00
leonarski_f
3f2a692f17
DetectorSetup: Configure UDP interface count
2023-09-20 14:03:55 +02:00
leonarski_f
6cbd577824
DetectorSetup: Configure UDP interface count
2023-09-20 14:00:10 +02:00
leonarski_f
aa3d9e5edb
DetectorWrapper: Add warning message when having problem stopping the detector
2023-09-20 11:01:13 +02:00
leonarski_f
498fccfb8c
DetectorWrapper: Add warning message when having problem stopping the detector
2023-09-20 10:53:44 +02:00
leonarski_f
25ce039e92
FPGA: Modifications to host_writer to make it functionally closer to old one
2023-09-19 21:24:37 +02:00
leonarski_f
18a138cd04
PCIe driver: Fix lack of return value in switch case
2023-09-19 20:28:55 +02:00
leonarski_f
38a6378592
FPGA: Fix frame generator empty/full signal
...
(cherry picked from commit 67473bcac1
2023-09-19 19:48:13 +02:00
leonarski_f
f35a8a90da
DetectorWrapper: Ignore exceptions of Detector:stopDetector()
...
(cherry picked from commit 2e63e50858
2023-09-19 19:48:13 +02:00
leonarski_f
aea110f153
DetectorWrapper: Change threshold temperature to 60
...
(cherry picked from commit 3b8bbd4668
2023-09-19 19:48:13 +02:00
leonarski_f
67473bcac1
FPGA: Fix frame generator empty/full signal
2023-09-19 19:46:48 +02:00
leonarski_f
62bb0c9e98
FPGAAcquisitionDevice: Monitor frame generator FIFO
2023-09-19 19:46:00 +02:00
leonarski_f
2e63e50858
DetectorWrapper: Ignore exceptions of Detector:stopDetector()
2023-09-19 19:29:12 +02:00
leonarski_f
3b8bbd4668
DetectorWrapper: Change threshold temperature to 60
2023-09-19 17:41:04 +02:00
leonarski_f
cea4db0005
broker.json: Fix detector module number for ROI
2023-09-19 15:13:38 +02:00
leonarski_f
437387a26d
broker.json: Fix detector module number for ROI
2023-09-19 15:06:58 +02:00
leonarski_f
809d655382
jfjoch_action_test: Add option for raw data (-R) + modules are total, not per stream
2023-09-19 13:18:31 +02:00
leonarski_f
7396ee342c
FPGA: Increase release level to make sure FPGA is using 1 MiB bursts only
2023-09-19 13:13:23 +02:00
leonarski_f
8e0edab0ee
AcquisitionDevice: Count completed descriptors
2023-09-19 12:53:59 +02:00
leonarski_f
ead3219a64
PCIe driver: Add function to count PCIe completed descriptors
2023-09-19 11:15:24 +02:00
leonarski_f
4d482e308a
FPGA: Fix datamover script
2023-09-19 07:36:56 +02:00
leonarski_f
86123eb2fe
FPGA: Use datamover for save_to_hbm and load_from_hbm
2023-09-19 07:36:56 +02:00
leonarski_f
98877e5bb3
FPGA: Monitor HBM completion and handle FIFOs
2023-09-19 07:36:56 +02:00
leonarski_f
a80fd362a6
FPGA: Make sure all HBM handles are accessible - scale FIFOs properly
2023-09-19 07:36:56 +02:00
leonarski_f
a94bdacea9
Revert "FPGA: use 4 HBM interfaces for load and save to HBM"
...
This reverts commit 28a29ea3183a35d8ba0dda0628ac727f8bfe4f17.
2023-09-19 07:36:56 +02:00
leonarski_f
1fe5c474ee
FPGA: use 4 HBM interfaces for load and save to HBM
2023-09-19 07:36:56 +02:00
leonarski_f
e041e7bf26
Revert "FPGA: double HBM latency & number of outstanding operations"
...
This reverts commit 0f903607a028e1827dd965b13f87f913cc81d6b1.
2023-09-19 07:36:56 +02:00
leonarski_f
480eb5527b
FPGA: double HBM latency & number of outstanding operations
2023-09-19 07:36:56 +02:00
leonarski_f
357e2c01f6
FPGA: hbm_size_bytes is constant in action_config.v
2023-09-19 07:36:56 +02:00
leonarski_f
6700fe54f8
FPGA: hbm_size_bytes in load_from_hbm and save_to_hbm is read after first data package is exchanged
2023-09-19 07:36:56 +02:00
leonarski_f
5f5b59ef30
FPGA: Increase FIFO just before save_to_hbm
2023-09-19 07:36:56 +02:00
leonarski_f
95d4844aa4
FPGA: Use both HBM pseudo-channels
2023-09-19 07:36:56 +02:00
leonarski_f
e194d31ee1
FPGA: Add register slices
2023-09-19 07:36:56 +02:00
leonarski_f
36cd247377
FPGA: Integrate HBM cache into the FPGA
2023-09-19 07:36:56 +02:00
leonarski_f
2982097b8c
FPGA: Use HBM as intermediary cache for images
2023-09-19 07:36:56 +02:00
leonarski_f
5b448c1b1a
GPUImageAnalysis: Fix to allow compilation without CUDA
2023-09-19 07:36:20 +02:00
leonarski_f
4375d992ff
CMake: Use static HDF5 library
2023-09-19 07:28:40 +02:00
leonarski_f
121aef36ba
recv.json: Update host address
2023-09-16 13:19:51 +02:00
leonarski_f
e0fd52b31b
jjofhc_grpc2http.py use relative directory
2023-09-16 12:57:01 +02:00
leonarski_f
a67da96bee
broker.json: Adapt to 9M
2023-09-16 12:56:41 +02:00
leonarski_f
ca55ade211
Merge branch 'fpga_easy_recover' into 'main'
...
Recent updates
See merge request jungfraujoch/nextgendcu!6
2023-09-15 12:35:36 +02:00
leonarski_f
90cd9602e2
Update slsDetectorPackage to 7.0.2
...
Signed-off-by: Filip Leonarski <filip.leonarski@psi.ch >
2023-09-15 12:21:31 +02:00
leonarski_f
16bbf54f2a
Remove open source license (for now)
2023-09-15 10:47:21 +02:00
leonarski_f
46c1cebab5
Merge branch 'fpga_frame_generator' into 'fpga_easy_recover'
...
FPGA: Replace internal_packet_generator with frame_generator
See merge request jungfraujoch/nextgendcu!5
2023-09-15 09:53:34 +02:00
leonarski_f
362eb62d4b
FPGA: Use own function to merge streams instead of AXI-Switch + more FIFO status saved
2023-09-14 23:58:17 +02:00
leonarski_f
7a026b89d0
FPGAIntegrationTest: Use blocking mode for one remaining test
2023-09-14 23:48:02 +02:00
leonarski_f
0a152f7b5a
PCIe driver: check Ethernet aligned twice
2023-09-14 23:43:01 +02:00
leonarski_f
aee9d0e6fc
jfjoch_action_test: Set IPv4 and MAC addresses
2023-09-14 17:54:33 +02:00
leonarski_f
ab1a8fbfca
PCIExpressDevice: Get MAC/IPv4 Address for internal packet generator via ioctl
2023-09-14 17:48:30 +02:00
leonarski_f
48ee2ca305
FPGAAcquisitionDevice: Fix reporting of FIFO status
2023-09-14 16:31:24 +02:00
leonarski_f
886a84ee9f
PCIExpressDevice: Wrong function parameter
2023-09-14 16:16:30 +02:00
leonarski_f
5d8a85071e
PCIe driver: Fix missing return value in a function
2023-09-14 15:56:52 +02:00
leonarski_f
aa263a329e
Make test more repeatable by removing non-blocking mode in HLS simulation
2023-09-13 21:51:40 +02:00
leonarski_f
0b95456d3d
Adapt PCIe driver and tests for the new frame generator
2023-09-13 21:44:20 +02:00
leonarski_f
f3e85deb31
FPGA: Increase PCIe BAR size to 16 MB
2023-09-13 20:55:10 +02:00
leonarski_f
0c471b3760
FPGA: Some clean-up of frame generator
2023-09-13 20:53:55 +02:00
leonarski_f
496d016c31
FPGA: Replace internal_packet_generator with frame_generator (generating UDP packets, instead of internal JFJoch packets)
2023-09-13 20:06:09 +02:00
leonarski_f
95d20085dd
FPGA: Use volatile variable for counter
2023-09-13 10:35:02 +02:00
leonarski_f
33a15e87df
PCIe driver: minor fixes
2023-09-13 08:00:55 +02:00
leonarski_f
0b4320c381
PCIe driver: enable DMA
2023-09-13 07:58:20 +02:00
leonarski_f
56993d3597
FPGA: minor clean-up of network routines
2023-09-12 21:35:37 +02:00
leonarski_f
b7239331ac
FPGA: remove script from OC-Accel
2023-09-12 21:10:15 +02:00
leonarski_f
5e137a514a
FPGA: add more FIFOs to monitoring
2023-09-12 20:35:48 +02:00
leonarski_f
8626195091
FPGA: fix to deadlock
2023-09-12 20:09:11 +02:00
leonarski_f
9d01630cfc
FPGA: load calibration works as dedicated function of the card
2023-09-12 14:34:42 +02:00
leonarski_f
7a635f1ee8
FPGA: load_calibration clean-up + simplification
2023-09-12 09:16:45 +02:00
leonarski_f
2b29381f87
FPGA: update in timer code
2023-09-12 08:16:44 +02:00
leonarski_f
8c3a25a8ad
FPGA: load calibration operates directly on HBM
2023-09-11 21:47:29 +02:00
leonarski_f
f98b5fe389
FPGA: use only two HBM channels to write calibration in JF conversion
2023-09-11 20:30:46 +02:00
leonarski_f
05000bab1f
FPGA: remove transfer to HBM for the time being
2023-09-11 20:24:20 +02:00
leonarski_f
0c524f9a3c
FPGA: Add module to load images from HBM
2023-09-11 12:42:38 +02:00
leonarski_f
253b409d38
FPGA: Mark last completion saved to HBM
2023-09-11 12:20:07 +02:00
leonarski_f
309dabd32b
FPGA: Use dedicated struct for address exchange
2023-09-11 11:19:05 +02:00
leonarski_f
9ff8e039d7
FPGA: use HBM channels 12 and 13 for save_to_hbm
2023-09-11 10:50:30 +02:00
leonarski_f
6cd8d768ea
FPGA: save_to_hbm uses dedicated data structure for completion
2023-09-11 10:50:15 +02:00
leonarski_f
ae7ccfdcec
FPGA: Fix to save_to_hbm test
2023-09-10 21:37:20 +02:00
leonarski_f
36444f4c8f
FPGA: Use different memory controllers for save to HBM
2023-09-10 20:19:15 +02:00
leonarski_f
48861aafcb
FPGAAcquisitionDevice: Report HBM size
2023-09-10 16:38:25 +02:00
leonarski_f
6e299c5a15
FPGA: Save to HBM uses fixed sizes of HBM to calculate offset in memory
2023-09-10 10:11:59 +02:00
leonarski_f
175aefc4b8
FPGA: Save to HBM uses only 2 channels
2023-09-10 09:54:32 +02:00
leonarski_f
929f6c6544
FPGA: Handle HBM offsets internally in Jungfraujoch logic
2023-09-09 20:50:41 +02:00
leonarski_f
d4bcfb9f9e
hls_burst_maxi.h: Allow for multiple operations on the same channel
2023-09-09 18:41:05 +02:00
leonarski_f
aca1bbda0e
HLSSimulatedDevice: moving towards continuous HBM representation
2023-09-09 13:10:06 +02:00
leonarski_f
6251c58f32
FPGA: Add function to transfer data from HBM to AXI-Lite accessible buffer
2023-09-08 19:08:37 +02:00
leonarski_f
e8c0500ea8
FPGA: Use HBM switch to access full HBM
2023-09-08 17:09:33 +02:00
leonarski_f
c2eaee6d8a
FPGA: Save to HBM operates in parallel to host writer
2023-09-08 13:07:49 +02:00
leonarski_f
5d566aeb4b
FPGAIntegrationTest: Added blocking mode to one more test
2023-09-07 22:15:21 +02:00
leonarski_f
38df621cf6
FPGA: Add save to HBM (work in progress)
2023-09-07 22:15:20 +02:00
leonarski_f
347bfd3f2c
HLSSimulateDevice: Remove reference to UltraRAM
2023-09-07 21:39:14 +02:00
leonarski_f
ae830009c4
FPGA: Don't override default MAC location in bd_pcie.tcl
2023-09-07 21:03:08 +02:00
leonarski_f
1d1894d7d6
FPGA: Use only single HBM stack
2023-09-07 21:03:08 +02:00
leonarski_f
35aa21fefe
FPGA: Increase FIFO size to improve buffering capability
2023-09-07 12:23:38 +02:00
leonarski_f
dd002e3d6d
FPGA: Build only 100G solution (no bifurcated design)
2023-09-07 12:10:38 +02:00
leonarski_f
4032ce09b8
FPGA: increase burst length and latency for internal packet generator AXI interface
2023-09-07 05:54:24 +02:00
leonarski_f
a6377239cf
FPGA: fix script for 2x100G design
2023-09-06 19:07:20 +02:00
leonarski_f
11696608ca
FPGA: reduce AXI number of outstainding operations in internal packet generator
2023-09-06 18:23:36 +02:00
leonarski_f
0434207882
FPGA: use full AXI for internal packet generator
2023-09-06 18:16:44 +02:00
leonarski_f
1333ce9b29
FPGA: trigger synthesis
2023-09-06 12:36:14 +02:00
leonarski_f
da045c023b
Tests are adjusted to use blocking FPGA mode
2023-09-06 12:35:44 +02:00
leonarski_f
3aeb3e09ee
FPGA: Do not load internal packet generator frame via DMA
2023-09-06 11:57:16 +02:00
leonarski_f
7904a03e4b
PCIe driver: add functions to load/save internal packet generator memory
2023-09-06 09:30:27 +02:00
leonarski_f
caf950f99f
FPGA: Internal packet generator uses external memory to store image, and this memory is accessible via PCIe BAR
2023-09-06 08:19:03 +02:00
leonarski_f
f61ffc1533
FPGA: Update README.md
2023-08-15 21:53:32 +02:00
leonarski_f
2a0e4b7d4a
FPGA: Use 200 Hz for 100 Gbit/s design
2023-08-15 17:31:05 +02:00
leonarski_f
f66fc95ecc
FPGA: Use 250 Hz for 100 Gbit/s design + adjust TCL scripts
2023-08-15 14:39:04 +02:00
leonarski_f
ad5030334a
FPGA: Add 1 stream design
2023-08-14 21:55:27 +02:00
leonarski_f
2a5741931d
FPGAIntegrationTest: Use blocking mode for internal_packet_generator test
2023-08-12 12:09:38 +02:00
leonarski_f
3e406f0f46
FPGA: URAM read latency reduced to 2
2023-08-12 12:05:53 +02:00
leonarski_f
6006850c40
RadialIntegration: Don't keep RadialIntegration on stack
2023-08-08 11:32:27 +02:00
leonarski_f
4159fc7b6d
RadialIntegration: Use pointer to transfer integration to the sub-thread
2023-08-08 11:28:16 +02:00
leonarski_f
91c94f77d6
RadialIntegration: Remove RadialIntegration preparation from timed loop
2023-08-08 11:25:54 +02:00
leonarski_f
480161ad7d
RadialIntegration: Increase reporting precision
2023-08-08 11:20:06 +02:00
leonarski_f
104ec86af4
RadialIntegration: Minor improvements
2023-08-08 11:13:14 +02:00
leonarski_f
06ca7be10d
RadialIntegrationCPUTest: Fix
2023-08-08 10:54:20 +02:00
leonarski_f
5df72a4d54
CompressionBenchmark: Fix minor issue in assigning images for analysis
2023-08-08 10:48:12 +02:00
leonarski_f
6d130926b0
RadialIntegrationCPUTest: Added multi-threaded test for CPU radial integration
2023-08-08 10:47:50 +02:00
leonarski_f
2eac43b925
RadialIntegration: Enable pixel splitting with CPU based routine
2023-08-08 10:20:26 +02:00
leonarski_f
28675fb3be
CompressionBenchmark: Repeat tes
2023-08-06 22:41:04 +02:00
leonarski_f
6f6d765932
CompressionBenchmark: Increase number of images
2023-08-06 22:19:21 +02:00
leonarski_f
8035a86db1
CompressionBenchmark: Add multi-thread option
2023-08-06 22:06:44 +02:00
leonarski_f
ac5052073e
JFJochReceiver: Option for local conversion
2023-08-05 15:23:45 +02:00
leonarski_f
184d136158
JFJochReceiver: Prepare to have fixed_point_conversion locally
2023-08-04 21:41:07 +02:00
leonarski_f
875fbb77a7
JFJochConversionFixedPoint: Use __restrict qualifier
2023-08-04 21:30:14 +02:00
leonarski_f
767dc8e1b3
JFJochCompressor: Use Kal's bitshuffle compressor
2023-08-04 16:03:45 +02:00
leonarski_f
9144058f0c
JFJochCompressor: Use Kal's bitshuffle compressor
2023-08-04 15:47:32 +02:00
leonarski_f
defa97c88b
JFJochReceiver: Use malloc (no need to init to zero)
2023-08-04 13:02:55 +02:00
leonarski_f
f4b01ed62a
jfjoch_action_test: Fix
2023-08-04 12:55:35 +02:00
leonarski_f
ca5def57ec
jfjoch_action_test: Enable pinning modes for mock acquisition device
2023-08-04 12:52:38 +02:00
leonarski_f
7d945c8195
JFJochReceiver: send buffer is pointer with more flexibility
2023-08-04 12:46:58 +02:00
leonarski_f
37afbce802
MockAcquisitionDevice: Add NUMA node option
2023-08-04 12:46:06 +02:00
leonarski_f
d996ca42c9
NUMAHWPolicy: Add more policies for 2-node system
2023-08-04 09:31:18 +02:00
leonarski_f
45336015c5
CMake - fix compile definition
2023-07-28 11:43:15 +02:00
leonarski_f
45cdc11b73
CMake - fix compile definition
2023-07-28 11:42:06 +02:00
leonarski_f
60ab2a081d
jfjoch_action_test - minor fix
2023-07-28 11:17:34 +02:00
leonarski_f
9d978a41f7
NUMAHWPolicy: Added
2023-07-28 11:07:15 +02:00
leonarski_f
669b2d9358
CUDAWrapper: Move select device to dedicated wrapper
2023-07-27 21:30:10 +02:00
leonarski_f
5ca23ff64f
MockAcquisitionDevice: Minor fix
2023-07-27 20:45:30 +02:00
leonarski_f
3e42e997f4
CMake: minor CUDA fixes
2023-07-27 20:34:46 +02:00
leonarski_f
347fe9603f
DetectorWrapper: Fix bug, when creating detector from at start failed
2023-07-27 15:31:15 +02:00
leonarski_f
4ac06794da
JFConversionGPU: minor fix
2023-07-27 15:29:45 +02:00
leonarski_f
e63ce5df59
DiffractionExperiment: Save calibration is loaded from DatasetSettings
2023-07-27 15:28:52 +02:00
leonarski_f
1717887d4a
jfjoch_action_test: Command line options for more flexibility in testing
2023-07-27 14:09:03 +02:00
leonarski_f
8def7d624c
jfjoch_receiver: minor fix in absence of IBVERBS
2023-07-27 13:31:21 +02:00
leonarski_f
52aa879d47
MockAcquisitionDevice: Change conversion rules
2023-07-27 13:27:50 +02:00
leonarski_f
231ef5b08b
jfjoch_action_test_mock: Added, to be later merged with jfjoch_action_test
2023-07-27 13:16:09 +02:00
leonarski_f
8a7b088b2f
MockAcquisitionDevice: Add Internal Packet Generator
2023-07-27 13:06:51 +02:00
leonarski_f
3217e5209e
MockAcquisitionDevice: More robust implementation
2023-07-27 09:03:26 +02:00
leonarski_f
fdb31a027a
grpcToJson.h: Issue with newer gRPC and ToString() method
2023-07-26 20:02:15 +02:00
leonarski_f
9d1add32e5
jsonToGrpc.h: Some issues with conversion of error message to string between gRPC version
2023-07-26 17:26:32 +02:00
leonarski_f
0969bf662e
jfjoch_action_test: Adapt
2023-07-26 11:28:45 +02:00
leonarski_f
580cc776a1
CMake: Add L4 GPU architecture
2023-07-26 11:26:41 +02:00
leonarski_f
ac1d358700
AcquisitionDevice: Improve detection of erroneous frames without killing data acquisition
2023-07-25 12:40:57 +02:00
leonarski_f
0421e517fc
FPGA: host writer - fix wrong req handle check + add marker in work complection for flushing frame
2023-07-25 12:40:57 +02:00
leonarski_f
13b2e16b33
FPGA: handle better weird work request handle
2023-07-25 12:40:57 +02:00
leonarski_f
847ca0922c
FPGA: host writer error register is 8-bit
2023-07-25 12:40:57 +02:00
leonarski_f
35b3704ccf
FPGA: ignore packets with module number out of bounds + set bit in error register
2023-07-25 12:40:57 +02:00
leonarski_f
36cfba6093
JFJochFrameSerializer: Add magic number to ensure that CBOR user data fields are consistent between receiver and writer
2023-07-06 11:23:49 +02:00
leonarski_f
9e92e230ba
JFJochFrameSerializer: Single header for all the messages
2023-07-06 10:44:01 +02:00
leonarski_f
3774105006
jfjoch_receiver: Fix preview indexed ZMQ address
2023-07-05 14:05:24 +02:00
leonarski_f
e3c224ccb1
jfjoch_receiver: Fix preive indexed ZMQ address
2023-07-05 14:03:10 +02:00
leonarski_f
31e1cb159b
PCIe driver: Fix path
2023-07-05 12:50:41 +02:00
leonarski_f
f37a99e7e6
DiffractionExperiment: Remove scattering vector setting
2023-07-05 11:49:17 +02:00
leonarski_f
2f7b46290a
FPGA: Enable non-power of 2 storage cell number
2023-07-04 21:59:48 +02:00
leonarski_f
c9b7bb5a75
JFJochStateMachine: If storage cell number > 1 start from cell 0
2023-07-04 21:38:10 +02:00
leonarski_f
3f7c2600d0
FPGA: Allow any storage cell number from 1 to 16
2023-07-04 21:16:25 +02:00
leonarski_f
4ce2fcf98f
DiffractionExperiment: Adjust storage cell delay as a parameter
2023-07-04 21:07:40 +02:00
leonarski_f
3067604e2a
Definitions.h: shortest allowed count time is 5 us
2023-07-04 16:37:56 +02:00
leonarski_f
52902d352e
JFConversionGPU: Fix procedure in case there is no CUDA
2023-07-04 14:26:40 +02:00
leonarski_f
7a4e75efd3
CheckConversionWithGeomTransform: Use fill value for gaps consistent with JFJochReceiver
2023-07-04 11:45:17 +02:00
leonarski_f
9d35660cf4
DetectorGeometry: Fix module slow direction if horizontal stacking > module number
2023-07-04 11:25:19 +02:00
leonarski_f
8a203b7cf5
gRPC: Mask application during conversion is part of internal settings and is not part of easy accessible settings (to ensure it is always applied)
2023-07-01 19:20:19 +02:00
leonarski_f
a66ac66d0b
gRPC: Changed behavior, so mask application during conversion is now default behavior
2023-06-30 13:34:45 +02:00
leonarski_f
f9deb58d20
HDF5NXmx: Fix dimension order in SaveCBORImage
2023-06-28 21:24:07 +02:00
leonarski_f
736d009764
HDF5DatasetWriteTest: Fix
2023-06-28 20:33:25 +02:00
leonarski_f
831c93104d
DiffractionExperiment: Add option to save calibration
2023-06-28 17:30:59 +02:00
leonarski_f
0904e1f198
JFJochFrameSerializer: Using CBORImage for mask and calibration + writing calibration in HDF5 file
2023-06-28 17:14:09 +02:00
leonarski_f
e472047839
JFJochCompressor: Add another template function
2023-06-28 17:13:34 +02:00
leonarski_f
d2788a09fd
JFJochFrameSerializer: Add calibration settings
2023-06-27 16:20:47 +02:00
leonarski_f
d831300d14
JFJochFrameSerializer: Generalize 2D arrays for floats
2023-06-27 14:52:18 +02:00
leonarski_f
04a2e9d20c
DetectorWrapper: Clear synchronization prior to reconfiguring the detector
2023-06-26 14:32:46 +02:00
leonarski_f
2a29c09a1a
JFJochReceiverClient: Minor fix
2023-06-26 14:30:59 +02:00
leonarski_f
da9fc9570a
FrontEnd: Improvements for radial integration plots
2023-06-26 11:04:11 +02:00
leonarski_f
e0bf111941
JFJochReceiverClient: Generate dummy plots for radial_integration_profile
2023-06-26 11:04:11 +02:00
leonarski_f
a43fa2a296
ProtoBuf: Don't use maps, as these don't preserve order of elements
2023-06-26 09:27:47 +02:00
leonarski_f
2caba97bb2
DiffractionExperiment: Save ROI
2023-06-23 21:04:15 +02:00
leonarski_f
9089794d46
ROIFilter: Fix
2023-06-23 14:29:49 +02:00
leonarski_f
2b72039045
PredictSpotsOnDetector: Add (but no correctness test so far)
2023-06-23 14:18:36 +02:00
leonarski_f
bd549bb339
ROIFilter: Add filter to only preserve ROI regions
2023-06-23 14:17:53 +02:00
leonarski_f
bbd0b6ef36
ROIFilter: Add filter to only preserve ROI regions
2023-06-23 13:26:55 +02:00
leonarski_f
dd20ac2acd
RadialIntegrationTest: Add test for corrections
2023-06-19 20:08:51 +02:00
leonarski_f
4c28d2d976
GPUImageAnalysis: minor correction
2023-06-19 20:08:37 +02:00
leonarski_f
ca15556964
DiffractionGeometry: Add DistFromEwaldSphere function
2023-06-19 20:06:11 +02:00
leonarski_f
945a3b9271
DiffractionExperiment: Enable/disable solid angle and polarization corrections
2023-06-19 11:36:32 +02:00
leonarski_f
032543e69a
GPUImageAnalysis: Add option to include corrections in radial integration + keep rad.int. sum and count as floats
2023-06-19 09:29:23 +02:00
leonarski_f
74ed4ad47b
DiffractionGeometry: Fix PolarizationCorrection
2023-06-19 07:47:40 +02:00
leonarski_f
bcf1d634f8
DiffractionGeometry: Dedicated file + option to project reciprocal space nodes on the detector + more calculations (phi, cos 2theta, solid angle)
2023-06-18 22:35:43 +02:00
leonarski_f
0aa3d7fbfd
JFConversionFloatingPoint: Don't rely on infinity for FP math
2023-06-14 12:02:05 +02:00
leonarski_f
cd76e97766
IndexerWrapper: Fix for Intel Compiler (probably returning stack reference?)
2023-06-14 11:34:49 +02:00
leonarski_f
cc07979fca
JFCalibrationPerfTest: Don't use random numbers to generate pedestal frames (too slow with Intel Compiler)
2023-06-14 10:04:47 +02:00
leonarski_f
b92f345dea
CoordTest: Fix handling of imprecision
2023-06-13 22:22:14 +02:00
leonarski_f
d30c3eb055
FPGAAcquisitionDevice: Serious seg-fault!
2023-06-13 22:16:22 +02:00
leonarski_f
697e727a16
JFConversionFixedPoint: vectorization, try again
2023-06-13 21:16:12 +02:00
leonarski_f
ee4eb6e067
Remove _Alt from non-GPU .cpp files
2023-06-13 20:23:39 +02:00
leonarski_f
cf9a65b1c3
JFConversionGPU: Fix alternative function
2023-06-13 20:22:56 +02:00
leonarski_f
7799571a35
JFConversionFixedPoint: Remove ConvertLine
2023-06-13 20:22:22 +02:00
leonarski_f
cadcc03d32
Revert "JFConversionFixedPoint: More SIMD friendly"
...
This reverts commit 17040d4ee5
2023-06-09 18:17:14 +02:00
leonarski_f
5b11a6f842
Revert "JFConversionFixedPoint: More SIMD improvement (but Intel only!)"
...
This reverts commit b51c8b91d2
2023-06-09 18:17:14 +02:00
leonarski_f
b51c8b91d2
JFConversionFixedPoint: More SIMD improvement (but Intel only!)
2023-06-09 15:55:48 +02:00
leonarski_f
17040d4ee5
JFConversionFixedPoint: More SIMD friendly
2023-06-09 15:17:00 +02:00
leonarski_f
a12fc941d5
JFJochReceiver: Remove host subdirectory
2023-06-07 21:28:22 +02:00
leonarski_f
7a98766304
FPGA: Split receiver and FPGA design directories
2023-06-07 21:21:22 +02:00
leonarski_f
0b1bae7e8e
CMake: Minor fix to handle missing IBVERBS
2023-06-07 21:01:04 +02:00
leonarski_f
b5d0b34fc8
JFConversion: Simplify (processing per module, not per packet) + add GPU conversion procedure - currently only synchronous
2023-06-07 20:53:59 +02:00
leonarski_f
6a50092800
JFConversion: Remove function to do conversion + geometry correction in one go (it makes code complex)
2023-06-07 10:13:19 +02:00
leonarski_f
190068d8fa
JFCalibrationPerfTest: Add parallel conversion test (up to 32 threads)
2023-06-06 18:53:42 +02:00
leonarski_f
b74513ef49
ProcessJFPacket: Support up to 32 modules
2023-06-06 18:53:10 +02:00
leonarski_f
6d4717e1e5
JFConversionFixedPoint: Minor speed-up
2023-06-04 09:18:54 +02:00
leonarski_f
64a4b7323c
ZMQWrappers: remove <sempahore> include
2023-06-03 23:01:40 +02:00
leonarski_f
1930bd2c6e
JFConversionFixedPoint: Minor performance improvement
2023-06-03 22:49:30 +02:00
leonarski_f
5513b46833
JFCalibrationPerfTest: measure performance of conversion with packet processing
2023-06-03 21:02:21 +02:00
leonarski_f
38b59de045
ProcessJFPacket: Enable conversion (no storage cells at the moment)
2023-06-03 20:49:43 +02:00
leonarski_f
d6d827fd9d
FPGA: host_writer is not sending packet count back
2023-06-03 20:00:02 +02:00
leonarski_f
3d645c7169
AcquisitionDevice: Always use AcquisitionCounters to find how many packets/bytes were downloaded
2023-06-03 20:00:02 +02:00
leonarski_f
459b84d7c6
AcquisitionCounters: Simplify
2023-06-03 19:41:42 +02:00
leonarski_f
ab6f33be84
AcquisitionDevice: further simplify
2023-06-03 18:54:05 +02:00
leonarski_f
e1e46f411f
AcquisitionDevice: refactor to make it less FPGA dependent
2023-06-03 18:37:56 +02:00
leonarski_f
7d88017d51
AcquisitionDevice: FPGA specific calibration initialization moved to FPGAAcqusitionDevice
2023-06-03 17:27:49 +02:00
leonarski_f
9497d84f3c
FPGA: Small rewrite of the internal_packet_generator
2023-06-02 21:59:24 +02:00
leonarski_f
62ce464fb9
PCIe driver: automatically cancel data collection when character device is released
2023-06-02 16:55:25 +02:00
leonarski_f
1da3019190
FPGAAcquisitionDevice: Bug in ReadWorkCompletionThread - loop exit condition was wrong
2023-06-02 16:52:34 +02:00
leonarski_f
dff0015762
PCIe driver: Minor fix
2023-06-02 07:52:08 +02:00
leonarski_f
9178bbd689
jfjoch_pcie_status: show data collection cancel bit
2023-06-01 21:29:38 +02:00
leonarski_f
9bbf1c06a1
FPGAAcquisitionDevice: Add extra verbosity
2023-06-01 21:20:59 +02:00
leonarski_f
e8ec298a4c
FPGAAcquisitionDevice: Minor fixes to verbosity
2023-06-01 21:07:03 +02:00
leonarski_f
577bec5dbc
FPGAAcquisitionDevice: Add extra verbosity for dropped completions
2023-06-01 20:59:38 +02:00
leonarski_f
612c2b8aa2
jfjoch_pcie_status: Print data collection ID separately
2023-06-01 20:58:01 +02:00
leonarski_f
115e8c0dd0
AcquisitionDevice: Use random_device directly to simplify the code
2023-06-01 20:56:15 +02:00
leonarski_f
ba39423a10
AcquisitionDevice: Use C++11 random number generator
2023-06-01 20:45:00 +02:00
leonarski_f
98ad3a6fdc
FPGA: Reduce UltraRAM usage by 4 MiB to improve timing
2023-05-31 21:16:54 +02:00
leonarski_f
47330228ef
Use data_collection_id to detect issues in work completion queue
2023-05-31 12:23:22 +02:00
leonarski_f
ea3f976e66
Update receiver/README.md
2023-05-31 11:47:49 +02:00
leonarski_f
8ac012ae99
FPGA: Use upper 16-bits of mode as data_collection_id
2023-05-31 11:38:17 +02:00
leonarski_f
b868a24dad
FPGA: Minor improvements to internal_packet_generator - should now better break in case of cancellation
2023-05-31 11:08:28 +02:00
leonarski_f
5ec4d41e68
internal_packet_generator: quit main loop in case of cancel
2023-05-31 10:53:29 +02:00
leonarski_f
4671f392bd
FPGA: Trigger
2023-05-30 20:48:17 +02:00
leonarski_f
0994e142b3
JFJochReceiverIntegrationTest: Increase buffer count for storage cell pedestal G2 test
2023-05-30 20:47:10 +02:00
leonarski_f
5cd483eeb3
jfjoch_pcie_status: Fix data collection counter
2023-05-30 20:20:09 +02:00
leonarski_f
a3996a81e3
FPGA: Remove data collection counter
2023-05-30 20:13:54 +02:00
leonarski_f
8c1e55b6f3
Add tool to cancel data collection on PCIe card
2023-05-27 22:08:22 +02:00
leonarski_f
7ad4fbe061
AcquisitionDevice: Print information on data collection counter in start message
2023-05-27 21:54:55 +02:00
leonarski_f
effcd2d2b7
AcquisitionDevice: Set cancel data collection bit before starting new data collection
2023-05-27 21:54:36 +02:00
leonarski_f
72cdb88c0c
FPGA: Add host_writer idle marker
2023-05-27 21:45:21 +02:00
leonarski_f
19753c697b
AcquisitionDevice: Rewind to start at the beginning to recover FPGA
2023-05-27 21:00:31 +02:00
leonarski_f
2b00cdadbe
jfjoch_action_test: Fix message for blocking mode
2023-05-27 20:03:24 +02:00
leonarski_f
7c9a5238e2
FPGA: Minor improvements to data_collection_fsm
2023-05-27 18:39:35 +02:00
leonarski_f
79c9b3e322
jfjoch_action_test: Use nonblocking mode
2023-05-27 18:20:16 +02:00
leonarski_f
5ef0cd0f74
jfjoch_action_test: Improve output clarity
2023-05-27 18:18:00 +02:00
leonarski_f
19476dc6ea
jfjoch_action_test: Fix
2023-05-27 18:01:58 +02:00
leonarski_f
a9a00db8e9
PreviewTest: Fix
2023-05-27 17:59:26 +02:00
leonarski_f
8c3ff99014
Adjust PCIe driver (there were wrong interrupt levels)
2023-05-26 22:12:49 +02:00
leonarski_f
c1212a14d9
FPGA: work requests are consumed while host_writer not working
2023-05-26 22:12:34 +02:00
leonarski_f
b926e69885
FPGA: data_collection_fsm counter
2023-05-26 20:39:12 +02:00
leonarski_f
8b87bb857b
FPGA: clean-up unnecessary signals (from OC design)
2023-05-26 19:38:07 +02:00
leonarski_f
021e652dc6
FPGA: non-blocking mode (to be tested)
2023-05-26 18:46:26 +02:00
leonarski_f
2dfd6e916d
FPGA: work completion queue is extended to 32768 elements.
2023-05-24 11:57:56 +02:00
leonarski_f
c2b42916c2
FPGA: host_writer allows to skip frames, if no available location in host memory
2023-05-24 11:54:51 +02:00
leonarski_f
0ef50e06b3
jfjoch_receiver: Add channel for indexed images
2023-05-19 16:45:12 +02:00
leonarski_f
eaccdf67b7
ZMQPreviewPublisher: Add spots to preview message + allow for frame number management within the ZMQPreviewPublisher
2023-05-18 22:36:43 +02:00
leonarski_f
ff92984fcc
ProcessJFPacket: Add exptime
2023-05-18 12:46:58 +02:00
leonarski_f
1df16b1a1e
JFJochReceiver: Save receiver_available_send_buffers and receiver_aq_dev_delay in HDF5 file
2023-05-18 12:46:58 +02:00
leonarski_f
e7f012dd90
Update fast-feedback-indexer to last version
2023-05-18 10:48:40 +02:00
leonarski_f
bb4cee9b2d
JFJochReceiver: Save information on crystal lattice and spot indexing status to HDF5 file
2023-05-18 10:46:46 +02:00
leonarski_f
e3998a7488
IndexerWrapper: Add indexed spots information
2023-05-18 09:18:16 +02:00
leonarski_f
8c85789a77
IndexerWrapper: Use dedicated structure to write result
2023-05-18 08:52:49 +02:00
leonarski_f
ea719742ce
DiffractionExperiment: Solid angle correction is saved with the master file
2023-05-17 22:53:41 +02:00
leonarski_f
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
leonarski_f
97bf8f7e4a
FPGA: Reduce UltraRAM FIFO (a bit)
2023-05-17 21:55:41 +02:00
leonarski_f
33b70551c5
CBOR: Keep base for exptime and timestamp in the ImageMessage structure
2023-05-17 21:54:07 +02:00
leonarski_f
7d5694139f
FPGA: Save full JF timestamp and exptime
2023-05-17 21:30:42 +02:00
leonarski_f
0febe9856f
HDF5DataFile: spot information is written as images are coming
2023-05-17 20:40:55 +02:00
leonarski_f
f372c0e697
ImageMessage: Add storage cell number
2023-05-17 20:40:55 +02:00
leonarski_f
e5aec21924
jfjoch_receiver: Fix formatting
2023-05-15 16:24:11 +02:00
leonarski_f
8e1b0b764a
JFJochReceiver: Print which storage cell (according to header) was used to calculate pedestal
2023-05-15 15:38:22 +02:00
leonarski_f
6c18c0a5cd
DiffractionExperiment: Pedestal with storage cells is based on external trigger
2023-05-15 15:35:06 +02:00
leonarski_f
939e661a33
DiffractionExperiment: Fix starting storage cell (2)
2023-05-14 15:37:16 +02:00
leonarski_f
1ef74b0a53
DiffractionExperiment: Fix starting storage cell
2023-05-14 15:21:31 +02:00
leonarski_f
3804056998
AcquisitionOnlineCounters: Extra verbose
2023-05-13 14:07:07 +02:00
leonarski_f
bc396bfd25
JFJochReceiver: add bkg estimate to measurement statistics
2023-05-13 12:23:01 +02:00
leonarski_f
8d154aa0a1
JFJochReceiver: Add per file indexing rate. Drop per file radial integration using GetPlots()
2023-05-10 19:09:52 +02:00
leonarski_f
6c15e07acb
JFJochStateMachine: Generate MeasurementStatistics for running dataset
2023-05-10 18:46:04 +02:00
leonarski_f
2aa8b5cf91
DiffractionExperiment: Fix loading 2x2 binning/solid angle/apply pixel mask
2023-05-10 13:55:21 +02:00
leonarski_f
741fc5c1d8
jfjoch_grpc2http.py: Minor correction
2023-05-10 09:38:45 +02:00
leonarski_f
db54692735
JFJochReceiver: Minor change to way how radiation integration profiles are generated
2023-05-10 09:22:02 +02:00
leonarski_f
e5739f5408
JFJochReceiver: Transfer all radial integration profiles in one ProtoBuf
2023-05-09 22:19:05 +02:00
leonarski_f
5b49971dd7
jfjoch_writer_test: Fix
2023-05-09 21:15:20 +02:00
leonarski_f
23e50f9ade
recv.json: increase send buffer count to 2048.
2023-05-09 17:14:43 +02:00
leonarski_f
2e73acef6b
JFJochReceiver: Use floats for indexing rate and progress
2023-05-09 17:12:28 +02:00
leonarski_f
0fb5d68154
JFJochReceiver: Setup number of send buffers
2023-05-09 17:11:03 +02:00
leonarski_f
122c58fbf7
JFJochReceiver: Track available send buffers
2023-05-09 16:44:56 +02:00
leonarski_f
b33cc45edf
JFJochReceiver: Using ZeroCopyReturnValue
2023-05-09 16:40:47 +02:00
leonarski_f
eac366cbe5
ZeroCopyReturnValue: Add structure to return ZMQ zero copy buffer
2023-05-09 16:17:13 +02:00
leonarski_f
2c62d01759
JFJochFrameSerializer: Serializer buffer is managed externally
2023-05-09 15:36:56 +02:00
leonarski_f
70fb7b96f8
RadialIntegrationProfile: Minor change to the interface
2023-05-09 14:47:23 +02:00
leonarski_f
a867b1c596
DiffractionExperiment: solid angle correction
2023-05-09 14:03:59 +02:00
leonarski_f
5d63bac30f
JFJochReceiver: add safety for overruninng the buffer
2023-05-09 12:09:23 +02:00
leonarski_f
a9c37ce418
JFJochReceiver: use const for serializer buffer size
2023-05-09 11:48:21 +02:00
leonarski_f
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
leonarski_f
96cd6fe552
Add JFJochReceiverTest_Cancel
2023-05-08 21:22:28 +02:00
leonarski_f
0f4eccf733
AcquisitionOnlineCounters: More verbose error messages
2023-05-08 20:32:56 +02:00
leonarski_f
34ead0eee9
JFJochReceiver: minor modifications
2023-05-08 20:27:18 +02:00
leonarski_f
bca73c2ac1
recv.json: Increase ZMQ send high watermark to 5000
2023-05-08 16:50:07 +02:00
leonarski_f
e799453b79
DiffractionExperiment: Default Q spacing is 0.05
2023-05-08 16:49:35 +02:00
leonarski_f
9e5238bc03
JFJochFullIntegrationTest: Don't check for binning of 0
2023-05-08 13:35:02 +02:00
leonarski_f
72276ed43a
JFJochReceiver: if no images sent, return compressed ratio of 0
2023-05-08 13:30:01 +02:00
leonarski_f
00a605889a
JFJochFullIntegrationTest: Add cancel integration test with summation of 100
2023-05-08 13:25:09 +02:00
leonarski_f
e8e5f50b21
Max summation is 5000
2023-05-08 13:12:44 +02:00
leonarski_f
2e26133556
JFJochReceiver: Always print message about finished AcquireThread
2023-05-08 13:09:33 +02:00
leonarski_f
489ca59c2c
Frontend: minor fix
2023-05-08 12:27:40 +02:00
leonarski_f
107e980e31
jfjoch_grpc2http.py: implement cancel
2023-05-08 11:18:08 +02:00
leonarski_f
747c7f8f0b
jfjoch_grpc2http.py: make it possible to use python requests
2023-05-08 10:53:06 +02:00
leonarski_f
dc2746a610
JFJochReceiverService: Allow for binning == 0
2023-05-08 10:50:09 +02:00
leonarski_f
355e53d424
Frontend: Add measurement statistics
2023-05-06 20:20:15 +02:00
leonarski_f
0bb572fc51
HDF5Sum: Fix
2023-05-06 17:10:39 +02:00
leonarski_f
8e794c87c8
Save radial integration results in master file
2023-05-06 12:44:42 +02:00
leonarski_f
70a10c594c
HDF5DataFile: Save radial integration result
2023-05-06 12:13:22 +02:00
leonarski_f
116fb8091b
broker.json: Default spot finding period is 3500 us, so at 500 us frame time it is 7 images stride
2023-05-06 11:21:32 +02:00
leonarski_f
2da2fb2631
StartMessage: Stream rad_int_bin_to_q
2023-05-06 11:03:30 +02:00
leonarski_f
0d2fa850a2
JFJochReceiver: Per-data-file radial integration profile
2023-05-06 10:54:28 +02:00
leonarski_f
59fbeab176
CatchTest: get correct value for storage cell delay in test
2023-05-06 10:20:26 +02:00
leonarski_f
cfc1c4d7ce
Frontend: Fix size of tabs in data processing plot choice
2023-05-06 07:46:02 +02:00
leonarski_f
7dc8ded38b
DiffractionExperiment: Default storage cell delay is 7.5 us (so 10 us in reality)
2023-05-05 13:42:26 +02:00
leonarski_f
70bdcfd99d
DiffractionExperiment: Storage cell number can be adjusted from the frontend
2023-05-05 13:42:04 +02:00
leonarski_f
866d70f41c
JFJochReceiver: Use zero-copy ZeroMQ sending
2023-05-05 10:18:40 +02:00
leonarski_f
f562095182
JFJochReceiver: Use C++20 std::latch
2023-05-05 09:36:34 +02:00
leonarski_f
552194653b
Frontend: Fix field names
2023-05-04 18:47:42 +02:00
leonarski_f
b686b1c94d
JFModuleGainCalibration: remove dependence on pointers, which could be not updated in case of copy/assignment
2023-05-04 18:45:28 +02:00
d27faed668
Minor updates when trying the software on xbl-daq-38
...
Signed-off-by: Leonarski Filip <leonarski_f@xbl-daq-38.psi.ch >
2023-05-04 15:06:04 +02:00
leonarski_f
d10201b502
jfjoch_action_test: Fix and adjust to recent modifications
2023-05-03 16:56:42 +02:00
leonarski_f
ee6b25ac53
AcquisitionDevice: Fix some unnecessary debug printing
2023-05-03 16:45:16 +02:00
leonarski_f
e5f6bba4aa
Merge branch 'jfjoch_cbor_in_place' into main
2023-05-02 21:18:27 +02:00
leonarski_f
dffe5ab6b9
JFJochReceiver: Use multithreaded implementation for summation of 50+ (assuming 100 microsecond to span thread, it is 0.5% overhead at 25 ms)
2023-05-02 21:17:53 +02:00
leonarski_f
ef7b6e84d7
JFJochReceiver: Compress directly to CBOR format
2023-05-01 21:37:55 +02:00
leonarski_f
9d5be2a4e9
FrameTransformation: Split packing and compression
2023-05-01 21:27:08 +02:00
leonarski_f
dce186f9f9
JFJochFrameSerializer: add functions to append image to buffer
2023-05-01 21:09:03 +02:00
leonarski_f
af2ed525a0
JFJochFrameSerializer: for the buffer return pointer + size, not vector reference (allows for more flexibility)
2023-05-01 20:26:15 +02:00
leonarski_f
60d95dc0d7
JFJochFrameSerializer: image is encoded at the very end
2023-05-01 18:36:58 +02:00
leonarski_f
e48474e97c
FrameTransformations: Minor adjustments between functions
2023-05-01 18:36:37 +02:00
leonarski_f
a05b59c6a5
CMake: Move CUDA part to main CMake file
2023-05-01 18:16:51 +02:00
leonarski_f
310196d650
CUDA is no longer compulsory
2023-04-27 22:01:55 +02:00
leonarski_f
85c3fb49f9
Merge branch 'broker_parser' into 'main'
...
Updates
See merge request jungfraujoch/nextgendcu!3
2023-04-26 07:24:16 +00:00
leonarski_f
527f85c29d
CMake: Fix
2023-04-26 09:06:44 +02:00
leonarski_f
16bd6836d2
AcquisitionDevice: Rework work request queue
2023-04-26 06:06:09 +02:00
leonarski_f
960e7d1d4e
FPGAAcquisitionDevice: Handle signaling work request done
2023-04-25 21:14:40 +02:00
leonarski_f
6a2cdf1d2b
Move WorkRequest to Completion.h
2023-04-25 19:47:31 +02:00
leonarski_f
bf2a23ef7e
AcquisitionDevice: Completion queue is handled by particular implementation of the device
2023-04-25 15:58:07 +02:00
leonarski_f
f01f2e79d1
AcquisitionDevice: Minor adjustments to handling work requests
2023-04-25 11:24:44 +02:00
leonarski_f
df15755612
AcquisitionDevice: Use work_completion_queue to read start completion message
2023-04-25 10:41:18 +02:00
leonarski_f
de1d7e1c67
HLSSimulatedDevice: refactor to have HLS run as member function
2023-04-25 10:22:44 +02:00
leonarski_f
14a1f6d961
FPGAAcquisitionDevice: Add a level in inheritance to group FPGA related functions for PCIe and HLS simulated devices
2023-04-25 09:55:36 +02:00
leonarski_f
7be02b1ea0
DetectorWrapper: don't use sendSoftwareTrigger() yet
2023-04-24 15:20:09 +02:00
leonarski_f
f14693fe43
HDF5 file writer - per file analysis
2023-04-19 23:09:26 +02:00
leonarski_f
fae3cf5b42
CBORTest: Check content of arrays with/without compression
2023-04-19 22:31:38 +02:00
leonarski_f
37b5d1a169
Move stream2.c/.h to tests => they are not part of the JFJochFrameSerialization lib
2023-04-19 13:36:27 +02:00
leonarski_f
25359f0d60
CBOR: Adjust for DECTRIS stream2 compatibility:
...
* date/time tag
* initial tag self-described CBOR
* series ID
* fixes to typed array header in case of compression
2023-04-19 12:58:29 +02:00
leonarski_f
d2df1b3ce3
CBOR: Add self describing CBOR tag at the beginning
2023-04-19 09:53:25 +02:00
leonarski_f
f471e0925d
CBOR: Add summation to start message
2023-04-19 09:30:14 +02:00
leonarski_f
43489525c6
Frontend: Minor fix to imports
2023-04-18 20:34:51 +02:00
leonarski_f
b6d3eca9e0
Frontend: Add binning function (to be tested)
2023-04-18 16:05:10 +02:00
leonarski_f
9b5228c0bd
Frontend: Adjust plotting and add bkg estimate
2023-04-18 15:37:13 +02:00
leonarski_f
25cb4df0bf
JFJochReceiver: Give one plot at a time
2023-04-18 14:51:51 +02:00
leonarski_f
962edaa4ad
FrameSerializer: hide image data in user_data in CBOR
2023-04-18 13:35:58 +02:00
leonarski_f
001a7d86fc
FPGA: For totally unknown reason making UDP metadata stream narrower results in timing not met
2023-04-17 08:02:24 +02:00
leonarski_f
d25110c825
CMake: add tests to install target
2023-04-15 19:34:58 +02:00
leonarski_f
c792367496
FPGA: Minor clean-up of UDP processing
2023-04-15 19:33:34 +02:00
leonarski_f
dc02d1d5d9
JFCalibrationPerfTest: Fix
2023-04-15 19:31:23 +02:00
leonarski_f
1800538e54
ProtoBuf: AcqusitionDeviceStatistics doesn't include per-image information to reduce message size
2023-04-15 19:29:18 +02:00
leonarski_f
3f87914630
LinuxSocketDevice running + change in Measure() function for better problem avoidance
2023-04-15 19:13:14 +02:00
leonarski_f
f13da91f0e
jfjoch_receiver: Add Linux socket device
2023-04-15 15:38:31 +02:00
leonarski_f
7302d99c8d
MlxRawEthDevice: Set to idle in case of exception
2023-04-15 15:34:08 +02:00
leonarski_f
875adb9701
LinuxSocketDevice: Add basic Linux socket support
2023-04-15 15:33:48 +02:00
leonarski_f
feb5fcacf3
DiffractionExperiment: Refactor IPv4 handling (now it is just base addr for detector IP)
2023-04-15 12:29:14 +02:00
leonarski_f
32baaef1e4
AcquisitionDevice: IPv4 address and UDP destination port is property of the device and not of a particular run
2023-04-15 12:08:01 +02:00
leonarski_f
3319306b50
PCIe driver: dedicated function to set/get IPv4
2023-04-15 11:30:36 +02:00
leonarski_f
653b82d6c3
FPGA + receiver + detector: Use column ID to decode detector half-module number
2023-04-15 11:08:32 +02:00
leonarski_f
56251545b0
Detector wrapper: add setSynchronization
2023-04-15 10:23:30 +02:00
leonarski_f
a8f036da5b
Track bunchID, info, and timestamp from AcquisitionDevice to HDF5DataFile
2023-04-14 14:46:32 +02:00
leonarski_f
637b710899
JFJochFrameSerializer: Add bunch_id and jf_info
2023-04-14 12:40:09 +02:00
leonarski_f
9c300ca451
preview.py: Fix from DECTRIS to improve stability of preview
2023-04-13 21:47:35 +02:00
leonarski_f
96a1b6e50c
Frontend: Added option to select detector
2023-04-13 18:12:19 +02:00
leonarski_f
ae44b2eedf
DiffractionExperiment: Remove indexing period (indexing works at the same pace as spot finding)
2023-04-13 15:30:25 +02:00
leonarski_f
94e6254746
JFJochBroker: More parameters tunable from configuration file, more user friendly, can select detector remotely
2023-04-13 15:09:19 +02:00
leonarski_f
b9fa8f5e0a
JFJochBrokerParser: added more parsers for broker configuration (YAML in the future?)
2023-04-13 14:08:01 +02:00
leonarski_f
89703baa45
DetectorSetup: Added class that describes detector (geometry, calibration, hostname, etc.) => in the future this should be abstract class
2023-04-13 12:55:20 +02:00
leonarski_f
90af364f68
JFJochBrokerParser: Add detector geometry parser
2023-04-13 11:49:47 +02:00
leonarski_f
9508459db0
DiffractionExperiment: Add test for exporting DetectorConfig with/without detector module hostnames
2023-04-13 11:48:51 +02:00
leonarski_f
54fefc50f5
DetectorWrapper: Use sendSoftwareTrigger/setMaster from slsDetectorPackage
2023-04-13 11:05:28 +02:00
leonarski_f
5b112f1ee4
DiffractionExperiment: slsDetectorPackage use string for server version
2023-04-13 11:04:04 +02:00
leonarski_f
ee33e309c3
Update slsDetectorPackage to v. 7.0.1
...
Signed-off-by: Filip Leonarski <filip.leonarski@psi.ch >
2023-04-13 11:00:39 +02:00
leonarski_f
85bcb25af3
DiffractionExperiment: Store detector module hostname
2023-04-13 10:55:20 +02:00
leonarski_f
dbf50d33e9
DiffractionExperiment: Detector Geometry can be modified with a setter function
2023-04-13 10:35:22 +02:00
leonarski_f
4dab54decb
Merge branch 'detector_geometry' into 'main'
...
Detector Geometry customization
See merge request jungfraujoch/nextgendcu!2
2023-04-12 19:22:15 +00:00
leonarski_f
0973f3725d
Detector Geometry customization
2023-04-12 19:22:13 +00:00
leonarski_f
94ba13b3a1
JFJochException: OpenCAPIError -> AcquisitionDeviceError
2023-04-11 17:14:15 +02:00
leonarski_f
5ff2eb321d
Merge branch 'raw_eth' into 'main'
...
Raw Ethernet: working in tests
See merge request jungfraujoch/nextgendcu!1
2023-04-11 14:21:29 +00:00
leonarski_f
c4e70ca038
Raw Ethernet: working in tests
2023-04-11 14:21:28 +00:00
leonarski_f
49cf0dfa01
CMake: Add DL and RT libraries
2023-04-10 22:39:34 +02:00
leonarski_f
de2cfd15dc
CMake: minor fix
2023-04-10 22:25:20 +02:00
leonarski_f
d53e298735
CMake: CUDA is compulsory only for receiver and tests
2023-04-10 22:10:08 +02:00
leonarski_f
85e927367e
HDF5Sum: Fix
2023-04-10 22:09:34 +02:00
leonarski_f
aefe95920c
DataMessage: use it in ZMQImagePuller, StreamWriter, HDF5DataFile, HDF5Writer
2023-04-10 21:33:36 +02:00
leonarski_f
b70382e05a
JFJochFrameSerializer: add indexing_result
2023-04-10 20:43:08 +02:00
leonarski_f
b42af7d10d
JFJochBroker: Get measurement statistics
2023-04-10 20:43:08 +02:00
leonarski_f
6f0d9e70b7
DiffractionExperiment: Simplify Compression()
2023-04-10 17:47:46 +02:00
leonarski_f
d921e64224
Move all image analysis related code to image_analysis/ directory
2023-04-08 23:59:35 +02:00
leonarski_f
d2971bc83b
Remove libtiff dependency + update README.md
2023-04-08 23:40:28 +02:00
leonarski_f
fe620b1411
Add gRPC <-> http gateway
2023-04-08 22:55:45 +02:00
leonarski_f
094d68beea
CMake: Update default gRPC version
2023-04-08 20:32:40 +02:00
leonarski_f
1bb490bfa3
Frontend: Update for Python gRPC <-> http bridge
2023-04-08 20:32:40 +02:00
leonarski_f
53c2e0bb0d
JFJochBroker: Add GetCalibrationStatistics
2023-04-08 19:10:51 +02:00
leonarski_f
762b58e14c
MlxRawEthDevice: Change constructor signature
2023-04-07 18:42:35 +02:00
leonarski_f
f9dd39b5b6
IBWrappers: handle error checksum
2023-04-07 18:38:54 +02:00
leonarski_f
0d9057b497
UDPReceiver: Adapt interface
2023-04-07 18:34:24 +02:00
leonarski_f
14d8414c62
jfjoch_receiver: Integrate MlxRawEthDevice + small clean-up in MlxRawEthDevice
2023-04-07 18:34:24 +02:00
leonarski_f
8b65feca8f
Clean-up: merge JFJOCH_USE_NUMA_H and JFJOCH_USE_NUMA, remove two unnecessary helper programs
2023-04-07 16:30:08 +02:00
leonarski_f
0c31fda381
jfjoch_action_test: refactor to remove MakeAcquisitionDevice
2023-04-07 14:14:06 +02:00
leonarski_f
980c8de136
IBReceiver: Work in progress
2023-04-07 14:12:53 +02:00
leonarski_f
940764ff2f
IBVerbs is optional
2023-04-07 13:28:09 +02:00
leonarski_f
bffaa17bcd
ProcessJFPacket: Doesn't include JF conversion
2023-04-07 13:21:06 +02:00
leonarski_f
2c9d97c198
JFCalibrationPerfTest: More fine-grained locking
2023-04-07 11:20:19 +02:00
leonarski_f
f7e23e963f
JFCalibrationPerfTest: Add packet processing test
2023-04-07 10:51:45 +02:00
leonarski_f
56b4f98165
ProcessJFPacket: Fix locking
2023-04-07 10:51:28 +02:00
leonarski_f
f44cb55252
jf_packet.h: renamed, moved to jungfrau/, and slightly refactored
2023-04-07 10:00:07 +02:00
leonarski_f
32f9bb4973
JFCalibrationTest: Moved back to tests/ folder
2023-04-07 09:49:42 +02:00
leonarski_f
2714dae562
ProcessJFPacket: Moved to jungfrau/, so it is accessible without IB verbs and other dependencies
2023-04-07 09:49:00 +02:00
leonarski_f
6f82d3a75a
IBReceiver: Fixes to ARP header
2023-04-06 21:25:32 +02:00
leonarski_f
8fea8bac3b
IBReceiver: Pin to NUMA node
2023-04-06 20:58:25 +02:00
leonarski_f
428beaa75b
IBReceiver/UDPReceiver: Work in progress -> early multithreading suppoer
2023-04-06 20:51:44 +02:00
leonarski_f
7cf160e7a9
ProcessJFPacket: Add atomic counter
2023-04-06 20:18:28 +02:00
leonarski_f
21bebb1623
ProcessJFPacket: Can handle multiple modules for conversion
2023-04-06 20:07:37 +02:00
leonarski_f
68e6077e73
ProcessJFPacket: Add shared_/unique_lock
2023-04-06 19:59:58 +02:00
leonarski_f
2c401945b6
IBReceiver: work in progress
2023-04-06 19:59:40 +02:00
leonarski_f
4e8992802b
UdpReceiver: work in progress
2023-04-06 18:32:08 +02:00
leonarski_f
d9fcffcdc0
RawEthernet: Work in progress
2023-04-06 16:16:46 +02:00
leonarski_f
a8c76d212a
DiffractionExperiment: UDP port is specific to acquisition device
2023-04-06 14:15:12 +02:00
leonarski_f
68923ca376
ProcessRawPacket: Refactor, so it can be used also for standard (Linux kernel) UDP stack
2023-04-06 14:10:27 +02:00
leonarski_f
61c1a3630c
gRPC: Change field name to ipv4_subnet
2023-04-06 12:28:02 +02:00
leonarski_f
1757d42182
Initial commit
...
Signed-off-by: Filip Leonarski <filip.leonarski@psi.ch >
2023-04-06 11:17:59 +02:00
leonarski_f
Leonarski Filip