Commit 48fce813 authored by Håkan Wennlöf's avatar Håkan Wennlöf
Browse files

Merge branch 'b-step-generator' into 'master' 

DepositionGenerator: Also register Step Hook

See merge request allpix-squared/allpix-squared!1150
parents 6f3fab8a 05e51aa7

src/modules/DepositionCosmics/DepositionCosmicsModule.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <G4Box.hh>

#include <G4LogicalVolume.hh>



#include "../DepositionGeant4/ActionInitializationG4.hpp"

#include "modules/DepositionGeant4/ActionInitializationG4.hpp"



#include <filesystem>

#include <sstream>

src/modules/DepositionCosmics/DepositionCosmicsModule.hpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef ALLPIX_COSMICS_DEPOSITION_MODULE_H

#define ALLPIX_COSMICS_DEPOSITION_MODULE_H



#include "../DepositionGeant4/DepositionGeant4Module.hpp"

#include "modules/DepositionGeant4/DepositionGeant4Module.hpp"



#include <mutex>

src/modules/DepositionGenerator/ActionInitializationPrimaries.hpp

+5 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


#include "core/config/Configuration.hpp"



#include "../DepositionGeant4/SetTrackInfoUserHookG4.hpp"

#include "modules/DepositionGeant4/SetTrackInfoUserHookG4.hpp"

#include "modules/DepositionGeant4/StepInfoUserHookG4.hpp"



namespace allpix {

    class PrimariesReader;
@@ -43,6 +44,9 @@ namespace allpix { 


            // tracker hook

            SetUserAction(new SetTrackInfoUserHookG4());



            // step hook

            SetUserAction(new StepInfoUserHookG4());

        };



    private:

src/modules/DepositionGenerator/DepositionGeneratorModule.hpp

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
#ifndef ALLPIX_GENERATOR_DEPOSITION_MODULE_H

#define ALLPIX_GENERATOR_DEPOSITION_MODULE_H



#include "../DepositionGeant4/DepositionGeant4Module.hpp"

#include "PrimariesReader.hpp"

#include "modules/DepositionGeant4/DepositionGeant4Module.hpp"



namespace allpix {

    /**