Build Packages / Unit tests (push) Successful in 1h22m15s
Build Packages / build:windows:nocuda (push) Successful in 18m0s
Build Packages / build:windows:cuda (push) Successful in 20m30s
Build Packages / build:viewer-tgz:cpu (push) Successful in 10m32s
Build Packages / build:viewer-tgz:cuda (push) Successful in 11m39s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 8m55s
Build Packages / build:rugnux:windows (push) Successful in 11m25s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 20m6s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 20m19s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 15m34s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 20m25s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m36s
Build Packages / build:rpm (rocky8) (push) Successful in 17m43s
Build Packages / build:rpm (rocky9) (push) Successful in 13m34s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 21m28s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m19s
Build Packages / DIALS test (push) Successful in 12m36s
Build Packages / XDS test (durin plugin) (push) Successful in 6m56s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 6m48s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m7s
Build Packages / Generate python client (push) Successful in 11s
Build Packages / Build documentation (push) Successful in 36s
Build Packages / Create release (push) Skipped
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 5m11s
* `rugnux --mode calibration` writes `<prefix>.json` beside the `.poni`, whose `dataset_settings` member is a `jfjoch_broker` `dataset_settings` body as it stands. * `rugnux` and `jfjoch_viewer` read PILATUS miniCBF sweeps natively, without conversion. * Masters written by other facilities open, including Eiger 1.x and third-party NXmx variants. * `rugnux` measures the beam centre on every run, and indexes with it when the file's value indexes nothing. * A detector swung out on a 2theta arm is placed where the file says it stands, and the calibration can hold the tilt fixed. * `rugnux` writes the unmerged MTZ by default, and a P1 merge beside it, so a wrong space group can be re-merged without reprocessing. * Significant improvements to symmetry handling in `rugnux`: the lattice, the point group, the setting and the systematic absences. * The `rugnux` report gives the resolution the CC1/2 fit reached, beside the range the reflections were written to. * The `rugnux` report gives the twinning statistics measured before the space group was decided, beside the ones measured after. * The `rugnux` report gives the strong-direction diffraction limit, and warns when CC1/2 is not monotone with resolution. * `rugnux` ranks screw axes on the evidence their absences carry, rather than on how many control reflections a candidate happens to have. * Twinning is no longer reported when the L-test contradicts it. * The `rugnux` report gives the detector tilt, the measured tilt and the direct beam beside the beam centre, and a post-refined beam centre is judged against the run's own measurement rather than the file's. * `--no-refine-tilt` holds the detector tilt at the value in the file, instead of zeroing it, when the calibration starts from the spots. * The `jfjoch_viewer` grid scan view draws the cells in the proportion of the scan steps, so the map has the shape of the scanned area. Reviewed-on: #76 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
52 lines
2.5 KiB
C++
52 lines
2.5 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include "../../common/DiffractionExperiment.h"
|
|
#include "../../common/DiffractionSpot.h"
|
|
#include "../../fpga/pcie_driver/jfjoch_fpga.h" // DeviceOutput
|
|
#include "SpotFindingSettings.h"
|
|
|
|
struct strong_pixel {
|
|
uint16_t col;
|
|
uint16_t line;
|
|
int32_t counts;
|
|
};
|
|
|
|
class StrongPixelSet {
|
|
std::vector<strong_pixel> pixels;
|
|
std::vector<uint32_t> L;
|
|
|
|
static const constexpr size_t max_strong_pixel_per_module = 4000;
|
|
static const constexpr uint32_t xpixel = RAW_MODULE_COLS;
|
|
static const constexpr uint32_t ypixel = RAW_MODULE_LINES;
|
|
|
|
uint32_t strong_pixel_count;
|
|
|
|
uint32_t find_root(uint32_t e);
|
|
uint32_t make_union(uint32_t e1, uint32_t e2);
|
|
// Labels the strong pixels and returns the components that pass BOTH the size bound and
|
|
// SpotShapeAccepted. min-pix is deliberately not applied here (see FindComponentsImage).
|
|
std::vector<DiffractionSpot> sparseccl(const SpotFindingSettings &settings);
|
|
public:
|
|
void ReadFPGAOutput(const DiffractionExperiment& experiment,
|
|
const DeviceOutput& output);
|
|
|
|
StrongPixelSet();
|
|
// Pixels MUST arrive in raster order - line ascending, and column ascending within a line. The
|
|
// component search walks the previous line with a forward-only cursor and would miss neighbours
|
|
// handed to it out of order. Both callers satisfy this by construction, each scanning a bitmap in
|
|
// ascending flat index: ImageSpotFinder::ExtractComponentsHost over the image, ReadFPGAOutput over
|
|
// a module (whose row length is a multiple of 32, so no word straddles two lines).
|
|
void AddStrongPixel(uint16_t col, uint16_t line, int32_t photons = 1);
|
|
void FindSpots(const DiffractionExperiment &experiment, const SpotFindingSettings &settings, std::vector<DiffractionSpot> &spots,
|
|
uint16_t module_number);
|
|
// Every connected component of at most max-pix pixels. min-pix is deliberately NOT applied: it is
|
|
// the only spot setting that changes between the passes of the per-image min-pix search, so one
|
|
// connected-component search serves all of them (see ImageSpotFinder::ExtractComponents).
|
|
// The caller is responsible for not handing over more than StrongPixelLimit pixels.
|
|
void FindComponentsImage(const SpotFindingSettings &settings, std::vector<DiffractionSpot> &spots);
|
|
uint32_t GetStrongPixelCount() const;
|
|
};
|