Commit Graph

918 Commits

Author SHA1 Message Date
da4d8868b3 Merge branch '2506-grid-scan-result' into 'main'
v1.0.0-rc.44

See merge request jungfraujoch/nextgendcu!128
1.0.0-rc.44
2025-06-15 17:46:46 +02:00
b59a03ff02 v1.0.0-rc.44 2025-06-15 17:46:46 +02:00
50fd15c678 Merge branch '2506-raster-scan-result' into 'main'
v1.0.0-rc.43

See merge request jungfraujoch/nextgendcu!127
1.0.0-rc.43
2025-06-13 16:00:50 +02:00
80251cc5b8 v1.0.0-rc.43 2025-06-13 16:00:50 +02:00
32c9e6926e Merge branch '2506-Isigma' into 'main'
v1.0.0-rc.42

See merge request jungfraujoch/nextgendcu!126
1.0.0-rc.42
2025-06-11 19:53:33 +02:00
a9c7d23b9e v1.0.0-rc.42 2025-06-11 19:53:33 +02:00
dc90b05512 Merge branch '2506-Bragg-prediction' into 'main'
v1.0.0-rc.41

See merge request jungfraujoch/nextgendcu!125
1.0.0-rc.41
2025-06-10 18:14:04 +02:00
41a3e671f4 v1.0.0-rc.41 2025-06-10 18:14:04 +02:00
72cdbd04a5 Merge branch '2405-grid-scan' into 'main'
v1.0.0-rc.40

See merge request jungfraujoch/nextgendcu!124
1.0.0-rc.40
2025-05-28 18:49:27 +02:00
53c90ee5d8 v1.0.0-rc.40 2025-05-28 18:49:27 +02:00
aaae74e70b Merge branch '2505-fpga-sum-analysis' into 'main'
v1.0.0-rc.39

See merge request jungfraujoch/nextgendcu!123
1.0.0-rc.39
2025-05-14 23:28:10 +02:00
18b50e9472 v1.0.0-rc.39 2025-05-14 23:28:10 +02:00
01877ffe60 Merge branch '2505-resonet-python' into 'main'
v1.0.0-rc.38

See merge request jungfraujoch/nextgendcu!122
1.0.0-rc.38
2025-05-12 14:17:24 +02:00
b245967df3 v1.0.0-rc.38 2025-05-12 14:17:24 +02:00
19d6f22136 Merge branch '2405-eiger-mask' into 'main'
patch to 1.0.0-rc.36

See merge request jungfraujoch/nextgendcu!121
1.0.0-rc.37
2025-05-07 16:24:35 +02:00
29ecd3515a patch to 1.0.0-rc.36 2025-05-07 16:24:35 +02:00
2533499acc Merge branch 'jfjoch_lite' into 'main'
v1.0.0-rc.36

See merge request jungfraujoch/nextgendcu!120
1.0.0-rc.36
2025-05-05 19:32:23 +02:00
040cf08386 v1.0.0-rc.36 2025-05-05 19:32:22 +02:00
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
b3898b1915 jfjoch_tests: Add test for missing modules with data acquistion continuing 2025-04-23 17:22:11 +02:00
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
5c1650e71b jfjoch_broker: acquisition device handles ignored if module is falling behind 2025-04-23 15:13:13 +02:00
ec69e1ac95 Merge branch '2504-writer-mod' into 'main'
v1.0.0-rc.35

See merge request jungfraujoch/nextgendcu!117
1.0.0-rc.35
2025-04-22 14:42:15 +02:00
9bec33290c v1.0.0-rc.35 2025-04-22 14:42:14 +02:00
2a1807f4bd Merge branch '2503-post-maxiv' into 'main'
v1.0.0-rc.34

See merge request jungfraujoch/nextgendcu!116
1.0.0-rc.34
2025-04-14 11:52:06 +02:00
b0607ab3ca v1.0.0-rc.34 2025-04-14 11:52:06 +02:00
708b5fbc4b Merge branch '2503-eiger-trim-fix' into 'main'
v1.0.0-rc.32

See merge request jungfraujoch/nextgendcu!115
1.0.0-rc.33
2025-03-24 18:08:05 +01:00
3f6be4c7a0 v1.0.0-rc.32 2025-03-24 18:08:05 +01:00
118e2f7992 Merge branch '2503-1.0.0-rc.32-2' into 'main'
v.1.0.0-rc.32

See merge request jungfraujoch/nextgendcu!114
1.0.0-rc.32
2025-03-24 12:16:33 +01:00
a30707964d v.1.0.0-rc.32 2025-03-24 12:16:33 +01:00
19be3575f0 Merge branch '2502-release-script' into 'main'
Update FPGA version in the upload script

See merge request jungfraujoch/nextgendcu!113
1.0.0-rc.31
2025-03-02 14:15:49 +01:00
d7b586452a Update FPGA version in the upload script 2025-03-02 14:15:11 +01:00
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
ddf4c75645 v1.0.0-rc.31 2025-03-02 13:15:28 +01:00
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
2fec68d3b9 DiffractionExperiment: Fix error in pedestal G1/G2 count time 2025-02-14 10:21:38 +01:00
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
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
f1e04d7d56 Merge branch '2412-writer' into 'main'
version 1.0.0-rc.30

See merge request jungfraujoch/nextgendcu!108
1.0.0-rc.30
2024-12-09 20:34:58 +01:00
d5d7072a9f version 1.0.0-rc.30 2024-12-09 20:34:58 +01:00
483c12ca86 Merge branch '2412-warning-lost-frames' into 'main'
version 1.0.0-rc.29

See merge request jungfraujoch/nextgendcu!107
1.0.0-rc.29
2024-12-08 13:26:13 +01:00
7564619574 version 1.0.0-rc.29 2024-12-08 13:26:13 +01:00
6ec126d65a Merge branch '2412-1.0.0-rc.28' into 'main'
version 1.0.0-rc.28

See merge request jungfraujoch/nextgendcu!106
1.0.0-rc.28
2024-12-05 16:41:04 +01:00
e5a775b4a3 version 1.0.0-rc.28 2024-12-05 16:41:04 +01:00
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
89a77ceec7 version 1.0.0-rc.27 minor fixes 2024-12-04 20:58:51 +01:00
762bb1b9c0 Merge branch '2412-fix-one-test' into 'main'
version 1.0.0-rc.27 quick fix

See merge request jungfraujoch/nextgendcu!104
1.0.0-rc.27
2024-12-03 09:27:54 +01:00
ed89fe2619 jfjoch_test: ZMQImageCommTest_NoWriter could potentially contain values that cannot be represented by CBOR 2024-12-03 08:57:56 +01:00
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
71290f374a version 1.0.0-rc.27 2024-12-02 21:17:14 +01:00