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

Merge branch 'pixelcenter' into 'master' 

Redefine Position of PixelCenter

See merge request allpix-squared/allpix-squared!580
parents e9befac2 442766d5

src/core/geometry/DetectorModel.cpp

+1 −3
Original line number Diff line number Diff line
@@ -239,9 +239,7 @@ ROOT::Math::XYZPoint DetectorModel::getPixelCenter(unsigned int x, unsigned int 
    auto size = getPixelSize();

    auto local_x = size.x() * x;

    auto local_y = size.y() * y;

    auto local_z = getSensorCenter().z() - getSensorSize().z() / 2.0;



    return {local_x, local_y, local_z};

    return {local_x, local_y, 0};

}



std::pair<int, int> DetectorModel::getPixelIndex(const ROOT::Math::XYZPoint& position) const {

src/modules/DopingProfileReader/DopingProfileReaderModule.cpp

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ void DopingProfileReaderModule::create_output_plots() { 


    // If we need to plot a single pixel, we use size and position of the pixel at the origin

    auto single_pixel = config_.get<bool>("output_plots_single_pixel", true);

    auto center = (single_pixel ? ROOT::Math::XYZPoint(model->getPixelCenter(0, 0).x(), model->getPixelCenter(0, 0).y(), 0)

                                : model->getSensorCenter());

    auto center = (single_pixel ? model->getPixelCenter(0, 0) : model->getSensorCenter());

    auto size =

        (single_pixel

             ? ROOT::Math::XYZVector(model->getPixelSize().x(), model->getPixelSize().y(), model->getSensorSize().z())

src/modules/ElectricFieldReader/ElectricFieldReaderModule.cpp

+1 −2
Original line number Diff line number Diff line
@@ -337,8 +337,7 @@ void ElectricFieldReaderModule::create_output_plots() { 


    // If we need to plot a single pixel, we use size and position of the pixel at the origin

    auto single_pixel = config_.get<bool>("output_plots_single_pixel", true);

    auto center = (single_pixel ? ROOT::Math::XYZPoint(model->getPixelCenter(0, 0).x(), model->getPixelCenter(0, 0).y(), 0)

                                : model->getSensorCenter());

    auto center = (single_pixel ? model->getPixelCenter(0, 0) : model->getSensorCenter());

    auto size =

        (single_pixel

             ? ROOT::Math::XYZVector(model->getPixelSize().x(), model->getPixelSize().y(), model->getSensorSize().z())