From 9e34c3e793572e2612ec9a527de131354526438c Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 25 Aug 2021 22:46:06 -0500
Subject: [PATCH] modified: scripts/gen_track_hits.cxx modified:
scripts/sim_track_hits.cxx
---
.../scripts/gen_track_hits.cxx | 4 +--
.../scripts/sim_track_hits.cxx | 30 +++++++++++++++----
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx b/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx
index 13bc31e7..76bde084 100644
--- a/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx
+++ b/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx
@@ -18,8 +18,8 @@ void gen_track_hits(int n_events = 100,
const char* out_fname = "track_hits.hepmc",
int n_parts = 2)
{
- double cos_theta_min = std::cos( 10.0*(M_PI/180.0));
- double cos_theta_max = std::cos(170.0*(M_PI/180.0));
+ double cos_theta_min = std::cos( 1.0*(M_PI/180.0));
+ double cos_theta_max = std::cos(189.0*(M_PI/180.0));
WriterAscii hepmc_output(out_fname);
int events_parsed = 0;
diff --git a/benchmarks/tracking_detectors/scripts/sim_track_hits.cxx b/benchmarks/tracking_detectors/scripts/sim_track_hits.cxx
index a2fe9dae..2e7b4326 100644
--- a/benchmarks/tracking_detectors/scripts/sim_track_hits.cxx
+++ b/benchmarks/tracking_detectors/scripts/sim_track_hits.cxx
@@ -114,15 +114,28 @@ int sim_track_hits(const char* fname = "sim_track_hits.root")
auto hBarrel_x_vs_z = df0.Histo2D(
{"hBarrel_x_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
- "TrackerBarrelHits.position.z", "TrackerBarrelHits.position.y");
+ "TrackerBarrelHits.position.z", "TrackerBarrelHits.position.x");
auto hEndcap_x_vs_z = df0.Histo2D(
{"hEndcap_x_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
- "TrackerEndcapHits.position.z", "TrackerEndcapHits.position.y");
+ "TrackerEndcapHits.position.z", "TrackerEndcapHits.position.x");
auto hVertexBarrel_x_vs_z = df0.Histo2D(
{"hVertexBarrel_x_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
- "VertexBarrelHits.position.z", "VertexBarrelHits.position.y");
+ "VertexBarrelHits.position.z", "VertexBarrelHits.position.x");
auto hVertexEndcap_x_vs_z = df0.Histo2D(
{"hVertexEndcap_x_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
+ "VertexEndcapHits.position.z", "VertexEndcapHits.position.x");
+
+ auto hBarrel_y_vs_z = df0.Histo2D(
+ {"hBarrel_y_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
+ "TrackerBarrelHits.position.z", "TrackerBarrelHits.position.y");
+ auto hEndcap_y_vs_z = df0.Histo2D(
+ {"hEndcap_y_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
+ "TrackerEndcapHits.position.z", "TrackerEndcapHits.position.y");
+ auto hVertexBarrel_y_vs_z = df0.Histo2D(
+ {"hVertexBarrel_y_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
+ "VertexBarrelHits.position.z", "VertexBarrelHits.position.y");
+ auto hVertexEndcap_y_vs_z = df0.Histo2D(
+ {"hVertexEndcap_y_vs_z", "; z ; x ", 200, -1200, 1200, 100, -900, 900},
"VertexEndcapHits.position.z", "VertexEndcapHits.position.y");
auto hBarrel_N_vs_theta = df0.Histo1D({"hBarrel_N_vs_theta", "; #theta [deg.]", 20, 0, 180 }, "theta0", "N_BarrelHits");
@@ -212,9 +225,9 @@ int sim_track_hits(const char* fname = "sim_track_hits.root")
c->SaveAs("results/tracking_detectors/sim_track_hits_trkBarrel_xy.pdf");
c = new TCanvas();
- hBarrel_x_vs_y->DrawCopy("colz");
- hEndcap_x_vs_y->DrawCopy("colz same");
- //hvtxBarrel_x_vs_y->DrawCopy("colz same");
+ hEndcap_x_vs_y->DrawCopy("colz");
+ hVertexEndcap_x_vs_y->DrawCopy("colz same");
+ //hBarrel_x_vs_y->DrawCopy("colz same");
//hvtxEndcap_x_vs_y->DrawCopy("colz same");
c->SaveAs("results/tracking_detectors/sim_track_hits_Hits_xy.png");
@@ -225,5 +238,10 @@ int sim_track_hits(const char* fname = "sim_track_hits.root")
hEndcap_x_vs_z->DrawCopy("colz same");
c->SaveAs("results/tracking_detectors/sim_track_hits_Hits_xz.png");
c->SaveAs("results/tracking_detectors/sim_track_hits_Hits_xz.pdf");
+
+ hBarrel_y_vs_z->DrawCopy("colz");
+ hEndcap_y_vs_z->DrawCopy("colz same");
+ c->SaveAs("results/tracking_detectors/sim_track_hits_Hits_yz.png");
+ c->SaveAs("results/tracking_detectors/sim_track_hits_Hits_yz.pdf");
return 0;
}
--
GitLab