Commit 9b8dfd46 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

DetectorHistogrammer: some renaming

parent 580cdf36

src/modules/DetectorHistogrammer/DetectorHistogrammerModule.cpp

+11 −11
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void DetectorHistogrammerModule::initialize() { 
        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_global = CreateHistogram<TH2D>("hit_map_global",

                                           hit_map_title.c_str(),

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

                                           -model->getSensorSize().x() / 2,
@@ -124,11 +124,11 @@ void DetectorHistogrammerModule::initialize() { 
        "cluster_map", cluster_map_title.c_str(), xpixels, -0.5, xpixels - 0.5, ypixels, -0.5, ypixels - 0.5);



    // Create histogram of cluster map

    std::string cluster_size_mc_map_title =

    std::string cluster_size_map_local_title =

        "Cluster size as function of MCParticle impact position (" + detector_->getName() + ");x [mm];y [mm]";

    cluster_size_mc_map = CreateHistogram<TProfile2D>(

        "cluster_size_mc_map",

        cluster_size_mc_map_title.c_str(),

    cluster_size_map_local = CreateHistogram<TProfile2D>(

        "cluster_size_map_local",

        cluster_size_map_local_title.c_str(),

        static_cast<int>(model->getMatrixSize().x() / model->getPixelSize().x()) * local_inpixel_bins.x(),

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

        model->getMatrixSize().x() - model->getPixelSize().x() / 2,
@@ -410,7 +410,7 @@ void DetectorHistogrammerModule::run(Event* event) { 


            // Add pixel

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

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

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

            hit_map_local->Fill(local_pos.x(), local_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")));
@@ -519,7 +519,7 @@ void DetectorHistogrammerModule::run(Event* event) { 
            auto inPixel_um_y = static_cast<double>(Units::convert(inPixelPos.y(), "um"));



            cluster_size_map->Fill(inPixel_um_x, inPixel_um_y, static_cast<double>(clus.getSize()));

            cluster_size_mc_map->Fill(particlePos.x(), particlePos.y(), static_cast<double>(clus.getSize()));

            cluster_size_map_local->Fill(particlePos.x(), particlePos.y(), static_cast<double>(clus.getSize()));

            cluster_size_x_map->Fill(inPixel_um_x, inPixel_um_y, clusSizesXY.first);

            cluster_size_y_map->Fill(inPixel_um_x, inPixel_um_y, clusSizesXY.second);
@@ -610,13 +610,13 @@ 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 hit_map_global_histogram = hit_map_local->Merge();

    auto hit_map_local_histogram = hit_map_local->Merge();

    auto hit_map_local_mc_histogram = hit_map_local_mc->Merge();

    auto charge_map_histogram = charge_map->Merge();

    auto cluster_map_histogram = cluster_map->Merge();

    auto cluster_size_map_histogram = cluster_size_map->Merge();

    auto cluster_size_mc_map_histogram = cluster_size_mc_map->Merge();

    auto cluster_size_map_local_histogram = cluster_size_map_local->Merge();

    auto cluster_size_x_map_histogram = cluster_size_x_map->Merge();

    auto cluster_size_y_map_histogram = cluster_size_y_map->Merge();

    auto cluster_size_histogram = cluster_size->Merge();
@@ -722,7 +722,7 @@ void DetectorHistogrammerModule::finalize() { 


    cluster_map_histogram->SetOption("colz");

    cluster_size_map_histogram->SetOption("colz");

    cluster_size_mc_map_histogram->SetOption("colz");

    cluster_size_map_local_histogram->SetOption("colz");

    cluster_size_x_map_histogram->SetOption("colz");

    cluster_size_y_map_histogram->SetOption("colz");

    // Set cluster_map axis spacing
@@ -750,7 +750,7 @@ void DetectorHistogrammerModule::finalize() { 
    cluster_size_y_histogram->Write();

    cluster_map_histogram->Write();

    cluster_size_map_histogram->Write();

    cluster_size_mc_map_histogram->Write();

    cluster_size_map_local_histogram->Write();

    cluster_size_x_map_histogram->Write();

    cluster_size_y_map_histogram->Write();

src/modules/DetectorHistogrammer/DetectorHistogrammerModule.hpp

+2 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ namespace allpix { 
        ROOT::Math::XYVector track_resolution_{};



        // Histograms to output

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

        Histogram<TProfile2D> cluster_size_mc_map, cluster_size_map, cluster_size_x_map, cluster_size_y_map;

        Histogram<TH2D> hit_map, hit_map_global, hit_map_local, hit_map_local_mc, charge_map, cluster_map, polar_hit_map;

        Histogram<TProfile2D> cluster_size_map_local, 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,

            residual_y_detector;

src/modules/DetectorHistogrammer/README.md

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ For technical reasons, this offset is drawn randomly from a Gauss distribution i 
### Parameters



* `granularity`: 2D integer vector defining the number of bins along the *x* and *y* axis for in-pixel maps. Defaults to the pixel pitch in micro meters, e.g. a detector with 100um x 100um pixels would be represented in a histogram with `100 * 100 = 10000` bins.

* `granularity_local`: 2D integer vector defining the number of bins for each pixel along the *x* and *y* axis for maps in local coordinates. Defaults to `1 1` corresponding to a single bin per pixel.

* `granularity_local`: 2D integer vector defining the number of bins for each pixel along the *x* and *y* axis for maps in local coordinates where particle positions are used as reference. Defaults to `1 1` corresponding to a single bin per pixel.

* `max_cluster_charge`: Upper limit for the cluster charge histogram, defaults to `50ke`.

* `track_resolution`: Assumed track resolution the Monte Carlo truth is smeared with. Expects two values for the resolution in local-x and local-y directions and defaults to `2um 2um`.

* `matching_cut`: Required maximum matching distance between cluster position and particle position for the efficiency measurement. Expected two values and defaults to three times the pixel pitch in each dimension.