2ba28aea0e
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m3s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m33s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m47s
Build Packages / build:rpm (rocky8) (push) Successful in 12m50s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m10s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m48s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 14m29s
Build Packages / XDS test (durin plugin) (push) Successful in 7m50s
Build Packages / Generate python client (push) Successful in 30s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m25s
Build Packages / Create release (push) Skipped
Build Packages / Build documentation (push) Successful in 38s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m44s
Build Packages / build:rpm (rocky9) (push) Successful in 12m15s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m4s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m20s
Build Packages / DIALS test (push) Successful in 11m48s
Build Packages / Unit tests (push) Successful in 56m41s
PixelRefine's reference can now be a merged/observed-intensity MTZ, not only a calculated F-model. If F-model is missing, read a mean-intensity column (IMEAN, which a jfjoch merge writes; also I/IOBS/Iobs/I-obs, or any 'J'-type column) and use it directly as I_ref (F-model is squared, intensities are not). This enables a SELF-SEEDED / EM-style workflow: run a first pass (traditional integration, or PixelRefine against an external reference) to produce a merge, then re-run PixelRefine with `-z <that merge>.mtz` so it scales against the data's own intensities - free of the reference structure's non-isomorphism bias - and iterate. Verified: a jfjoch IMEAN merge loads as the reference and PixelRefine runs against it (crystal 2, 55279 reflections, CC1/2 94.3). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
66 lines
2.2 KiB
C++
66 lines
2.2 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "LoadFCalcFromMtz.h"
|
|
|
|
#include <cmath>
|
|
#include <cstdint>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <gemmi/mtz.hpp>
|
|
|
|
#include "../common/Reflection.h"
|
|
|
|
std::vector<MergedReflection> LoadFCalcFromMtz(const std::string& path) {
|
|
gemmi::Mtz mtz;
|
|
mtz.read_file_gz(path, true);
|
|
|
|
// Prefer a calculated structure factor F-model (e.g. a reference structure): I_ref = F^2.
|
|
const gemmi::Mtz::Column* col = mtz.column_with_label("F-model", nullptr, 'F');
|
|
const bool square = (col != nullptr);
|
|
|
|
// Otherwise fall back to a merged/observed intensity column, used directly as I_ref. This
|
|
// lets PixelRefine be SELF-SEEDED from the data's own previous merge (a jfjoch merge writes
|
|
// IMEAN) instead of an external reference structure - the EM-style outer loop, free of the
|
|
// reference's non-isomorphism bias.
|
|
if (col == nullptr) {
|
|
for (const char* label : {"IMEAN", "I", "IOBS", "Iobs", "I-obs"}) {
|
|
col = mtz.column_with_label(label, nullptr, 'J');
|
|
if (col != nullptr)
|
|
break;
|
|
}
|
|
}
|
|
if (col == nullptr) {
|
|
for (const auto& c : mtz.columns)
|
|
if (c.type == 'J') { col = &c; break; } // any mean-intensity column
|
|
}
|
|
if (col == nullptr)
|
|
throw std::runtime_error("MTZ has no F-model or intensity (J) column to use as reference");
|
|
|
|
std::vector<MergedReflection> result;
|
|
result.reserve(static_cast<std::size_t>(mtz.nreflections));
|
|
|
|
const std::size_t stride = mtz.columns.size();
|
|
|
|
for (int i = 0; i < mtz.nreflections; ++i) {
|
|
const std::size_t row = static_cast<std::size_t>(i) * stride;
|
|
const float v = (*col)[static_cast<std::size_t>(i)];
|
|
|
|
if (std::isnan(v))
|
|
continue;
|
|
|
|
MergedReflection r;
|
|
r.h = static_cast<int32_t>(mtz.data[row + 0]);
|
|
r.k = static_cast<int32_t>(mtz.data[row + 1]);
|
|
r.l = static_cast<int32_t>(mtz.data[row + 2]);
|
|
r.I = square ? v * v : v;
|
|
r.sigma = NAN;
|
|
r.d = 0.0f;
|
|
|
|
result.emplace_back(r);
|
|
}
|
|
|
|
return result;
|
|
}
|