Commit 9d2a26a6 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by Generic Bliss account for Control Software
Browse files

[SMX] Move cl_source_path from fai_params to gpu_params

parent 5866b65e
......@@ -52,12 +52,16 @@ namespace processing::pipelines
(doc, "A vector of ROIs for the counters"))
// clang-format on
BOOST_DESCRIBE_STRUCT(gpu_params, (), (device_idx))
BOOST_DESCRIBE_STRUCT(gpu_params, (), (device_idx, cl_source_path))
// clang-format off
BOOST_ANNOTATE_MEMBER(gpu_params, device_idx,
(desc, "device idx"),
(doc, "The index of the GPU device in the list of OpenCL 1.2 devices"))
BOOST_ANNOTATE_MEMBER(gpu_params, cl_source_path,
(desc, "cl_source_path"),
(doc, "The path to the OpenCL kernels"))
// clang-format on
BOOST_DESCRIBE_STRUCT(gain_pedestal_params, (), (gain_path, pedestal_path, photon_energy))
......@@ -80,7 +84,7 @@ namespace processing::pipelines
(error_model, variance_path, mask_path, dark_path, dark_variance_path, flat_path,
solid_angle_path, polarization_path, absorption_path, dummy, delta_dummy,
normalization_factor, csr_path, cutoff_clip, cycle, radius2d_path, radius1d_path, noise,
cutoff_pick, acc_update_freq, cl_source_path))
cutoff_pick, acc_update_freq))
// clang-format off
BOOST_ANNOTATE_MEMBER(fai_params, error_model,
......@@ -162,10 +166,6 @@ namespace processing::pipelines
BOOST_ANNOTATE_MEMBER(fai_params, acc_update_freq,
(desc, "acc update freq"),
(doc, "The number of frames when the accumulators are transferred to host"))
BOOST_ANNOTATE_MEMBER(fai_params, cl_source_path,
(desc, "cl_source_path"),
(doc, "The path to the OpenCL kernels"))
// clang-format on
BOOST_DESCRIBE_STRUCT(saving_params, (io::h5::saving_params), (enabled))
......
......@@ -42,6 +42,7 @@ namespace processing::pipelines
struct gpu_params
{
std::size_t device_idx = 0;
std::filesystem::path cl_source_path = "detectors/processing/psi/src"; // CL source file path
};
struct gain_pedestal_params
......@@ -74,7 +75,6 @@ namespace processing::pipelines
float noise = 0.0f; //
float cutoff_pick = 0.0f; //
int acc_update_freq = 0; //
std::filesystem::path cl_source_path = "detectors/processing/psi/src"; // CL source file path
};
struct saving_params : io::h5::saving_params
......
......@@ -124,7 +124,7 @@ namespace processing::pipelines
auto&& [dense_x, dense_y] = frame_info.dimensions();
peak_finder.emplace(m_graph, dense_x, dense_y, frame_info.pixel_type(), params,
proc_params.fai.cl_source_path, context, queue);
proc_params.gpu.cl_source_path, context, queue);
checkpoint_peak_finder.emplace(m_graph, tbb::flow::unlimited, m_nb_frames_sparsified);
peak_counter.emplace(m_graph, tbb::flow::unlimited, [](auto ptr) { return ptr->peak_indices.size(); });
peak_counters_buffer.emplace(m_graph, tbb::flow::unlimited, m_peak_counters_buffer,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment