Commit 7a9757f2 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'dopingProfileReadFix' into 'v2.1-stable' 

Fixed offset calculation in [DopingProfileReader], and default unit in mesh_converter

See merge request allpix-squared/allpix-squared!590
parents 037198ce ddb4f24d

src/modules/DopingProfileReader/DopingProfileReaderModule.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void DopingProfileReaderModule::initialize() { 
                "shifting doping concentration map by more than one pixel (offset > 1.0) is not allowed");

        }

        LOG(DEBUG) << "Doping concentration map starts with offset " << offset << " to pixel boundary";

        std::array<double, 2> field_offset{{offset.x(), offset.y()}};

        std::array<double, 2> field_offset{{model->getPixelSize().x() * offset.x(), model->getPixelSize().y() * offset.y()}};



        auto field_data = read_field(field_scale);

        detector_->setDopingProfileGrid(

tools/mesh_converter/MeshConverter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ int main(int argc, char** argv) { 
        const auto radius_step = config.get<double>("radius_step", 0.5);

        const auto max_radius = config.get<double>("max_radius", 50);

        const auto volume_cut = config.get<double>("volume_cut", 10e-9);

        const auto units = config.get<std::string>("observable_units", "V/cm");

        const auto units = config.get<std::string>("observable_units");

        const auto vector_field = config.get<bool>("vector_field", (observable == "ElectricField"));



        XYZVectorUInt divisions;