Commit bf6467a1 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'p-shared_ptr-ref' into 'master' 

Unify use of std::shared_ptr in module constructor

See merge request allpix-squared/allpix-squared!903
parents 7fe2e956 0791ad4c

etc/scripts/make_module.sh

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ if [ "$type" = 2 ]; then 
    command="sed ${opt} \

        -e 's/GeometryManager\* geo_manager/std::shared\_ptr\<Detector\> detector/g' \

        -e 's/Module(config)/Module\(config\, detector\)/g' \

        -e 's/geo_manager_(geo_manager)/detector_(detector)/g' \

        -e 's/geo_manager_(geo_manager)/detector_(std::move(detector))/g' \

        -e 's/bindMulti/bindSingle/g' \

        -e '/for(auto/d' \

        -e 's/\s\{8\}/\ \ \ \ /' \

src/modules/InducedTransfer/InducedTransferModule.cpp

+2 −4
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ 
using namespace allpix;

using namespace ROOT::Math;



InducedTransferModule::InducedTransferModule(Configuration& config,

                                             Messenger* messenger,

                                             const std::shared_ptr<Detector>& detector)

    : Module(config, detector), messenger_(messenger), detector_(detector) {

InducedTransferModule::InducedTransferModule(Configuration& config, Messenger* messenger, std::shared_ptr<Detector> detector)

    : Module(config, detector), messenger_(messenger), detector_(std::move(detector)) {

    // Enable multithreading of this module if multithreading is enabled

    allow_multithreading();

src/modules/InducedTransfer/InducedTransferModule.hpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ namespace allpix { 
         * @param messenger Pointer to the messenger object to allow binding to messages on the bus

         * @param detector Pointer to the detector for this module instance

         */

        InducedTransferModule(Configuration& config, Messenger* messenger, const std::shared_ptr<Detector>& detector);

        InducedTransferModule(Configuration& config, Messenger* messenger, std::shared_ptr<Detector> detector);



        /**

         * @brief Initial check for the presence of a weighting potential

src/modules/PulseTransfer/PulseTransferModule.cpp

+2 −4
Original line number Diff line number Diff line
@@ -24,10 +24,8 @@ 


using namespace allpix;



PulseTransferModule::PulseTransferModule(Configuration& config,

                                         Messenger* messenger,

                                         const std::shared_ptr<Detector>& detector)

    : Module(config, detector), messenger_(messenger), detector_(detector) {

PulseTransferModule::PulseTransferModule(Configuration& config, Messenger* messenger, std::shared_ptr<Detector> detector)

    : Module(config, detector), messenger_(messenger), detector_(std::move(detector)) {



    // Set default value for config variables

    config_.setDefault("max_depth_distance", Units::get(5.0, "um"));

src/modules/PulseTransfer/PulseTransferModule.hpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ namespace allpix { 
         * @param messenger Pointer to the messenger object to allow binding to messages on the bus

         * @param detector Pointer to the detector for this module instance

         */

        PulseTransferModule(Configuration& config, Messenger* messenger, const std::shared_ptr<Detector>& detector);

        PulseTransferModule(Configuration& config, Messenger* messenger, std::shared_ptr<Detector> detector);



        /**

         * @brief Initialize optional ROOT histograms