mx/Jungfraujoch
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 53 Wiki Activity

Improve plotting

Browse Source
This commit is contained in:
leonarski_f
2024-03-31 23:08:19 +02:00
parent 8cad89d649
commit 30e775d8a2
122 changed files with 4640 additions and 1149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acquisition_device/HLSSimulatedDevice.cpp
+20 -15
View File
@@ -278,6 +278,7 @@ void HLSSimulatedDevice::HLSMainThread() {
STREAM_768 stream_768_2;
STREAM_768 stream_768_3;
STREAM_768 stream_768_4;
STREAM_768 stream_768_5;
STREAM_512 data_0;
hls::stream<ap_axiu<512, 1, 1, 1>, 2> data_1;
@@ -290,7 +291,6 @@ void HLSSimulatedDevice::HLSMainThread() {
STREAM_512 data_8;
STREAM_512 data_9;
STREAM_512 data_10;
STREAM_576 data_11;
STREAM_512 data_12;
STREAM_512 data_13;
@@ -480,7 +480,7 @@ void HLSSimulatedDevice::HLSMainThread() {
hls_cores.emplace_back([&] { eiger_reorder(data_8, data_9, axi_compl[5], axi_compl[6]);});
// 6. Apply pedestal & gain corrections
hls_cores.emplace_back([&] { jf_conversion(data_9, data_11,
hls_cores.emplace_back([&] { jf_conversion(data_9, stream_768_0,
axi_compl[6], axi_compl[7],
hbm.data(),
hbm.data(),
@@ -497,10 +497,10 @@ void HLSSimulatedDevice::HLSMainThread() {
hbm_if_size); });
// 7. Frame summation
hls_cores.emplace_back([&] { frame_summation(data_11, stream_768_0, axi_compl[7], axi_compl[8], frame_summation_idle);});
hls_cores.emplace_back([&] { frame_summation(stream_768_0, stream_768_1, axi_compl[7], axi_compl[8], frame_summation_idle);});
// 8. Integration of pixels
hls_cores.emplace_back([&] { integration(stream_768_0, stream_768_1, integration_result_0, axi_compl[8], axi_compl[9],
hls_cores.emplace_back([&] { integration(stream_768_1, stream_768_2, integration_result_0, axi_compl[8], axi_compl[9],
hbm.data(), hbm.data(), hbm.data(), hbm.data(), integration_idle, hbm_if_size);});
hls_cores.emplace_back([&] { axis_64_to_512(integration_result_0, integration_result_1);});
@@ -512,8 +512,8 @@ void HLSSimulatedDevice::HLSMainThread() {
ap_uint<32> min_pix_per_spot = spot_finder_parameters.min_pix_per_spot;
hls_cores.emplace_back([&] {
spot_finder_mask(stream_768_1,
stream_768_2,
spot_finder_mask(stream_768_2,
stream_768_3,
spot_finder_mask_0,
axi_compl[9],
axi_compl[10],
@@ -526,7 +526,7 @@ void HLSSimulatedDevice::HLSMainThread() {
});
hls_cores.emplace_back([&] {
spot_finder(stream_768_2, spot_finder_mask_0, stream_768_3, spot_finder_result_0, tmp_count_threshold, tmp_snr_threshold);
spot_finder(stream_768_3, spot_finder_mask_0, stream_768_4, spot_finder_result_0, tmp_count_threshold, tmp_snr_threshold);
logger_hls.Info("spot_finder done");
});
@@ -546,8 +546,8 @@ void HLSSimulatedDevice::HLSMainThread() {
});
hls_cores.emplace_back([&] {
roi_calc(stream_768_3,
stream_768_4,
roi_calc(stream_768_4,
stream_768_5,
roi_calc_result_0,
axi_compl[10],
axi_compl[11],
@@ -558,7 +558,7 @@ void HLSSimulatedDevice::HLSMainThread() {
});
// 10. Reduce/extend 24-bit stream
hls_cores.emplace_back([&] { stream_24bit_conv(stream_768_4, data_12, stream_conv_idle);});
hls_cores.emplace_back([&] { stream_24bit_conv(stream_768_5, data_12, stream_conv_idle);});
// 11. Prepare data to write to host memory
hls_cores.emplace_back([&] {
@@ -618,8 +618,7 @@ void HLSSimulatedDevice::HLSMainThread() {
if (!data_10.empty())
throw std::runtime_error("data_10 queue not empty");
if (!data_11.empty())
throw std::runtime_error("data_11 queue not empty");
if (!data_12.empty())
throw std::runtime_error("data_12 queue not empty");
@@ -633,13 +632,19 @@ void HLSSimulatedDevice::HLSMainThread() {
}
if (!stream_768_0.empty())
throw std::runtime_error("Stream_768_0 queue not empty");
throw std::runtime_error("stream_768_0 queue not empty");
if (!stream_768_1.empty())
throw std::runtime_error("Stream_768_1 queue not empty");
throw std::runtime_error("stream_768_1 queue not empty");
if (!stream_768_2.empty())
throw std::runtime_error("Stream_768_2 queue not empty");
throw std::runtime_error("stream_768_2 queue not empty");
if (!stream_768_3.empty())
throw std::runtime_error("stream_768_3 queue not empty");
if (!stream_768_4.empty())
throw std::runtime_error("stream_768_4 queue not empty");
if (!hbm_handles.empty())
throw std::runtime_error("Handles queue not empty");