HKLKey: Fix
Build Packages / Unit tests (push) Failing after 6m44s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 7m54s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 9m10s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 8m55s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 9m25s
Build Packages / build:rpm (rocky9_sls9) (push) Failing after 12m14s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 13m54s
Build Packages / build:rpm (rocky8) (push) Failing after 13m18s
Build Packages / Generate python client (push) Successful in 47s
Build Packages / DIALS test (push) Failing after 9m3s
Build Packages / Create release (push) Has been skipped
Build Packages / XDS test (durin plugin) (push) Failing after 8m9s
Build Packages / build:rpm (rocky9) (push) Failing after 12m12s
Build Packages / Build documentation (push) Successful in 43s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 11m4s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 12m44s
Build Packages / XDS test (JFJoch plugin) (push) Failing after 5m27s
Build Packages / XDS test (neggia plugin) (push) Failing after 4m56s

This commit is contained in:
2026-05-10 13:44:01 +02:00
parent a90ec13418
commit a441e96b50
+6 -4
View File
@@ -4,11 +4,12 @@
#include <cmath>
#include "HKLKey.h"
#include "gemmi/symmetry.hpp"
HKLKey CanonicalHKL(const Reflection &r, bool merge_friedel, const std::optional<gemmi::SpaceGroup> &sg) {
HKLKey CanonicalHKL(const Reflection &r, bool merge_friedel, const std::optional<gemmi::SpaceGroup> &in_sg) {
HKLKey key{r.h, r.k, r.l, true};
if (!sg.has_value()) {
if (!in_sg.has_value()) {
if (!merge_friedel) {
const HKLKey neg{-r.h, -r.k, -r.l, true};
if (std::tie(key.h, key.k, key.l) < std::tie(neg.h, neg.k, neg.l)) {
@@ -19,8 +20,9 @@ HKLKey CanonicalHKL(const Reflection &r, bool merge_friedel, const std::optional
}
}
} else {
const auto ops = sg->operations();
const gemmi::ReciprocalAsu asu(sg.get());
gemmi::SpaceGroup sg = in_sg.value();
const auto ops = sg.operations();
const gemmi::ReciprocalAsu asu(&sg);
const gemmi::Op::Miller in{r.h, r.k, r.l};
const auto [hkl, sign_plus] = asu.to_asu_sign(in, ops);