General function to write reflections in multiple formats (need to better integrate into jfjoch_scale and jfjoch_process)
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m42s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 15m8s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 17m17s
Build Packages / build:rpm (rocky8) (push) Successful in 17m29s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 18m15s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m23s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 19m2s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m33s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / Build documentation (push) Successful in 56s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky9) (push) Successful in 12m34s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m7s
Build Packages / XDS test (durin plugin) (push) Successful in 10m1s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 10m15s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m5s
Build Packages / DIALS test (push) Successful in 13m27s
Build Packages / Unit tests (push) Successful in 1h0m7s

This commit is contained in:
2026-05-19 22:12:42 +02:00
parent 0eb0c50c66
commit 39823ddb67
7 changed files with 251 additions and 295 deletions
+3 -34
View File
@@ -28,7 +28,7 @@
#include "../image_analysis/LoadFCalcFromMtz.h"
#include "../image_analysis/scale_merge/Merge.h"
#include "../image_analysis/scale_merge/SearchSpaceGroup.h"
#include "../image_analysis/WriteMmcif.h"
#include "../image_analysis/WriteReflections.h"
#include "../image_analysis/UpdateReflectionResolution.h"
void print_usage(Logger &logger) {
@@ -719,39 +719,8 @@ int main(int argc, char **argv) {
merged_statistics.Print(logger);
{
const std::string hkl_path = output_prefix + "_intensities.hkl";
std::ofstream hkl_file(hkl_path);
if (!hkl_file) {
logger.Error("Cannot open {} for writing", hkl_path);
} else {
for (const auto &r: merged_reflections) {
hkl_file << r.h << " " << r.k << " " << r.l << " "
<< r.I << " " << r.sigma
<< "\n";
}
hkl_file.close();
logger.Info("Wrote {} reflections to {}", merged_reflections.size(), hkl_path);
}
}
try {
const std::string cif_path = output_prefix + "_intensities.cif";
MmcifMetadata cif_meta;
cif_meta.Fill(experiment);
if (rotation_indexer_ret.has_value())
cif_meta.unit_cell = rotation_indexer_ret->lattice.GetUnitCell();
cif_meta.data_block_name = output_prefix;
WriteMmcifReflections(cif_path, merged_reflections, cif_meta);
logger.Info("Wrote mmCIF reflections to {}", cif_path);
} catch (const std::exception &e) {
logger.Error("Failed to write mmCIF: {}", e.what());
}
if (consensus_cell && !output_prefix.empty())
WriteReflections(merged_reflections, *consensus_cell, experiment, output_prefix);
}
// Write End Message