diff --git a/benchmarks/b0_tracker/scripts/b0_tracker_hits.cxx b/benchmarks/b0_tracker/scripts/b0_tracker_hits.cxx index 31266703852d3d5667ef2a2d3d6671777f4131b3..a2c628212a8580e3b9d7e5c7cffba5d597c73c78 100644 --- a/benchmarks/b0_tracker/scripts/b0_tracker_hits.cxx +++ b/benchmarks/b0_tracker/scripts/b0_tracker_hits.cxx @@ -37,7 +37,7 @@ void b0_tracker_hits(const char* fname = "./sim_output/sim_forward_protons.root" ROOT::RDataFrame d0(*t); - auto MC_hits_theta = [&](const std:vector<dd4pod::MonteCarloContrib>& mchits){ + auto MC_hits_theta = [&](const std::vector<dd4pod::MonteCarloContrib>& mchits){ std::vector<double> result; for (const auto& h : mchits){ ROOT::Math::XYZVector vec(h.x,h.y,h.z); @@ -86,48 +86,6 @@ void b0_tracker_hits(const char* fname = "./sim_output/sim_forward_protons.root" return result; }; - auto d1 = d0.Define("nhits", hits_theta, {"B0TrackerHits"}) - .Define("xy_hit_pos", local_position, {"B0TrackerHits"}) - .Define("x_pos", x_pos, {"xy_hit_pos"}) - .Define("y_pos", y_pos, {"xy_hit_pos"}); - - auto h_local_pos = d1.Histo2D({"h_local_pos", ";x [mm]; y [mm] ", 100, -100.0, -200.0, 100, -100.0, 100.0}, "x_pos", "y_pos"); - - - auto d2 = d0.Define("hits_theta", hits_theta, {"B0TrackerHits"}); - - auto d3 = d0.Define("MC_hits_theta", MC_hits_theta, {"mcparticles"}); - - auto h1 = d2.Histo1D({"h1", "hits_theta", 100, 0,20}, "hits_theta"); - auto hMCTheta = d3.Histo1D({"mchitstheta", "MC_hits_theta", 100, 0, 20}); - auto local_position = [&](const std::vector<dd4pod::TrackerHitData>& hits) { - std::vector<std::array<double, 2>> result; - for (const auto& h : hits) { - - auto pos0 = (h.position); - result.push_back({pos0.x , pos0.y}); - } - return result; - }; - - - auto x_pos = [&](const std::vector<std::array<double, 2>>& xypos) { - std::vector<double> result; - for (const auto& h : xypos) { - - result.push_back(h.at(0)); - } - return result; - }; - - auto y_pos = [&](const std::vector<std::array<double, 2>>& xypos) { - std::vector<double> result; - for (const auto& h : xypos) { - - result.push_back(h.at(1)); - } - return result; - }; auto d1 = d0.Define("nhits", hits_theta, {"B0TrackerHits"}) .Define("xy_hit_pos", local_position, {"B0TrackerHits"}) @@ -136,23 +94,21 @@ void b0_tracker_hits(const char* fname = "./sim_output/sim_forward_protons.root" auto h_local_pos = d1.Histo2D({"h_local_pos", ";x [mm]; y [mm] ", 100, -100.0, -200.0, 100, -100.0, 100.0}, "x_pos", "y_pos"); + auto d3 = d0.Define("MC_hits_theta", MC_hits_theta, {"mcparticles"}); auto d2 = d0.Define("hits_theta", hits_theta, {"B0TrackerHits"}); auto h1 = d2.Histo1D({"h1", "hits_theta", 100, 0,20}, "hits_theta"); ->>>>>>> 548e97b5b5705204a320a076b0c6b7b125aa0cef + auto hMCTheta = d3.Histo1D({"mc_hits_theta", MC_hits_theta, 100, 0,20}, "MC_hits_theta"); TCanvas* c = new TCanvas(); h1->DrawCopy(); c->SaveAs("results/b0_tracker_hits_theta.png"); c->SaveAs("results/b0_tracker_hits_theta.pdf"); -<<<<<<< HEAD hMCTheta->DrawCopy(); c->SaveAs("results/MC_hits_theta.png"); c->SaveAs("results/MC_hits_theta.pdf"); -======= ->>>>>>> 548e97b5b5705204a320a076b0c6b7b125aa0cef h_local_pos->DrawCopy("colz"); c->SaveAs("results/b0_tracker_hits_occupancy_disk_1.png"); c->SaveAs("results/b0_tracker_hits_occupancy_disk_1.pdf");