Commit 6b138008 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Adjust HexagonaPixelDetector model to assemblies

parent f30a58f4

src/core/geometry/DetectorModel.cpp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "DetectorModel.hpp"

#include "core/module/exceptions.h"



#include "core/geometry/HexagonalPixelDetectorModel.hpp"

#include "core/geometry/PixelDetectorModel.hpp"

#include "core/geometry/RadialStripDetectorModel.hpp"

src/core/geometry/HexagonalPixelDetectorModel.cpp

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


using namespace allpix;



HexagonalPixelDetectorModel::HexagonalPixelDetectorModel(std::string type, const ConfigReader& reader)

    : PixelDetectorModel(std::move(type), reader) {

HexagonalPixelDetectorModel::HexagonalPixelDetectorModel(std::string type,

                                                         const std::shared_ptr<DetectorAssembly>& assembly,

                                                         const ConfigReader& reader)

    : PixelDetectorModel(std::move(type), assembly, reader) {

    auto config = reader.getHeaderConfiguration();



    // Select shape orientation

src/core/geometry/HexagonalPixelDetectorModel.hpp

+6 −3
Original line number Diff line number Diff line
@@ -28,9 +28,12 @@ namespace allpix { 
        /**

         * @brief constructor of a hexagonal pixel detector model

         * @param type   Name of the model type

         * @param assembly Detector assembly object with information about ASIC and packaging

         * @param reader Configuration reader with description of the model

         */

        explicit HexagonalPixelDetectorModel(std::string type, const ConfigReader& reader);

        explicit HexagonalPixelDetectorModel(std::string type,

                                             const std::shared_ptr<DetectorAssembly>& assembly,

                                             const ConfigReader& reader);



        /**

         * @brief Essential virtual destructor