Files
Jungfraujoch/common/Histogram.h
T
leonarski_f 6dfe065365
Build Packages / Create release (push) Successful in 16s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 8m27s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 9m15s
Build Packages / build:viewer-tgz:cpu (push) Successful in 10m11s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m6s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 15m44s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m1s
Build Packages / build:windows:nocuda (push) Successful in 17m29s
Build Packages / build:windows:cuda (push) Successful in 19m58s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 24m7s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 19m8s
Build Packages / build:rugnux:windows (push) Successful in 10m58s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 20m46s
Build Packages / Generate python client (push) Successful in 53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 20m13s
Build Packages / Build documentation (push) Successful in 1m36s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m57s
Build Packages / build:rpm (rocky8) (push) Successful in 18m7s
Build Packages / build:rpm (rocky9) (push) Successful in 18m54s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 19m32s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 17m30s
Build Packages / Unit tests (push) Successful in 1h39m2s
v1.0.0-rc.172 (#82)
* Fixed `jfjoch_broker` cancelling every data collection with a CUDA "out of memory" error after long operation: GPU memory no longer leaks with each collection.
* Rugnux scales a rotation sweep until the per-frame scales settle instead of for a fixed three rounds, and says so when they did not - merged intensities, and the space group, resolution cut and frame rejection read off them, change accordingly; `--scaling-iterations` is now the cap on that loop (default 100).
* Rugnux places every frame of a marCCD, SMV or miniCBF series at the spindle angle its own header states, so a series with missing frames, or with angles written modulo 360, is no longer read at the wrong geometry or refused.
* Every rotation run writes two diagnostic files beside its reflections: `<prefix>_detector.jpg`, the detector projection with the pixel mask and the detected beam-stop shadow drawn on it, and `<prefix>_plot.txt`, one row per image.

Reviewed-on: #82
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-09-22 06:48:37 +02:00

115 lines
3.1 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <cmath>
#include <cstdint>
#include <cstddef>
#include <vector>
#include <mutex>
#include "MultiLinePlot.h"
#include "../common/JFJochException.h"
template<class T>
class SetAverage {
std::vector<T> sum;
std::vector<uint64_t> count;
mutable std::mutex m;
public:
explicit SetAverage(size_t bins) : sum(bins), count(bins) {
}
void Add(size_t bin, T val) {
std::unique_lock ul(m);
if (bin < sum.size()) {
sum[bin] += val;
count[bin] += 1;
}
}
MultiLinePlot GetPlot() const {
std::unique_lock ul(m);
MultiLinePlotStruct plot;
plot.x.resize(sum.size());
plot.y.resize(sum.size());
for (int i = 0; i < sum.size(); i++) {
plot.x[i] = static_cast<float>(i);
if (count[i] > 0)
plot.y[i] = static_cast<float>(sum[i]) / count[i];
else
plot.y[i] = 0;
}
MultiLinePlot ret;
ret.AddPlot(plot);
return ret;
}
};
class Histogram {
std::vector<uint64_t> count;
int32_t total_count = 0;
int32_t max_bin = 0;
public:
explicit Histogram(size_t bins) : count(bins) {}
void Add(int32_t val) {
if (val > 0 && val < count.size()) {
count[val] += 1;
if (val > max_bin)
max_bin = val;
++total_count;
}
}
void clear() {
for (auto &c: count) c = 0;
total_count = 0;
max_bin = 0;
}
[[nodiscard]] std::vector<float> GetCount() const {
std::vector<float> ret;
ret.reserve(max_bin + 1);
for (size_t i = 0; i < max_bin + 1; i++)
ret.emplace_back(count[i]);
return ret;
}
[[nodiscard]] uint64_t GetTotalCount() const {
return total_count;
}
// Returns the value x such that approximately `percent`% of samples are <= x.
// - percent must be in [0, 100]
// - returns std::nullopt if histogram is empty
[[nodiscard]] std::optional<int32_t> Percentile(float percent) const {
if (!std::isfinite(percent) || percent < 0.0f || percent > 100.0f) {
throw JFJochException(JFJochExceptionCategory::InputParameterBelowMin,
"FloatHistogram Percentile expects percent in [0, 100]");
}
if (total_count == 0)
return std::nullopt;
// Target rank in [0, total-1]
const double q = static_cast<double>(percent) / 100.0;
const auto target = static_cast<int64_t>(std::floor(q * static_cast<double>(total_count - 1)));
uint64_t cumulative = 0;
for (int64_t i = 0; i < max_bin + 1; i++) {
cumulative += count[i];
if (target < cumulative && count[i] > 0)
return i;
}
// If due to rounding we didn't return inside the loop, clamp to the last bin's upper edge.
return count.size() - 1;
}
};