Commit 9bde703a authored by Hakan Wennlof's avatar Hakan Wennlof Committed by Simon Spannagel
Browse files

Added handling of Geant4 v11.3.0. 

There was a change in `G4WorkerRunManager` so that a function takes an argument now, breaking our override

(cherry picked from commit ab3b197b)
parent 157a30e7

src/tools/geant4/WorkerRunManager.hpp

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#ifndef ALLPIX_WORKER_RUN_MANAGER_H

#define ALLPIX_WORKER_RUN_MANAGER_H



#include <G4Version.hh>

#include <G4WorkerRunManager.hh>



namespace allpix {
@@ -85,12 +86,21 @@ namespace allpix { 
         */

        G4Event* GenerateEvent(G4int i_event) override;



#if G4VERSION_NUMBER < 1130

        /**

         * @brief Previously used to merge the partial results obtained by this manager and the master.

         *

         * Merge the run results with the master results. It will now do nothing.

         */

        void MergePartialResults() override {}

#else

        /**

         * @brief Previously used to merge the partial results obtained by this manager and the master.

         *

         * Merge the run results with the master results. It will now do nothing.

         */

        void MergePartialResults(G4bool) override {}

#endif

    };

} // namespace allpix