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

Merge branch 'globalhitmap' into 'master' 

DetectorHistogrammer: Add Hitmap in Global Coordinates

See merge request allpix-squared/allpix-squared!630
parents 4844394d 690f1903

src/modules/DetectorHistogrammer/DetectorHistogrammerModule.cpp

+14 −0
Original line number Diff line number Diff line
@@ -69,6 +69,16 @@ void DetectorHistogrammerModule::initialize() { 
    hit_map =

        CreateHistogram<TH2D>("hit_map", hit_map_title.c_str(), xpixels, -0.5, xpixels - 0.5, ypixels, -0.5, ypixels - 0.5);



    std::string hit_map_global_title = "Hitmap (" + detector_->getName() + ")  in global coord.;x [mm];y [mm];hits";

    hit_global_map = CreateHistogram<TH2D>("hit_map_global",

                                           hit_map_title.c_str(),

                                           static_cast<int>(model->getSensorSize().x()) * 10,

                                           -model->getSensorSize().x() / 2,

                                           model->getSensorSize().x() / 2,

                                           static_cast<int>(model->getSensorSize().y()) * 10,

                                           -model->getSensorSize().y() / 2,

                                           model->getSensorSize().y() / 2);



    std::string charge_map_title = "Pixel charge map (" + detector_->getName() + ");x (pixels);y (pixels); charge [ke]";

    charge_map = CreateHistogram<TH2D>(

        "charge_map", charge_map_title.c_str(), xpixels, -0.5, xpixels - 0.5, ypixels, -0.5, ypixels - 0.5);
@@ -344,9 +354,11 @@ void DetectorHistogrammerModule::run(Event* event) { 
        // Fill 2D hitmap histogram

        for(const auto& pixel_hit : pixels_message->getData()) {

            auto pixel_idx = pixel_hit.getPixel().getIndex();

            auto global_pos = pixel_hit.getPixel().getGlobalCenter();



            // Add pixel

            hit_map->Fill(pixel_idx.x(), pixel_idx.y());

            hit_global_map->Fill(global_pos.x(), global_pos.y());

            charge_map->Fill(pixel_idx.x(), pixel_idx.y(), static_cast<double>(Units::convert(pixel_hit.getSignal(), "ke")));

            pixel_charge->Fill(static_cast<double>(Units::convert(pixel_hit.getSignal(), "ke")));

            // For radial_strip models also fill the polar hit map
@@ -537,6 +549,7 @@ void DetectorHistogrammerModule::finalize() { 


    // Merge histograms that were possibly filled in parallel in order to change drawing options on the final object

    auto hit_map_histogram = hit_map->Merge();

    auto hit_map_global_histogram = hit_global_map->Merge();

    auto charge_map_histogram = charge_map->Merge();

    auto cluster_map_histogram = cluster_map->Merge();

    auto cluster_size_map_histogram = cluster_size_map->Merge();
@@ -655,6 +668,7 @@ void DetectorHistogrammerModule::finalize() { 
    event_size_histogram->Write();

    n_cluster_histogram->Write();

    hit_map_histogram->Write();

    hit_map_global_histogram->Write();



    getROOTDirectory()->mkdir("cluster_size")->cd();

    cluster_size_histogram->Write();

src/modules/DetectorHistogrammer/DetectorHistogrammerModule.hpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ namespace allpix { 
        ROOT::Math::XYVector track_resolution_{};



        // Histograms to output

        Histogram<TH2D> hit_map, charge_map, cluster_map, polar_hit_map;

        Histogram<TH2D> hit_map, hit_global_map, charge_map, cluster_map, polar_hit_map;

        Histogram<TProfile2D> cluster_size_map, cluster_size_x_map, cluster_size_y_map;

        Histogram<TProfile2D> cluster_charge_map, seed_charge_map;

        Histogram<TProfile2D> residual_map, residual_x_map, residual_y_map, residual_detector, residual_x_detector,