From 54c0100e8ed0097987b0badc52f2d42c18c68709 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Sat, 11 Jul 2026 07:19:11 +0200 Subject: [PATCH] v1.0.0-rc.157 (#67) This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * rugnux: Rebrand the offline data-processing subsystem as `rugnux` and consolidate all offline analysis into the single `rugnux` binary - `jfjoch_process` is now `rugnux`, the former `jfjoch_azint` is now `rugnux --azint-only`, and `jfjoch_scale` is now `rugnux --scale` (see the new docs/NAMING.md and docs/RUGNUX.md). Scaling and merging are on by default for rotation and stills (`--no-merge` disables them), replacing the previous opt-in `-M, --scale-merge`. * rugnux: CLI fixes - default `-N` to all hardware threads, parse numeric option arguments strictly (reject non-numeric or trailing input instead of silently yielding 0), require `--wavelength > 0`, and correct the reproduced command line and `--scale` reference-cell handling. * rugnux: De-novo space-group improvements - recover genuine high symmetry and centred Bravais lattices from intensities, add an automatic CC1/2 high-resolution cutoff, and report L-test twinning statistics. * rugnux: Index weakly-diffracting low-resolution rotation data that previously failed (e.g. F-cubic crystals that diffract only to ~4 A on a detector reaching ~1.5 A). The per-frame indexing gate now measures the indexed fraction only within the resolution range the lattice actually diffracts to, so the many sub-diffraction ice/noise spots no longer make the fraction floor unreachable; the two-pass first pass tries several image-sampling schemes (spread across the whole rotation vs a consecutive wedge whose native stride keeps a reflection's rocking curve continuous, letting the FFT resolve a long axis) and keeps the one that indexes the most frames; and the de-novo space-group search no longer discards all reflections (and crashes) when every resolution shell falls below = 1. * rugnux: Lower the low-resolution R-meas for strongly-diffracting rotation data - drop edge-of-sweep truncated fulls whose rocking curve was captured below `--min-captured-fraction` (default 0.7 for rotation), and report R-meas only over the observations kept by outlier rejection (matching XDS). The 0.7 default also strips the partiality-extrapolated fulls that dominate the intensity second moment on weakly-diffracting crystals, so the de-novo space-group search is no longer starved by the error-model I/sigma floor and recovers the correct symmetry (e.g. the F-cubic Benas crystals: Benas_3 -> F432, Benas_7 -> P6122, instead of P4/P1); on the reference battery every other crystal keeps its space group. * rugnux: Write the refined geometry (beam, tilt, axis) to _process.h5 and place non-standard mmCIF items under a reserved `jfjoch` prefix. * jfjoch_broker: Ordinary acquisition failures (receiver/writer/analysis problems, missed packets, writer disconnect) now return to the Idle state with an Error-severity message, so a run can be retried without an expensive re-initialisation; only failures that leave the detector in an undefined state (new JFJochCriticalException, e.g. PCIe/FPGA faults) go to the Error state and force re-initialisation. * jfjoch_broker: A synchronous /start now reports its failure to the HTTP caller instead of returning HTTP 200, and an incomplete or truncated dataset (missing packets, writer disconnect) is reported as an error rather than a "reduce frame rate" warning. * jfjoch_broker: Drop uncollected placeholder rows (number = -1) from the scan_result REST endpoint. * jfjoch_broker: Fix the inverted per-image compression ratio reported by the Lite receiver (was compressed/uncompressed instead of uncompressed/compressed). * jfjoch_broker: Bragg integration adds a quantization-noise variance floor with a box-sum fallback, and treats the type-maximum marker as an invalid pixel for unsigned image types. * jfjoch_writer: Detect file-overwrite conflicts at start for back-channel transports, and reset the writer when end-of-collection finalisation fails. * jfjoch_viewer: Preview overlays follow the geometry (resolution/ROI arcs, true beam centre, predictions, coral secondary-lattice spots, legend), add save-as-JPEG, and fix an HTTP live-follow memory leak. * Frontend: Improved aesthetics and usability, and added in-browser pixel-mask and JUNGFRAU-pedestal visualisation. * CI: Name the Windows installer jfjoch-viewer-* instead of jfjoch-*.Reviewed-on: https://gitea.psi.ch/mx/Jungfraujoch/pulls/67 Co-authored-by: Filip Leonarski --- .gitea/workflows/build_and_test.yml | 6 +- CLAUDE.md | 9 +- CMakeLists.txt | 10 +- VERSION | 2 +- broker/JFJochBrokerHttp.cpp | 17 +- broker/JFJochBrokerHttp.h | 1 + broker/JFJochServices.cpp | 75 ++- broker/JFJochStateMachine.cpp | 54 +- broker/JFJochStateMachine.h | 3 + broker/gen/model/Azim_int_settings.cpp | 2 +- broker/gen/model/Azim_int_settings.h | 2 +- .../gen/model/Bragg_integration_settings.cpp | 2 +- broker/gen/model/Bragg_integration_settings.h | 2 +- broker/gen/model/Broker_status.cpp | 2 +- broker/gen/model/Broker_status.h | 2 +- .../model/Calibration_statistics_inner.cpp | 2 +- .../gen/model/Calibration_statistics_inner.h | 2 +- broker/gen/model/Dark_mask_settings.cpp | 2 +- broker/gen/model/Dark_mask_settings.h | 2 +- broker/gen/model/Dataset_settings.cpp | 2 +- broker/gen/model/Dataset_settings.h | 2 +- broker/gen/model/Dataset_settings_smargon.cpp | 2 +- broker/gen/model/Dataset_settings_smargon.h | 2 +- ...et_settings_xray_fluorescence_spectrum.cpp | 2 +- ...aset_settings_xray_fluorescence_spectrum.h | 2 +- broker/gen/model/Detector.cpp | 2 +- broker/gen/model/Detector.h | 2 +- broker/gen/model/Detector_list.cpp | 2 +- broker/gen/model/Detector_list.h | 2 +- broker/gen/model/Detector_list_element.cpp | 2 +- broker/gen/model/Detector_list_element.h | 2 +- broker/gen/model/Detector_module.cpp | 2 +- broker/gen/model/Detector_module.h | 2 +- .../gen/model/Detector_module_direction.cpp | 2 +- broker/gen/model/Detector_module_direction.h | 2 +- broker/gen/model/Detector_power_state.cpp | 2 +- broker/gen/model/Detector_power_state.h | 2 +- broker/gen/model/Detector_selection.cpp | 2 +- broker/gen/model/Detector_selection.h | 2 +- broker/gen/model/Detector_settings.cpp | 2 +- broker/gen/model/Detector_settings.h | 2 +- broker/gen/model/Detector_state.cpp | 2 +- broker/gen/model/Detector_state.h | 2 +- broker/gen/model/Detector_status.cpp | 2 +- broker/gen/model/Detector_status.h | 2 +- broker/gen/model/Detector_timing.cpp | 2 +- broker/gen/model/Detector_timing.h | 2 +- broker/gen/model/Detector_type.cpp | 2 +- broker/gen/model/Detector_type.h | 2 +- broker/gen/model/Error_message.cpp | 2 +- broker/gen/model/Error_message.h | 2 +- broker/gen/model/File_writer_format.cpp | 2 +- broker/gen/model/File_writer_format.h | 2 +- broker/gen/model/File_writer_settings.cpp | 2 +- broker/gen/model/File_writer_settings.h | 2 +- broker/gen/model/Fpga_status_inner.cpp | 2 +- broker/gen/model/Fpga_status_inner.h | 2 +- .../gen/model/Geom_refinement_algorithm.cpp | 2 +- broker/gen/model/Geom_refinement_algorithm.h | 2 +- broker/gen/model/Grid_scan.cpp | 2 +- broker/gen/model/Grid_scan.h | 2 +- broker/gen/model/Helpers.cpp | 2 +- broker/gen/model/Helpers.h | 2 +- broker/gen/model/Image_buffer_status.cpp | 2 +- broker/gen/model/Image_buffer_status.h | 2 +- broker/gen/model/Image_format_settings.cpp | 2 +- broker/gen/model/Image_format_settings.h | 2 +- broker/gen/model/Image_pusher_status.cpp | 2 +- broker/gen/model/Image_pusher_status.h | 2 +- broker/gen/model/Image_pusher_type.cpp | 2 +- broker/gen/model/Image_pusher_type.h | 2 +- broker/gen/model/Indexing_algorithm.cpp | 2 +- broker/gen/model/Indexing_algorithm.h | 2 +- broker/gen/model/Indexing_settings.cpp | 2 +- broker/gen/model/Indexing_settings.h | 2 +- broker/gen/model/Instrument_metadata.cpp | 2 +- broker/gen/model/Instrument_metadata.h | 2 +- broker/gen/model/Integration_model.cpp | 2 +- broker/gen/model/Integration_model.h | 2 +- broker/gen/model/Jfjoch_settings.cpp | 2 +- broker/gen/model/Jfjoch_settings.h | 2 +- broker/gen/model/Jfjoch_statistics.cpp | 2 +- broker/gen/model/Jfjoch_statistics.h | 2 +- broker/gen/model/Measurement_statistics.cpp | 2 +- broker/gen/model/Measurement_statistics.h | 2 +- broker/gen/model/Pcie_devices_inner.cpp | 2 +- broker/gen/model/Pcie_devices_inner.h | 2 +- broker/gen/model/Pixel_mask_statistics.cpp | 2 +- broker/gen/model/Pixel_mask_statistics.h | 2 +- broker/gen/model/Plot.cpp | 2 +- broker/gen/model/Plot.h | 2 +- broker/gen/model/Plot_unit_x.cpp | 2 +- broker/gen/model/Plot_unit_x.h | 2 +- broker/gen/model/Plots.cpp | 2 +- broker/gen/model/Plots.h | 2 +- broker/gen/model/Roi_azim_list.cpp | 2 +- broker/gen/model/Roi_azim_list.h | 2 +- broker/gen/model/Roi_azimuthal.cpp | 2 +- broker/gen/model/Roi_azimuthal.h | 2 +- broker/gen/model/Roi_box.cpp | 2 +- broker/gen/model/Roi_box.h | 2 +- broker/gen/model/Roi_box_list.cpp | 2 +- broker/gen/model/Roi_box_list.h | 2 +- broker/gen/model/Roi_circle.cpp | 2 +- broker/gen/model/Roi_circle.h | 2 +- broker/gen/model/Roi_circle_list.cpp | 2 +- broker/gen/model/Roi_circle_list.h | 2 +- broker/gen/model/Roi_definitions.cpp | 2 +- broker/gen/model/Roi_definitions.h | 2 +- broker/gen/model/Rotation_axis.cpp | 2 +- broker/gen/model/Rotation_axis.h | 2 +- broker/gen/model/Scan_result.cpp | 2 +- broker/gen/model/Scan_result.h | 2 +- broker/gen/model/Scan_result_images_inner.cpp | 2 +- broker/gen/model/Scan_result_images_inner.h | 2 +- broker/gen/model/Spot_finding_settings.cpp | 2 +- broker/gen/model/Spot_finding_settings.h | 2 +- .../gen/model/Standard_detector_geometry.cpp | 2 +- broker/gen/model/Standard_detector_geometry.h | 2 +- broker/gen/model/Tcp_settings.cpp | 2 +- broker/gen/model/Tcp_settings.h | 2 +- broker/gen/model/Unit_cell.cpp | 2 +- broker/gen/model/Unit_cell.h | 2 +- broker/gen/model/Zeromq_metadata_settings.cpp | 2 +- broker/gen/model/Zeromq_metadata_settings.h | 2 +- broker/gen/model/Zeromq_preview_settings.cpp | 2 +- broker/gen/model/Zeromq_preview_settings.h | 2 +- broker/gen/model/Zeromq_settings.cpp | 2 +- broker/gen/model/Zeromq_settings.h | 2 +- broker/jfjoch_api.yaml | 10 +- broker/redoc-static.html | 4 +- common/JFJochException.h | 17 +- common/JFJochMessages.h | 11 + common/ScalingSettings.cpp | 47 +- common/ScalingSettings.h | 26 + common/ScanResultGenerator.cpp | 5 +- detector_control/DectrisDetectorWrapper.cpp | 3 +- detector_control/SLSDetectorWrapper.cpp | 8 +- docs/CHANGELOG.md | 19 + docs/HDF5.md | 4 +- docs/JFJOCH_VIEWER.md | 4 +- docs/JFJOCH_WRITER.md | 21 + docs/NAMING.md | 60 ++ docs/{JFJOCH_PROCESS.md => RUGNUX.md} | 71 ++- docs/TOOLS.md | 51 +- docs/conf.py | 2 +- docs/index.rst | 3 +- docs/python_client/README.md | 8 +- docs/python_client/docs/DefaultApi.md | 135 +++++ docs/python_client/docs/JfjochSettings.md | 1 + docs/python_client/docs/JfjochStatistics.md | 1 + docs/python_client/docs/ScanResult.md | 1 + .../docs/ScanResultImagesInner.md | 1 + fpga/hdl/action_config.v | 2 +- fpga/pcie_driver/dkms.conf | 2 +- fpga/pcie_driver/install_dkms.sh | 2 +- fpga/pcie_driver/jfjoch_drv.c | 2 +- fpga/pcie_driver/postinstall.sh | 2 +- fpga/pcie_driver/preuninstall.sh | 2 +- frontend/package-lock.json | 4 +- frontend/package.json | 2 +- frontend/public/psi_01.png | Bin 0 -> 5818 bytes frontend/public/psi_02.png | Bin 0 -> 7457 bytes frontend/public/psi_03.png | Bin 0 -> 7142 bytes frontend/public/psi_04.png | Bin 0 -> 6204 bytes frontend/src/App.tsx | 63 ++- frontend/src/client/index.ts | 2 +- frontend/src/client/types.gen.ts | 9 + frontend/src/client/zod.gen.ts | 6 + .../src/components/ButtonWithSnackbar.tsx | 13 +- frontend/src/components/Calibration.tsx | 63 ++- .../src/components/DataProcessingPlot.tsx | 4 +- frontend/src/components/DetectorSettings.tsx | 530 ++++++++---------- frontend/src/components/DetectorStatus.tsx | 20 +- frontend/src/components/EmptyState.tsx | 17 + frontend/src/components/MaskVisualization.tsx | 25 + frontend/src/components/PreviewImage.tsx | 12 + frontend/src/components/ROI.tsx | 112 ++-- frontend/src/components/SettingsPanel.tsx | 38 +- frontend/src/components/StatusBar.tsx | 139 +++-- frontend/src/components/TiffImageViewer.tsx | 256 +++++++++ frontend/src/components/ZeroMQPreview.tsx | 8 +- frontend/src/components/tiffDecode.ts | 115 ++++ frontend/src/version.ts | 2 +- image_analysis/CMakeLists.txt | 2 - image_analysis/IndexAndRefine.cpp | 47 +- image_analysis/IndexAndRefine.h | 19 +- image_analysis/RotationParameters.cpp | 27 - image_analysis/RotationParameters.h | 18 - image_analysis/WriteReflections.cpp | 24 +- image_analysis/WriteReflections.h | 3 + image_analysis/azint/ICE_RING_DETECTION.md | 2 +- .../BRAGG_INTEGRATION_ENGINE.md | 4 +- .../BraggIntegrationEngine.h | 12 + .../BraggIntegrationEngineCPU.cpp | 13 +- .../BraggIntegrationEngineGPU.cu | 18 +- .../bragg_integration/NEXTGEN_INTEGRATOR.md | 4 +- .../ImagePreprocessorCPU.cpp | 10 +- .../ImagePreprocessorGPU.cu | 15 +- image_analysis/indexing/AnalyzeIndexing.cpp | 21 +- .../rotation_indexer/RotationIndexer.cpp | 14 + .../rotation_indexer/RotationIndexer.h | 5 + image_analysis/scale_merge/CMakeLists.txt | 2 + image_analysis/scale_merge/Merge.cpp | 8 +- image_analysis/scale_merge/Merge.h | 6 +- .../scale_merge/ResolutionCutoff.cpp | 174 ++++++ image_analysis/scale_merge/ResolutionCutoff.h | 29 + .../scale_merge/RotationScaleMerge.cpp | 47 +- .../scale_merge/RotationScaleMerge.h | 10 + .../scale_merge/RotationScaleMergeGPU.cu | 20 +- .../scale_merge/RotationScaleMergeGPU.h | 3 +- .../scale_merge/SearchSpaceGroup.cpp | 81 ++- image_analysis/scale_merge/SearchSpaceGroup.h | 3 + .../scale_merge/TwinningAnalysis.cpp | 9 +- image_pusher/HDF5FilePusher.cpp | 25 +- preview/PreviewImage.cpp | 170 ++++-- preview/PreviewImage.h | 15 +- process/CMakeLists.txt | 11 - reader/HDF5MetadataSource.cpp | 21 +- reader/JFJochHttpReader.cpp | 15 +- reader/JFJochHttpReader.h | 5 + reader/JFJochReader.cpp | 5 +- reader/JFJochReaderDataset.h | 6 +- reader/JFJochReaderImage.cpp | 2 +- receiver/JFJochReceiver.cpp | 4 +- receiver/JFJochReceiverLite.cpp | 9 +- receiver/JFJochReceiverService.cpp | 8 + rugnux/CMakeLists.txt | 11 + .../JFJochProcess.cpp => rugnux/Rugnux.cpp | 356 ++++++++++-- process/JFJochProcess.h => rugnux/Rugnux.h | 20 +- .../RugnuxCommandLine.cpp | 24 +- .../RugnuxCommandLine.h | 6 +- tests/CMakeLists.txt | 6 +- tests/HDF5WritingTest.cpp | 75 ++- tests/JFJochReaderTest.cpp | 4 +- tests/JFJochReceiverProcessingTest.cpp | 4 +- ...ocessLargeTest.cpp => RugnuxLargeTest.cpp} | 8 +- .../{JFJochProcessTest.cpp => RugnuxTest.cpp} | 38 +- tests/TCPImagePusherTest.cpp | 88 +++ tests/data/README.md | 2 +- tools/CMakeLists.txt | 20 +- tools/jfjoch_azint.cpp | 296 ---------- tools/jfjoch_scale.cpp | 390 ------------- tools/{jfjoch_process.cpp => rugnux_cli.cpp} | 509 +++++++++++++++-- viewer/CMakeLists.txt | 2 +- viewer/JFJochImageReadingWorker.cpp | 53 +- viewer/JFJochImageReadingWorker.h | 13 + viewer/JFJochProcessController.cpp | 2 +- viewer/JFJochProcessController.h | 12 +- viewer/JFJochViewerSidePanel.cpp | 42 ++ viewer/JFJochViewerSidePanel.h | 4 + viewer/JFJochViewerWindow.cpp | 39 +- viewer/JFJochViewerWindow.h | 10 + .../image_viewer/JFJochDiffractionImage.cpp | 94 ++-- viewer/image_viewer/JFJochDiffractionImage.h | 1 + viewer/image_viewer/JFJochImage.cpp | 77 ++- viewer/image_viewer/JFJochImage.h | 4 + .../widgets/JFJochViewerImageStatistics.cpp | 2 +- viewer/widgets/JFJochViewerROIList.cpp | 11 +- viewer/widgets/ROIColorPalette.h | 16 + viewer/windows/JFJochCalibrationWindow.cpp | 2 +- viewer/windows/JFJochProcessingJobsWindow.cpp | 4 +- viewer/windows/JFJochProcessingJobsWindow.h | 2 +- writer/FileWriter.cpp | 26 +- writer/FileWriter.h | 9 +- writer/HDF5NXmx.cpp | 28 +- writer/StreamWriter.cpp | 6 +- 267 files changed, 3761 insertions(+), 1883 deletions(-) create mode 100644 docs/NAMING.md rename docs/{JFJOCH_PROCESS.md => RUGNUX.md} (70%) create mode 100644 frontend/public/psi_01.png create mode 100644 frontend/public/psi_02.png create mode 100644 frontend/public/psi_03.png create mode 100644 frontend/public/psi_04.png create mode 100644 frontend/src/components/EmptyState.tsx create mode 100644 frontend/src/components/MaskVisualization.tsx create mode 100644 frontend/src/components/TiffImageViewer.tsx create mode 100644 frontend/src/components/tiffDecode.ts delete mode 100644 image_analysis/RotationParameters.cpp delete mode 100644 image_analysis/RotationParameters.h create mode 100644 image_analysis/scale_merge/ResolutionCutoff.cpp create mode 100644 image_analysis/scale_merge/ResolutionCutoff.h delete mode 100644 process/CMakeLists.txt create mode 100644 rugnux/CMakeLists.txt rename process/JFJochProcess.cpp => rugnux/Rugnux.cpp (59%) rename process/JFJochProcess.h => rugnux/Rugnux.h (89%) rename process/JFJochProcessCommandLine.cpp => rugnux/RugnuxCommandLine.cpp (84%) rename process/JFJochProcessCommandLine.h => rugnux/RugnuxCommandLine.h (71%) rename tests/{JFJochProcessLargeTest.cpp => RugnuxLargeTest.cpp} (92%) rename tests/{JFJochProcessTest.cpp => RugnuxTest.cpp} (82%) delete mode 100644 tools/jfjoch_azint.cpp delete mode 100644 tools/jfjoch_scale.cpp rename tools/{jfjoch_process.cpp => rugnux_cli.cpp} (62%) create mode 100644 viewer/widgets/ROIColorPalette.h diff --git a/.gitea/workflows/build_and_test.yml b/.gitea/workflows/build_and_test.yml index cae9626f..f85a93e6 100644 --- a/.gitea/workflows/build_and_test.yml +++ b/.gitea/workflows/build_and_test.yml @@ -103,8 +103,8 @@ jobs: env: TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }} run: | - # NSIS installer named jfjoch--win64-{cuda|cpu}.exe (see CMakeLists.txt). - $files = Get-ChildItem -Path build -Filter 'jfjoch-*-win64-*.exe' + # NSIS installer named jfjoch-viewer--win64-{cuda|cpu}.exe (see CMakeLists.txt). + $files = Get-ChildItem -Path build -Filter 'jfjoch-viewer-*-win64-*.exe' if ($files.Count -eq 0) { throw 'No Windows installer found in build/' } foreach ($file in $files) { python gitea_upload_file.py $file.FullName @@ -135,7 +135,7 @@ jobs: run: | cd build # Build the whole viewer-only tree, not just the GUI: the "viewer" CPack component also - # contains the portable CLI tools (jfjoch_process/scale/azint/recompress/extract_hkl), + # contains the portable CLI tools (rugnux/rugnux_scale/azint/recompress/extract_hkl), # which must exist on disk before cpack installs the component. ninja -j16 cpack diff --git a/CLAUDE.md b/CLAUDE.md index 2e305818..c331f080 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -122,8 +122,11 @@ generated API model and internal types. `JFJochImageAnalysis`): - `jfjoch_broker` — online, real-time (FPGA + GPU). - `jfjoch_viewer` — interactive Qt desktop (`viewer/`), results not persisted. -- `jfjoch_process` (`tools/jfjoch_process.cpp`) — offline batch over a stored HDF5; writes - `_process.h5` and `.mtz`/`.cif`/`.hkl`. `jfjoch_scale` re-scales/merges already-integrated data. +- `rugnux` (`tools/rugnux_cli.cpp`, built on the `Rugnux` library in `rugnux/`) — offline batch over + a stored HDF5; writes `_process.h5` and `.mtz`/`.cif`/`.hkl`. Merging is on by default (`--no-merge` + to disable); `--azint-only` runs only azimuthal integration and `--scale` re-scales/merges the + already-integrated reflections in a `_process.h5`. (rugnux = the data-processing half of the system; + see `docs/NAMING.md`.) **`image_analysis/` pipeline** (subdirs): `spot_finding`, `indexing` (`ffbidx`/`fft` GPU, `fftw` CPU), `lattice_search`, `geom_refinement`, `pixel_refinement`, `bragg_prediction`, @@ -198,7 +201,7 @@ A per-image scalar (e.g. `ice_ring_score`, `bkg_estimate`, `mosaicity`) flows an (`bkg_estimate` is a clean template) at every layer: 1. **Compute** where the azint profile is finalized: `image_analysis/MXAnalysisWithoutFPGA.cpp` (CPU), - `receiver/JFJochReceiverFPGA.cpp` (FPGA), and the offline azint worker in `process/JFJochProcess.cpp`. + `receiver/JFJochReceiverFPGA.cpp` (FPGA), and the offline azint worker in `rugnux/Rugnux.cpp`. 2. **Message** (`common/JFJochMessages.h`): `std::optional` in `DataMessage`, `std::vector` in `EndMessage`. 3. **CBOR**: encode in `frame_serialize/CBORStream2Serializer.cpp` (DataMessage block *and* END block), diff --git a/CMakeLists.txt b/CMakeLists.txt index 7934715e..2c38f5e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,9 +277,9 @@ IF (JFJOCH_VIEWER_ONLY) ADD_SUBDIRECTORY(image_analysis) ADD_SUBDIRECTORY(broker) ADD_SUBDIRECTORY(reader) - ADD_SUBDIRECTORY(process) + ADD_SUBDIRECTORY(rugnux) ADD_SUBDIRECTORY(viewer) - ADD_SUBDIRECTORY(tools) # builds only the portable analysis tools (process/scale/azint/extract_hkl) + ADD_SUBDIRECTORY(tools) # builds only the portable analysis tools (rugnux/extract_hkl) ELSE() ADD_SUBDIRECTORY(jungfrau) ADD_SUBDIRECTORY(compression) @@ -302,7 +302,7 @@ ELSE() ADD_SUBDIRECTORY(acquisition_device) ADD_SUBDIRECTORY(receiver) ADD_SUBDIRECTORY(image_analysis) - ADD_SUBDIRECTORY(process) + ADD_SUBDIRECTORY(rugnux) ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(tools) ENDIF() @@ -393,10 +393,10 @@ elseif (WIN32) set(CPACK_NSIS_PACKAGE_NAME "Jungfraujoch") if (JFJOCH_CUDA_AVAILABLE) set(CPACK_NSIS_DISPLAY_NAME "Jungfraujoch (CUDA)") - set(CPACK_PACKAGE_FILE_NAME "jfjoch-${JFJOCH_VERSION}-win64-cuda${CUDAToolkit_VERSION_MAJOR}") + set(CPACK_PACKAGE_FILE_NAME "jfjoch-viewer-${JFJOCH_VERSION}-win64-cuda${CUDAToolkit_VERSION_MAJOR}") else() set(CPACK_NSIS_DISPLAY_NAME "Jungfraujoch (CPU)") - set(CPACK_PACKAGE_FILE_NAME "jfjoch-${JFJOCH_VERSION}-win64-cpu") + set(CPACK_PACKAGE_FILE_NAME "jfjoch-viewer-${JFJOCH_VERSION}-win64-cpu") endif() # Start Menu shortcut for the viewer (";