leonarski_fandClaude Opus 5
391736425f
Slurp() returned a fresh std::vector per call, so every frame allocated the whole compressed file - 18 MB on a 16 Mpx detector - and value-initialised it before the read overwrote every byte. Measured on one such frame that is 9.2 ms against 5.4 ms into a buffer that is already there. ReadInto() now takes the scratch, and the raw image carries it, so a worker reading a sweep reads every file into the same bytes. Slurp() fills a buffer instead of returning one, which is also what makes the resize cost nothing when the next file is the same size as the last. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
92 lines
3.3 KiB
C++
92 lines
3.3 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <vector>
|
|
#include <unordered_set>
|
|
#include <map>
|
|
#include <mutex>
|
|
#include <optional>
|
|
|
|
#include "../common/TopPixels.h"
|
|
#include "JFJochReaderDataset.h"
|
|
#include "../common/CrystalLattice.h"
|
|
#include "../common/Histogram.h"
|
|
|
|
// Markers stored in place of an intensity. They occupy the bottom of the int32 range and
|
|
// INT32_MAX at the top, so anything in between is a real count. Add a marker at the BOTTOM and move
|
|
// MIN_REAL_PXL_VALUE with it - several places classify a pixel by range rather than by equality,
|
|
// and they all test against MIN_REAL_PXL_VALUE.
|
|
constexpr static int32_t ERROR_PXL_VALUE = INT32_MIN;
|
|
constexpr static int32_t GAP_PXL_VALUE = INT32_MIN + 1;
|
|
constexpr static int32_t BEAM_STOP_PXL_VALUE = INT32_MIN + 2;
|
|
constexpr static int32_t MIN_REAL_PXL_VALUE = INT32_MIN + 3;
|
|
constexpr static int32_t SATURATED_PXL_VALUE = INT32_MAX;
|
|
|
|
struct JFJochReaderRawImage {
|
|
RawByteBuffer image_buffer;
|
|
CompressedImage image;
|
|
// Scratch the reader needs to produce the image and that nothing else reads: the CBF reader
|
|
// reads the compressed file into it before decoding. It lives here so that a raw image reused
|
|
// from one frame to the next reuses this buffer too.
|
|
std::vector<uint8_t> read_buffer;
|
|
};
|
|
|
|
class JFJochReaderImage {
|
|
std::shared_ptr<const JFJochReaderDataset> dataset;
|
|
|
|
std::vector<int32_t> image; // Image in the reader must be 32-bit signed, uncompressed
|
|
DataMessage message;
|
|
|
|
std::unordered_set<int64_t> saturated_pixel;
|
|
std::unordered_set<int64_t> error_pixel;
|
|
std::vector<std::pair<int32_t, int32_t>> valid_pixel;
|
|
|
|
// Fast stats without storing/sorting all valid pixels
|
|
int32_t valid_min = 0;
|
|
int32_t valid_max = 0;
|
|
size_t valid_count = 0;
|
|
bool has_valid = false;
|
|
|
|
// For overlay: track top pixels with a tiny O(K) structure; export to vector for UI
|
|
TopPixels top_pixels_acc{20};
|
|
std::vector<std::pair<int32_t, int32_t>> top_pixels;
|
|
|
|
// This histogram operates in square root of count from 0 to 10^20
|
|
Histogram count_histogram{100000};
|
|
|
|
constexpr static float auto_foreground_range = 99.0f;
|
|
int32_t auto_foreground;
|
|
void CalcAutoContrast();
|
|
|
|
template <class T>
|
|
void ProcessInputImage(const void* image, size_t npixel, int64_t sat_value, int64_t special_value);
|
|
void ProcessInputImage(const CompressedImage& image);
|
|
public:
|
|
JFJochReaderImage(const DataMessage &msg, const std::shared_ptr<const JFJochReaderDataset> &dataset);
|
|
JFJochReaderImage(const JFJochReaderImage &other);
|
|
|
|
const DataMessage &ImageData() const;
|
|
DataMessage &ImageData();
|
|
|
|
const std::vector<int32_t> &Image() const;
|
|
const std::unordered_set<int64_t> &SaturatedPixels() const;
|
|
const std::unordered_set<int64_t> &ErrorPixels() const;
|
|
const JFJochReaderDataset &Dataset() const;
|
|
|
|
std::optional<std::pair<int32_t, int32_t>> ValidMinMax() const;
|
|
const std::vector<std::pair<int32_t, int32_t>> &GetTopPixels() const;
|
|
|
|
void AddImage(const JFJochReaderImage& other);
|
|
std::vector<float> GetAzInt1D() const;
|
|
std::vector<float> GetAzInt1D_BinToQ() const;
|
|
std::shared_ptr<JFJochReaderDataset> CreateMutableDataset();
|
|
|
|
int32_t GetAutoContrastValue() const;
|
|
|
|
std::vector<float> GetHistogram() const;
|
|
};
|
|
|
|
|