4878318c27
Build Packages / Unit tests (push) Successful in 1h17m4s
Build Packages / Generate python client (push) Successful in 1m24s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m34s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 12m37s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m4s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m59s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 13m4s
Build Packages / build:rpm (rocky8) (push) Successful in 13m12s
Build Packages / XDS test (durin plugin) (push) Successful in 9m57s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m52s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m30s
Build Packages / build:rpm (rocky9) (push) Successful in 13m59s
Build Packages / Build documentation (push) Successful in 1m7s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m24s
Build Packages / Create release (push) Has been skipped
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m54s
Build Packages / DIALS test (push) Successful in 13m14s
This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.132. * jfjoch_broker: Further reduce startup time for DECTRIS detectors by selectively modifying SIMPLON parameters on `/start` * jfjoch_broker: Further reduce startup time for DECTRIS detectors by not setting beam center and detector distance via SIMPLON API on '/start' * jfjoch_broker: Add an extra message to ZeroMQ puller ready to monitor Lite worklow preparation time * jfjoch_broker: Image buffer configuration is postponed for Lite receiver flow till start message is received * jfjoch_broker: Use nanoseconds internally for frame/image/readout time * jfjoch_broker: Extra messages added for receiver operation (to be removed after debugging finished) * jfojch_broker: Improve profiling of different data analysis steps * jfjoch_broker: Record integration reflection count * jfjoch_broker: Fix bug where ZeroMQ preview frequency was confusing time units (micro vs. milliseconds) * jfjoch_broker: Fix bug where '/wait_till_done' got deadlocked * jfjoch_writer: Fix confusion between NaN and zero in floating-point datasets **Breaking changes**: detector definition is now using nanoseconds to define minimum frame time, minimum count time and readout time. Reviewed-on: #49
129 lines
4.6 KiB
C++
129 lines
4.6 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "MXAnalysisAfterFPGA.h"
|
|
#include "spot_finding/DetModuleSpotFinder_cpu.h"
|
|
#include "../common/CUDAWrapper.h"
|
|
#include "spot_finding/SpotUtils.h"
|
|
#include "bragg_prediction/BraggPredictionFactory.h"
|
|
|
|
double stddev(const std::vector<float> &v) {
|
|
if (v.size() <= 1)
|
|
return 0.0;
|
|
|
|
double mean = 0.0f;
|
|
|
|
for (const auto &i: v)
|
|
mean += i;
|
|
mean /= v.size();
|
|
|
|
double stddev = 0.0f;
|
|
for (const auto &i: v)
|
|
stddev += (i - mean) * (i - mean);
|
|
|
|
return sqrt(stddev / (v.size() - 1));
|
|
}
|
|
|
|
|
|
MXAnalysisAfterFPGA::MXAnalysisAfterFPGA(const DiffractionExperiment &in_experiment, IndexAndRefine &indexer)
|
|
: experiment(in_experiment),
|
|
indexer(indexer),
|
|
prediction(CreateBraggPrediction(experiment.IsRotationIndexing())) {
|
|
if (experiment.IsSpotFindingEnabled())
|
|
find_spots = true;
|
|
}
|
|
|
|
void MXAnalysisAfterFPGA::ReadFromFPGA(const DeviceOutput *output, const SpotFindingSettings &settings, size_t module_number) {
|
|
if (state == State::Disabled || !find_spots || !settings.enable) {
|
|
state = State::Disabled;
|
|
} else {
|
|
const auto t0 = std::chrono::steady_clock::now();
|
|
StrongPixelSet strong_pixel_set;
|
|
strong_pixel_set.ReadFPGAOutput(experiment, *output);
|
|
strong_pixel_set.FindSpots(experiment, settings, spots, module_number);
|
|
const auto t1 = std::chrono::steady_clock::now();
|
|
spot_finding_time_total += (t1 - t0);
|
|
spot_finding_timing_active = true;
|
|
|
|
state = State::Enabled;
|
|
}
|
|
}
|
|
|
|
void MXAnalysisAfterFPGA::ReadFromCPU(DeviceOutput *output, const SpotFindingSettings &settings, size_t module_number) {
|
|
std::unique_lock ul(read_from_cpu_mutex);
|
|
|
|
if (state == State::Disabled || !find_spots || !settings.enable) {
|
|
state = State::Disabled;
|
|
} else {
|
|
const auto t0 = std::chrono::steady_clock::now();
|
|
|
|
state = State::Enabled;
|
|
|
|
std::vector<float> d_map(RAW_MODULE_SIZE);
|
|
|
|
experiment.CalcSpotFinderResolutionMap(d_map.data(), module_number);
|
|
|
|
arr_mean.resize(RAW_MODULE_SIZE);
|
|
arr_sttdev.resize(RAW_MODULE_SIZE);
|
|
arr_valid_count.resize(RAW_MODULE_SIZE);
|
|
arr_strong_pixel.resize(RAW_MODULE_SIZE);
|
|
|
|
if (experiment.GetByteDepthImage() == 2)
|
|
FindSpots(*output,
|
|
settings,
|
|
d_map.data(),
|
|
arr_mean.data(),
|
|
arr_sttdev.data(),
|
|
arr_valid_count.data(),
|
|
arr_strong_pixel.data());
|
|
else if (experiment.GetByteDepthImage() == 4)
|
|
FindSpots<int32_t>(*output,
|
|
settings,
|
|
d_map.data(),
|
|
arr_mean.data(),
|
|
arr_sttdev.data(),
|
|
arr_valid_count.data(),
|
|
arr_strong_pixel.data());
|
|
else if (experiment.GetByteDepthImage() == 1)
|
|
FindSpots<int8_t>(*output,
|
|
settings,
|
|
d_map.data(),
|
|
arr_mean.data(),
|
|
arr_sttdev.data(),
|
|
arr_valid_count.data(),
|
|
arr_strong_pixel.data());
|
|
|
|
StrongPixelSet strong_pixel_set;
|
|
strong_pixel_set.ReadFPGAOutput(experiment, *output);
|
|
strong_pixel_set.FindSpots(experiment, settings, spots, module_number);
|
|
|
|
const auto t1 = std::chrono::steady_clock::now();
|
|
spot_finding_time_total += (t1 - t0);
|
|
spot_finding_timing_active = true;
|
|
}
|
|
}
|
|
|
|
void MXAnalysisAfterFPGA::Process(DataMessage &message, const SpotFindingSettings& spot_finding_settings) {
|
|
if (find_spots && (state == State::Enabled)) {
|
|
const auto t0 = std::chrono::steady_clock::now();
|
|
SpotAnalyze(experiment, spot_finding_settings, spots, message);
|
|
const auto t1 = std::chrono::steady_clock::now();
|
|
spot_finding_time_total += (t1 - t0);
|
|
|
|
if (spot_finding_settings.indexing)
|
|
indexer.ProcessImage(message, spot_finding_settings, message.image, *prediction);
|
|
}
|
|
|
|
if (spot_finding_timing_active) {
|
|
// total spot-finding time for the whole image
|
|
message.spot_finding_time_s = spot_finding_time_total.count() / 1e6;
|
|
|
|
// report/store ms here
|
|
spot_finding_time_total = std::chrono::duration<double, std::micro>{0.0};
|
|
spot_finding_timing_active = false;
|
|
}
|
|
|
|
spots.clear();
|
|
state = State::Idle;
|
|
}
|