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

ProcessJFPacket: Doesn't include JF conversion

Browse Source
This commit is contained in:
leonarski_f
2023-04-07 13:21:06 +02:00
parent 2c9d97c198
commit bffaa17bcd
4 changed files with 34 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/JFCalibrationPerfTest.cpp
+4 -53
View File
@@ -151,19 +151,11 @@ template <class T> void test_conversion_with_geom(Logger &logger) {
ntries * nframes * nmodules * RAW_MODULE_SIZE * sizeof(uint16_t) * 1000 * 1000/ ((double) elapsed.count() * 1024 * 1024 * 1024));
}
void process_thread(std::vector<jf_raw_packet> *packets, ProcessJFPacket *process,
uint32_t stride, uint32_t start) {
for (uint32_t i = start; i < packets->size(); i += stride)
process->ProcessPacket(&packets->at(i).jf, packets->at(i).ipv4_header_sour_ip);
}
void test_packet_processing(Logger &logger, uint32_t nthreads, bool conversion) {
void test_packet_processing(Logger &logger) {
size_t nframes = 128;
int64_t nmodules = 8;
int64_t ntries = 8;
DiffractionExperiment x(1,{nmodules});
std::vector<jf_raw_packet> packets(nframes * nmodules * 128);
std::vector<uint16_t> output(nframes * nmodules * CONVERTED_MODULE_SIZE);
@@ -182,48 +174,19 @@ void test_packet_processing(Logger &logger, uint32_t nthreads, bool conversion)
}
}
std::vector<JFConversionFixedPoint> v(nmodules);
JFModuleGainCalibration gain_calib = GainCalibrationFromTestFile();
for (int m = 0; m < nmodules; m++) {
JFModulePedestal pedestal_g0;
JFModulePedestal pedestal_g1;
JFModulePedestal pedestal_g2;
for (int i = 0; i < RAW_MODULE_SIZE; i++) {
pedestal_g0.GetPedestal()[i] = 3000 + i % 50 + m * 135;
pedestal_g1.GetPedestal()[i] = 15000 + i % 50 - m * 135;
pedestal_g2.GetPedestal()[i] = 14000 + i % 50 - m * 135;
}
v[m].Setup(gain_calib, pedestal_g0, pedestal_g1, pedestal_g2, 12.4);
}
x.Mode(DetectorMode::Conversion);
logger.Info("JF FP conversion input prepared");
auto start_time = std::chrono::system_clock::now();
for (int z = 0; z < ntries; z++) {
ThreadSafeFIFO<Completion> c;
ThreadSafeFIFO<ProcessWorkRequest> wr;
ProcessJFPacket process(c, wr, nmodules);
if (conversion) {
for (int i = 0; i < nmodules; i++)
process.RegisterConversion(i, &v[i]);
}
for (uint32_t i = 0; i < nmodules * nframes; i++)
wr.Put(ProcessWorkRequest{
.ptr = output.data() + i * RAW_MODULE_SIZE,
.handle = i
});
{
std::vector<std::future<void>> futures;
for (int i = 0; i < nthreads; i++)
futures.emplace_back(std::async(std::launch::async, &process_thread, &packets, &process, nthreads, i));
}
for (auto &packet: packets)
process.ProcessPacket(&packet.jf, packet.ipv4_header_sour_ip);
}
auto end_time = std::chrono::system_clock::now();
auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(end_time - start_time);
@@ -245,18 +208,6 @@ int main () {
logger.Info("Fixed point conversion (with geom)");
test_conversion_with_geom<JFConversionFixedPoint>(logger);
logger.Info("Packet processing with conversion (1 thread)");
test_packet_processing(logger, 1, true);
logger.Info("Packet processing with conversion (2 threads)");
test_packet_processing(logger, 2, true);
logger.Info("Packet processing with conversion (4 threads)");
test_packet_processing(logger, 4, true);
logger.Info("Packet processing with conversion (8 threads)");
test_packet_processing(logger, 8, true);
logger.Info("Packet processing without conversion");
test_packet_processing(logger, 1, false);
test_packet_processing(logger);
}