Commit d7572940 authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'perfomance' into 'master' 

PulseTransfer: Speed Up Processing for Large Events by Factor > x50

See merge request allpix-squared/allpix-squared!703
parents f217b6df f52731d1

src/modules/PulseTransfer/PulseTransferModule.cpp

+9 −11
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "core/utils/log.h"

#include "objects/PixelCharge.hpp"



#include <set>

#include <string>

#include <utility>
@@ -96,7 +97,7 @@ void PulseTransferModule::run(Event* event) { 


    // Create map for all pixels: pulse and propagated charges

    std::map<Pixel::Index, Pulse> pixel_pulse_map;

    std::map<Pixel::Index, std::vector<const PropagatedCharge*>> pixel_charge_map;

    std::map<Pixel::Index, std::set<const PropagatedCharge*>> pixel_charge_map;



    LOG(DEBUG) << "Received " << propagated_message->getData().size() << " propagated charge objects.";

    for(const auto& propagated_charge : propagated_message->getData()) {
@@ -156,11 +157,8 @@ void PulseTransferModule::run(Event* event) { 
            }

            pixel_pulse_map[pixel_index] += pulse;



            auto px = pixel_charge_map[pixel_index];

            // For each pulse, store the corresponding propagated charges to preserve history:

            if(std::find(px.begin(), px.end(), &propagated_charge) == px.end()) {

                pixel_charge_map[pixel_index].emplace_back(&propagated_charge);

            }

            pixel_charge_map[pixel_index].emplace(&propagated_charge);

        } else {

            LOG(TRACE) << "Found pulse information";

            LOG_ONCE(INFO) << "Pulses available - settings \"timestep\", \"max_depth_distance\" and "
@@ -170,17 +168,15 @@ void PulseTransferModule::run(Event* event) { 
                // Accumulate all pulses from input message data:

                pixel_pulse_map[pixel_index] += pulse;



                auto px = pixel_charge_map[pixel_index];

                // For each pulse, store the corresponding propagated charges to preserve history:

                if(std::find(px.begin(), px.end(), &propagated_charge) == px.end()) {

                    pixel_charge_map[pixel_index].emplace_back(&propagated_charge);

                }

                pixel_charge_map[pixel_index].emplace(&propagated_charge);

            }

        }

    }



    // Create vector of pixel pulses to return for this detector

    std::vector<PixelCharge> pixel_charges;

    pixel_charges.reserve(pixel_pulse_map.size());

    Pulse total_pulse;

    for(auto& [index, pulse] : pixel_pulse_map) {

        // Sum all pulses for informational output:
@@ -208,10 +204,12 @@ void PulseTransferModule::run(Event* event) { 
        if(output_pulsegraphs_) {

            create_pulsegraphs(event->number, index, pulse);

        }

        LOG(DEBUG) << "Charge on pixel " << index << " has " << pixel_charge_map[index].size() << " ancestors";



        // Store the pulse:

        pixel_charges.emplace_back(detector_->getPixel(index), std::move(pulse), pixel_charge_map[index]);

        std::vector<const PropagatedCharge*> pixel_charge_vec(pixel_charge_map[index].begin(),

                                                              pixel_charge_map[index].end());

        LOG(DEBUG) << "Charge on pixel " << index << " has " << pixel_charge_vec.size() << " ancestors";

        pixel_charges.emplace_back(detector_->getPixel(index), std::move(pulse), std::move(pixel_charge_vec));

    }



    if(output_pulsegraphs_) {

src/modules/PulseTransfer/tests/02-pseudopulse-ancestors.conf

0 → 100644
+30 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2017-2022 CERN and the Allpix Squared authors

# SPDX-License-Identifier: MIT



#DESC tests the calculation of induced signals based on the arrival time of charge carriers at the sensor surface.

[Allpix]

detectors_file = "detector.conf"

number_of_events = 1

random_seed = 0



[DepositionPointCharge]

model = "fixed"

source_type = "point"

position = 445um 220um 0um

number_of_charges = 20



[ElectricFieldReader]

model = "linear"

bias_voltage = 100V

depletion_voltage = 150V



[GenericPropagation]

temperature = 293K

charge_per_step = 1

propagate_electrons = false

propagate_holes = true



[PulseTransfer]

log_level = TRACE



#PASS [R:PulseTransfer:mydetector] Charge on pixel (2,0) has 15 ancestors