Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 15m31s
Build Packages / build:viewer-tgz:cpu (push) Successful in 5m46s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m9s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m25s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m21s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m41s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m18s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m26s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m33s
Build Packages / build:rpm (rocky8) (push) Successful in 10m32s
Build Packages / build:rpm (rocky9) (push) Successful in 12m23s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m12s
Build Packages / DIALS test (push) Successful in 12m6s
Build Packages / XDS test (durin plugin) (push) Successful in 8m15s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m12s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m35s
Build Packages / Generate python client (push) Successful in 27s
Build Packages / Build documentation (push) Successful in 54s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 12m37s
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. * jfjoch_process: Major rotation (rot3d) data processing overhaul - robust profile-fit integration, Cauchy-loss scaling with optional absorption surface, de-novo indexing and space-group/centering determination fixes, and merging statistics + ISa in the mmCIF output. * jfjoch_process: Add EXPERIMENTAL ice-ring detection (--detect-ice-rings) that excludes ice reflections from scaling. * Compression: Add BSHUF_ZSTD_RLE_HUFF, make compression size-aware (drop frames that don't fit rather than aborting), and add the jfjoch_recompress tool. * jfjoch_viewer: Report "Multiple lattices detected" and grey out "Analyze dataset" on a live connection. * jfjoch_broker: Write smargon chi/phi goniometer positions to NXmx; read sensor thickness/material from HDF5 metadata. * CI: Build Windows (CUDA and non-CUDA) installers.Reviewed-on: #66 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
75 lines
2.5 KiB
C++
75 lines
2.5 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <vector>
|
|
#include <optional>
|
|
#include <string>
|
|
|
|
#include "CrystalLattice.h"
|
|
#include "UnitCell.h"
|
|
|
|
struct ScanResultElem {
|
|
int64_t number = -1;
|
|
float collection_efficiency = 0.0;
|
|
|
|
std::optional<int64_t> x;
|
|
std::optional<int64_t> y;
|
|
std::optional<float> angle_deg;
|
|
|
|
std::optional<int64_t> pixel_sum;
|
|
std::optional<int64_t> indexed_lattice_count;
|
|
std::optional<int64_t> min_viable_pixel;
|
|
std::optional<int64_t> max_viable_pixel;
|
|
std::optional<int64_t> err_pixels;
|
|
std::optional<int64_t> sat_pixels;
|
|
std::optional<float> bkg;
|
|
std::optional<int64_t> spot_count;
|
|
std::optional<int64_t> spot_count_low_res;
|
|
std::optional<int64_t> spot_count_indexed;
|
|
std::optional<int64_t> spot_count_ice;
|
|
std::optional<int64_t> indexing_solution;
|
|
std::optional<float> profile_radius;
|
|
std::optional<float> b_factor;
|
|
std::optional<float> res;
|
|
std::optional<UnitCell> uc;
|
|
std::optional<uint64_t> xfel_pulse_id;
|
|
std::optional<float> mosaicity;
|
|
std::optional<int64_t> niggli_class;
|
|
std::optional<int64_t> integrated_reflections;
|
|
std::optional<float> image_scale_factor;
|
|
std::optional<float> image_scale_cc;
|
|
std::optional<float> ice_ring_score;
|
|
};
|
|
|
|
struct ScanResult {
|
|
std::string file_prefix;
|
|
std::vector<ScanResultElem> images;
|
|
|
|
std::optional<CrystalLattice> rotation_lattice;
|
|
// Bravais lattice type of the global rotation-indexing solution (from RotationIndexer).
|
|
std::optional<gemmi::CrystalSystem> rotation_crystal_system;
|
|
std::optional<char> rotation_centering;
|
|
};
|
|
|
|
// Two-letter Bravais lattice symbol: crystal-system letter + centering, e.g. "tP", "oC", "cF", "hR".
|
|
inline std::string BravaisSymbol(gemmi::CrystalSystem system, char centering) {
|
|
char family;
|
|
switch (system) {
|
|
case gemmi::CrystalSystem::Triclinic: family = 'a'; break;
|
|
case gemmi::CrystalSystem::Monoclinic: family = 'm'; break;
|
|
case gemmi::CrystalSystem::Orthorhombic: family = 'o'; break;
|
|
case gemmi::CrystalSystem::Tetragonal: family = 't'; break;
|
|
case gemmi::CrystalSystem::Trigonal: family = 'h'; break;
|
|
case gemmi::CrystalSystem::Hexagonal: family = 'h'; break;
|
|
case gemmi::CrystalSystem::Cubic: family = 'c'; break;
|
|
default: family = 'a'; break;
|
|
}
|
|
return std::string{family} + centering;
|
|
}
|
|
|
|
|