Merge branch 'panel-s3' into panel-s5

# Conflicts:
#	common/CMakeLists.txt
#	tests/PanelLayoutTest.cpp
This commit is contained in:
leonarski_f committed 2026-10-21 11:27:31 +02:00
commit 648ae8f0d5
26 files changed
+792 -188

No files matched your search

+6
View File
@@ -106,6 +106,11 @@ MXAnalysisWithoutFPGA::MXAnalysisWithoutFPGA(const DiffractionExperiment &in_exp
}
adaptiveSpotFinder = std::move(cpu);
}
// The panels the image is made of: the spot finders' windows and components, and the squares read
// about a spot, stay inside one (one, the whole image, without a module table).
adaptiveSpotFinder->SetPanels(experiment.GetModules());
preprocessor_buffer->SetPanels(PanelBoxes(experiment.GetModules(), experiment.GetXPixelsNum(),
experiment.GetYPixelsNum()));
}
void MXAnalysisWithoutFPGA::Analyze(DataMessage &output,
@@ -387,6 +392,7 @@ ImageSpotFinder &MXAnalysisWithoutFPGA::FixedThresholdFinder() {
#endif
spotFinder = std::make_unique<ImageSpotFinderCPU>(experiment.GetXPixelsNum(),
experiment.GetYPixelsNum());
spotFinder->SetPanels(experiment.GetModules());
// It missed every mask update that happened before it existed, so it takes the current one
// now. Without this it would find spots outside the resolution limits.
if (mask_resolution)