Commit Graph

1084 Commits

Author SHA1 Message Date
leonarski_f 8d51bfd97d jfjoch_viewer: Add ROI to calibration window (doesn't work very well, but as an experimental feature why not) 2025-11-06 16:18:19 +01:00
leonarski_f ff4103fcc5 jfjoch_viewer: Add calibration viewer (WIP) 2025-11-06 16:11:33 +01:00
leonarski_f 003e2f0a8e jfjoch_viewer: Add calibration viewer 2025-11-06 16:01:37 +01:00
leonarski_f 4be250a489 JFJochHDF5Reader: Add ReadCalibration() function
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m51s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m59s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m10s
Build Packages / Generate python client (push) Successful in 30s
Build Packages / Build documentation (push) Successful in 53s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 13m14s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m17s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m24s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m52s
Build Packages / build:rpm (rocky9) (push) Successful in 13m56s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m56s
Build Packages / Unit tests (push) Successful in 52m29s
2025-11-06 12:07:03 +01:00
leonarski_f 9fe57e4053 JFJochHDF5Reader: Read calibration entries 2025-11-06 11:58:33 +01:00
leonarski_f c19803ad69 jfjoch_viewer: Split toolbar into two (image and display), allow to change background (not perfect, but...) 2025-11-06 11:31:44 +01:00
leonarski_f 9235d1d4bc jfjoch_viewer: Slightly increase precision of resolution of powder rings (4 digits) 2025-11-06 11:02:14 +01:00
leonarski_f 5cbd015924 jfjoch_viewer: Add button to show calibrant powder rings 2025-11-06 11:00:37 +01:00
leonarski_f ec391e21dd jfjoch_viewer: Show 15 rings for calibrant 2025-11-06 10:51:53 +01:00
leonarski_f 35dcbd1971 jfjoch_viewer: Don't show diffraction rings entirely outside of the detector 2025-11-06 10:49:54 +01:00
leonarski_f 2b372ba794 jfjoch_viewer: Clean-up user interface (let's follow if it is not too crowded) 2025-11-06 10:44:00 +01:00
leonarski_f 76d4e04b90 Redo
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m48s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m28s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m45s
Build Packages / Generate python client (push) Successful in 15s
Build Packages / build:rpm (rocky8) (push) Successful in 13m4s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m4s
Build Packages / Build documentation (push) Successful in 35s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m16s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m38s
Build Packages / build:rpm (rocky9) (push) Successful in 13m52s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m48s
Build Packages / Unit tests (push) Successful in 53m26s
2025-11-05 21:05:09 +01:00
leonarski_f b90ad03565 PixelMask: Missed LoadMask()
Build Packages / build:rpm (rocky8) (push) Failing after 3m8s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m29s
Build Packages / Generate python client (push) Successful in 33s
Build Packages / Build documentation (push) Successful in 56s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m8s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m15s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m40s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m37s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m11s
Build Packages / build:rpm (rocky9) (push) Successful in 13m41s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m49s
Build Packages / Unit tests (push) Successful in 52m35s
2025-11-05 19:36:37 +01:00
leonarski_f b2e4a8ec94 Fix Qt include
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m7s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m23s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m31s
Build Packages / Generate python client (push) Successful in 15s
Build Packages / build:rpm (rocky8) (push) Successful in 12m54s
Build Packages / Create release (push) Has been skipped
Build Packages / Build documentation (push) Successful in 33s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m2s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m2s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m22s
Build Packages / build:rpm (rocky9) (push) Successful in 14m17s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m15s
Build Packages / Unit tests (push) Failing after 53m58s
2025-11-05 15:41:02 +01:00
leonarski_f 4ff464e5d4 jfjoch_viewer: Some placement improvement
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 11m47s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 12m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 12m8s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 12m28s
Build Packages / Generate python client (push) Successful in 24s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9) (push) Failing after 12m36s
Build Packages / build:rpm (rocky8) (push) Failing after 12m38s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 12m44s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 12m50s
Build Packages / Build documentation (push) Successful in 46s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 6m40s
Build Packages / Unit tests (push) Has been cancelled
2025-11-05 15:20:49 +01:00
leonarski_f f5bde00175 jfjoch_viewer: Adjustments to the code
Build Packages / build:rpm (ubuntu2404) (push) Has been cancelled
Build Packages / Generate python client (push) Has been cancelled
Build Packages / Build documentation (push) Has been cancelled
Build Packages / Unit tests (push) Has been cancelled
Build Packages / Create release (push) Has been cancelled
Build Packages / build:rpm (rocky8) (push) Has started running
Build Packages / build:rpm (ubuntu2204) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2404_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 (ubuntu2204_nocuda) (push) Has been cancelled
Build Packages / build:rpm (rocky8_nocuda) (push) Has been cancelled
Build Packages / build:rpm (rocky9_nocuda) (push) Has been cancelled
2025-11-05 15:10:53 +01:00
leonarski_f 44cfbdd8b4 PixelMask: Don't cache statistics, only calc when needed + add extra categories 2025-11-05 14:56:48 +01:00
leonarski_f 1f97131d45 jfjoch_viewer: Add more mask functionality 2025-11-05 14:38:48 +01:00
leonarski_f d793520d39 jfjoch_viewer: Remove right click menu for JFJochViewerImage 2025-11-05 13:49:28 +01:00
leonarski_f f049d558ec ROIElement: Remove toString() 2025-11-05 13:48:00 +01:00
leonarski_f 1e255a3ada jfjoch_viewer: ROI can be configured more flexibly 2025-11-05 13:45:55 +01:00
leonarski_f a0840f860d jfjoch_viewer: ROI panel (work in progress) 2025-11-05 12:54:01 +01:00
leonarski_f 78d4f21d4b jfjoch_viewer: Extra panel for ROI (tbd) 2025-11-05 11:58:20 +01:00
leonarski_f b15d06c1b0 JFJochReaderImage: Add ROI description 2025-11-05 11:47:12 +01:00
leonarski_f 02b3e66456 ROIElement: toString() function 2025-11-05 11:44:59 +01:00
leonarski_f c87d0656f4 Frontend: Fix vite version due to vulnerability
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m41s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m22s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m42s
Build Packages / build:rpm (rocky8) (push) Successful in 12m59s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m56s
Build Packages / Create release (push) Has been skipped
Build Packages / Build documentation (push) Successful in 34s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m11s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m24s
Build Packages / build:rpm (rocky9) (push) Successful in 13m50s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m58s
Build Packages / Unit tests (push) Successful in 54m5s
2025-11-05 10:50:22 +01:00
leonarski_f ae0d18e3dd VERSION: 1.0.0-rc.97 2025-11-05 10:49:18 +01:00
leonarski_f 492fdca83b Documentation update for dark mask 2025-11-05 10:46:44 +01:00
leonarski_f 213cac7765 OpenAPI: Dark mask settings can be configured through the API 2025-11-05 10:44:25 +01:00
leonarski_f 543e319d52 DiffractionExperiment: Dark mask settings are separate from detector settings (not sure still what is the best solution...) 2025-11-05 10:14:52 +01:00
leonarski_f 1dfe08a141 JFJochStateMachine: Implement improved calibration routines (to be field tested) 2025-11-05 10:06:24 +01:00
leonarski_f 96de9e41ea JFJochServices: Take calibration as pointer (it can be nullptr) 2025-11-05 09:16:00 +01:00
leonarski_f 74a55d8bc9 DectrisSimplonClient: counting_mode retrigger for standard, normal for dark mask data taking
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m26s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m40s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m50s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m53s
Build Packages / Generate python client (push) Successful in 17s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m57s
Build Packages / build:rpm (rocky8) (push) Successful in 13m5s
Build Packages / Build documentation (push) Successful in 29s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m30s
Build Packages / build:rpm (rocky9) (push) Successful in 13m53s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m58s
Build Packages / Unit tests (push) Successful in 53m11s
2025-11-05 07:55:56 +01:00
leonarski_f 4c9ce8a420 JFJochStateMachine: Slowly implement dark mask data taking into the workflow 2025-11-05 07:51:03 +01:00
leonarski_f 39cb3907bd JFJochReceiverLite: Dark mask analysis integrated and tested 2025-11-05 07:41:59 +01:00
leonarski_f 2fb98a700a JFJochReceiverLite: Fix wrong include 2025-11-05 07:09:44 +01:00
leonarski_f a6020c00ca JFJochReceiverLite: Implement dark mask analysis (experimental, not tested)
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 6m33s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 6m55s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 7m12s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 7m13s
Build Packages / Generate python client (push) Successful in 27s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 7m29s
Build Packages / build:rpm (rocky8) (push) Failing after 7m26s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 7m34s
Build Packages / build:rpm (rocky9) (push) Failing after 7m43s
Build Packages / Build documentation (push) Successful in 43s
Build Packages / Unit tests (push) Failing after 2m45s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 4m48s
2025-11-05 06:50:34 +01:00
leonarski_f 8309643b95 MaskDarkAnalysis: Change GetMask() function 2025-11-05 06:36:06 +01:00
leonarski_f 624158f412 DiffractionExperiment: Improve DarkMask mode behavior 2025-11-05 06:32:38 +01:00
leonarski_f b219ce4489 DarkMaskSettings: Add
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m50s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m58s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m45s
Build Packages / Build documentation (push) Successful in 40s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m3s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m10s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m26s
Build Packages / build:rpm (rocky8) (push) Successful in 13m18s
Build Packages / build:rpm (rocky9) (push) Successful in 13m47s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m59s
Build Packages / Unit tests (push) Successful in 52m47s
2025-11-04 21:29:14 +01:00
leonarski_f 5431f9cefb DiffractionExperiment: Remove DetectorMode::Raw 2025-11-04 20:52:36 +01:00
leonarski_f 3096454e7d DiffractionExperiment: Add DarkMask setting to DetectorMode enum
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m16s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m27s
Build Packages / Generate python client (push) Successful in 17s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m57s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m10s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 13m16s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m19s
Build Packages / Build documentation (push) Successful in 40s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m43s
Build Packages / build:rpm (rocky9) (push) Successful in 13m53s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m39s
Build Packages / Unit tests (push) Successful in 53m44s
2025-11-04 17:01:11 +01:00
leonarski_f 84f1ca2dcd MaskDarkAnalysis: Add 2025-11-04 16:39:33 +01:00
leonarski_f 5667a9ee65 PixelMask: Add option to include DECTRIS pixel mask and load additional mask from dark measurement 2025-11-04 16:29:31 +01:00
leonarski_f 8b356a7001 v1.0.0-rc.96 (#1)
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m47s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 7m20s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 8m13s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 7m10s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 7m53s
Build Packages / build:rpm (rocky8) (push) Successful in 7m57s
Build Packages / Generate python client (push) Successful in 13s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 7m39s
Build Packages / Create release (push) Has been skipped
Build Packages / Build documentation (push) Successful in 36s
Build Packages / build:rpm (rocky9) (push) Successful in 9m0s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m55s
Build Packages / Unit tests (push) Successful in 1h10m44s
This is an UNSTABLE release.

* Fixes in CI pipeline
* jfjoch_broker: Remove PNG preview, no dependency on libpng
* jfjoch_writer: Fix UTC timestamp being generated wrong (mix between milli- and microseconds)
* jfjoch_viewer: Show data collection time in dataset tooltip
* jfjoch_viewer: Allow to choose the calibrant (presets for LaB6 and silver behenate)
* jfjoch_viewer: Auto foreground value
* Use external libjpeg-turbo and libtiff: simpler build stack, these are built and linked statically in automated Docker builds
* Remove OpenBLAS dependency

Reviewed-on: #1
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
1.0.0-rc.96
2025-11-02 13:45:57 +01:00
leonarski_f effe97a970 Merge branch '2510-fix-docker' into 'main'
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m32s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m26s
Build Packages / build:rpm (rocky8) (push) Successful in 12m11s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m37s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m51s
Build Packages / Unit tests (push) Has been skipped
Build Packages / Create release (push) Has been skipped
Build Packages / Generate python client (push) Successful in 28s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m23s
Build Packages / Build documentation (push) Successful in 47s
Build Packages / build:rpm (rocky9) (push) Successful in 10m7s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m48s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 7m18s
v1.0.0-rc.95

See merge request jungfraujoch/nextgendcu!184
1.0.0-rc.95
2025-10-28 16:44:05 +01:00
leonarski_f 189f84be53 v1.0.0-rc.95 2025-10-28 16:44:04 +01:00
leonarski_f dba07eae26 Merge branch '2510-viewer-3D' into 'main'
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 25m46s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 26m45s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 26m57s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / Unit tests (push) Has been skipped
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 27m21s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 27m27s
Build Packages / Build documentation (push) Successful in 38s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 27m29s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 28m4s
Build Packages / build:rpm (rocky9) (push) Successful in 28m9s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m48s
v1.0.0-rc.94

See merge request jungfraujoch/nextgendcu!183
1.0.0-rc.94
2025-10-25 22:05:47 +02:00
leonarski_f b2abb0f92b v1.0.0-rc.94 2025-10-25 22:05:47 +02:00
leonarski_f 58144995e0 Merge branch '2510-fix-CI' into 'main'
Build Packages / build:rpm (rocky8_nocuda) (push) Has been cancelled
Build Packages / build:rpm (rocky9_nocuda) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Has been cancelled
Build Packages / build:rpm (rocky8_sls9) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2404) (push) Has been cancelled
Build Packages / Generate python client (push) Has been cancelled
Build Packages / Build documentation (push) Has been cancelled
Build Packages / Unit tests (push) Has been cancelled
Build Packages / build:rpm (rocky8) (push) Has been cancelled
Build Packages / build:rpm (rocky9) (push) Has been cancelled
Build Packages / build:rpm (ubuntu2204) (push) Has been cancelled
Build Packages / Create release (push) Has been cancelled
v1.0.0-rc.93

See merge request jungfraujoch/nextgendcu!182
2025-10-23 15:48:46 +02:00