Commit Graph

943 Commits

Author SHA1 Message Date
39faa49d86 DiffractionExperiment: Remove potential bug with control reaching function without returning value 2025-06-29 13:05:03 +02:00
7d7dbbcf79 Merge branch '2506-1.0.0-rc.54' into 'main'
1.0.0-rc.54

See merge request jungfraujoch/nextgendcu!140
1.0.0-rc.54
2025-06-29 10:56:38 +02:00
99de57fe6f 1.0.0-rc.54 2025-06-29 10:56:38 +02:00
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
c41858f80d v1.0.0-rc.53 2025-06-24 16:43:47 +02:00
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
1d256b2cf5 v1.0.0-rc.52 2025-06-23 20:57:00 +02:00
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
f40d178545 Bug fix for plotting 2025-06-22 17:24:37 +02:00
7184fa5b5a Merge branch '2506-spot-filters' into 'main'
v1.0.0-rc.51

See merge request jungfraujoch/nextgendcu!136
1.0.0-rc.51
2025-06-22 13:15:10 +02:00
50eaaaaf29 v1.0.0-rc.51 2025-06-22 13:15:10 +02:00
aa13b1cd0b Merge branch '2506-test-bug' into 'main'
v1.0.0-rc.50

See merge request jungfraujoch/nextgendcu!135
1.0.0-rc.50
2025-06-20 09:52:26 +02:00
0d1b388f4d v1.0.0-rc.50 2025-06-20 09:52:26 +02:00
2bd9f4a424 Merge branch '2506-ring-current' into 'main'
v1.0.0-rc49

See merge request jungfraujoch/nextgendcu!134
1.0.0-rc.49
2025-06-18 15:19:18 +02:00
fb87f376c8 v1.0.0-rc49 2025-06-18 15:19:18 +02:00
c464c00906 Merge branch '2506-uc-bug' into 'main'
VERSION to 1.0.0-rc.48

See merge request jungfraujoch/nextgendcu!133
1.0.0-rc.48
2025-06-17 19:29:44 +02:00
259e17e483 VERSION to 1.0.0-rc.48 2025-06-17 17:20:43 +02:00
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
8e449fc581 v1.0.0-rc.47 2025-06-17 16:28:28 +02:00
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
9b8f7a7f88 v1.0.0-rc.46 2025-06-17 14:56:48 +02:00
7d0f783767 Merge branch '2506-missing-commit' into 'main'
v1.0.0-rc.45: missing commits

See merge request jungfraujoch/nextgendcu!130
1.0.0-rc.45
2025-06-16 14:10:37 +02:00
07b78f846c v1.0.0-rc.45: missing commits 2025-06-16 14:10:36 +02:00
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
ab5f502c8e v1.0.0-rc.45 2025-06-16 12:48:17 +02:00
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