v1.0.0-rc.173 (#83)
Build Packages / Create release (push) Successful in 24s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 3m29s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m43s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 8m27s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 9m53s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 9m58s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 11m22s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 13m39s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 18m37s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 16m32s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 24m11s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m30s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 19m3s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m23s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m41s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / Build documentation (push) Successful in 1m16s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 21m0s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 18m38s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 14m33s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 17m55s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 18m38s
Build Packages / Unit tests (push) Successful in 1h46m14s
Build Packages / Create release (push) Successful in 24s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 3m29s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m43s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 8m27s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 9m53s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 9m58s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 11m22s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 13m39s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 18m37s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 16m32s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 24m11s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m30s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 19m3s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m23s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m41s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / Build documentation (push) Successful in 1m16s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 21m0s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 18m38s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 14m33s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 17m55s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 18m38s
Build Packages / Unit tests (push) Successful in 1h46m14s
* jfjoch_broker: Optional per-dataset authentication - statistics, images and plots can require a bearer token, which jfjoch_viewer supports. * jfjoch_viewer: Dark mode and a theme-matched colour scheme, a magnifier panel, and simpler contrast and background controls. * Rugnux: Multiple performance improvements on GPU and CPU (CPU-only processing up to 40% faster, faster image decoding on ARM), with unchanged results. * Rugnux: `--model` rigid-body refinement runs on the GPU, and the model-validation check is faster and more reliable. * Rugnux: Improved scaling and merging - error model, outlier rejection, absorption correction and French-Wilson amplitudes now agree more closely with XDS and ctruncate. * Rugnux: Improved integration - radial background on powder and ice rings, crowded rotation data keep their reflections, and CPU-only builds integrate large unit cells as GPU builds do. * Rugnux: More robust detector geometry - measured beam centre, X-ray bandwidth and goniometer rate, and geometry refinement accepted only on significant evidence. * Rugnux: Merged files are written in the standard setting, or in the setting of a reference MTZ, structure-factor mmCIF or model, with its free-R flags. * Rugnux: Richer report - ice and powder rings, further lattices, superstructure candidates and mosaicity, with warnings worded as prompts to check. * Rugnux: Clear error messages when a data set needs more GPU or host memory than is available. Reviewed-on: #83 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #83.
This commit is contained in:
1 parent
6dfe065365
commit
84228bf8be
452 files changed
+23762
-3779
No files matched your search
@@ -244,6 +244,43 @@ namespace {
|
||||
memcpy(v.data(), ptr, len);
|
||||
}
|
||||
|
||||
// DECTRIS may send this one compressed, like its images
|
||||
void GetCBORUInt32Array(CborValue &value, std::vector<uint32_t> &v) {
|
||||
if (GetCBORTag(value) != TagUnsignedInt32BitLE)
|
||||
throw JFJochException(JFJochExceptionCategory::CBORError, "Incorrect array type tag");
|
||||
|
||||
if (!cbor_value_is_tag(&value)) {
|
||||
auto [ptr, len] = GetCBORByteString(value);
|
||||
if (len % sizeof(uint32_t))
|
||||
throw JFJochException(JFJochExceptionCategory::CBORError, "Size mismatch");
|
||||
v.resize(len / sizeof(uint32_t));
|
||||
memcpy(v.data(), ptr, len);
|
||||
return;
|
||||
}
|
||||
|
||||
if (GetCBORTag(value) != TagDECTRISCompression)
|
||||
throw JFJochException(JFJochExceptionCategory::CBORError, "Unsupported tag");
|
||||
CborValue array_value;
|
||||
cborErr(cbor_value_enter_container(&value, &array_value));
|
||||
auto algorithm_text = GetCBORString(array_value);
|
||||
CompressionAlgorithm algorithm;
|
||||
if (algorithm_text == "bslz4")
|
||||
algorithm = CompressionAlgorithm::BSHUF_LZ4;
|
||||
else if (algorithm_text == "bszstd")
|
||||
algorithm = CompressionAlgorithm::BSHUF_ZSTD;
|
||||
else
|
||||
throw JFJochException(JFJochExceptionCategory::CBORError, "Unsupported compression algorithm");
|
||||
GetCBORUInt(array_value); // element size, known from the type tag
|
||||
auto [ptr, len] = GetCBORByteString(array_value);
|
||||
cborErr(cbor_value_leave_container(&value, &array_value));
|
||||
|
||||
// The bitshuffle header starts with the uncompressed size in bytes
|
||||
if (len < 12)
|
||||
throw JFJochException(JFJochExceptionCategory::CBORError, "Compressed array too short");
|
||||
size_t nelements = bshuf_read_uint64_BE(const_cast<uint8_t *>(ptr)) / sizeof(uint32_t);
|
||||
JFJochDecompress(v, algorithm, ptr, len, nelements);
|
||||
}
|
||||
|
||||
void GetCBORInt32Array(CborValue &value, std::vector<int32_t> &v) {
|
||||
if (GetCBORTag(value) != TagSignedInt32BitLE)
|
||||
throw JFJochException(JFJochExceptionCategory::CBORError, "Incorrect array type tag");
|
||||
@@ -1270,8 +1307,12 @@ namespace {
|
||||
message.number_of_images = GetCBORUInt(value);
|
||||
else if (key == "countrate_correction_enabled")
|
||||
message.countrate_correction_enabled = GetCBORBool(value);
|
||||
else if (key == "countrate_correction_lookup_table")
|
||||
GetCBORUInt32Array(value, message.countrate_correction_lookup_table);
|
||||
else if (key == "flatfield_enabled")
|
||||
message.flatfield_enabled = GetCBORBool(value);
|
||||
else if (key == "virtual_pixel_interpolation_enabled")
|
||||
message.virtual_pixel_interpolation_enabled = GetCBORBool(value);
|
||||
else if (key == "image_size_x")
|
||||
message.image_size_x = GetCBORUInt(value);
|
||||
else if (key == "image_size_y")
|
||||
|
||||
Reference in new issue
Block a user