diff --git a/benchmarks/tof/multiple_tracks.sh b/benchmarks/tof/multiple_tracks.sh index 97a40b1ea7a004cb5ea91fcffc01917d7e4cf815..62057e6d3509f21b44e04e1285c212278380fdd3 100644 --- a/benchmarks/tof/multiple_tracks.sh +++ b/benchmarks/tof/multiple_tracks.sh @@ -45,7 +45,7 @@ fi #export JUGGLER_N_EVENTS=$(expr ${JUGGLER_N_EVENTS} \* 1) export JUGGLER_DETECTOR_VERSION="131-update-tof-for-canyonlands" -export JUGGLER_N_EVENTS=1 +## export JUGGLER_N_EVENTS=1 export JUGGLER_FILE_NAME_TAG="multiple_tracks" export JUGGLER_GEN_FILE="${JUGGLER_FILE_NAME_TAG}.hepmc" diff --git a/benchmarks/tof/options/track_reconstruction.py b/benchmarks/tof/options/track_reconstruction.py index 025230eaa158627e8ad875c651e43677d71f6caa..e0638d2f333fff7b996428a1e2957293a729745f 100644 --- a/benchmarks/tof/options/track_reconstruction.py +++ b/benchmarks/tof/options/track_reconstruction.py @@ -46,8 +46,7 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering algorithms = [ ] -#input_collections = ['mcparticles','TrackerEndcapHits','TrackerBarrelHits','TOFBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits'] -input_collections = ['mcparticles','TrackerEndcapHits','TrackerBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits'] +input_collections = ['mcparticles','TrackerEndcapHits','TrackerBarrelHits','TOFBarrelHits','VertexBarrelHits','GEMTrackerEndcapHits'] if 'acadia' in detector_version: input_collections.append('VertexEndcapHits') else: @@ -86,11 +85,11 @@ else: timeResolution=8) algorithms.append( mm_b_digi ) -#tof_b_digi = TrackerDigi("tof_b_digi", -# inputHitCollection="TOFBarrelHits", -# outputHitCollection="TOFBarrelRawHits", -# timeResolution=20) -#algorithms.append(tof_b_digi) +tof_b_digi = TrackerDigi("tof_b_digi", + inputHitCollection="TOFBarrelHits", + outputHitCollection="TOFBarrelRawHits", + timeResolution=20) +algorithms.append(tof_b_digi) gem_ec_digi = TrackerDigi("gem_ec_digi", inputHitCollection="GEMTrackerEndcapHits", @@ -125,10 +124,10 @@ else: outputHitCollection="MPGDTrackerBarrelRecHits") algorithms.append( mm_b_reco ) -#tof_b_reco = TrackerHitReconstruction("tof_b_reco", -# inputHitCollection=tof_b_digi.outputHitCollection, -# outputHitCollection="TOFBarrelRecHits") -#algorithms.append(tof_b_reco) +tof_b_reco = TrackerHitReconstruction("tof_b_reco", + inputHitCollection=tof_b_digi.outputHitCollection, + outputHitCollection="TOFBarrelRecHits") +algorithms.append(tof_b_reco) gem_ec_reco = TrackerHitReconstruction("gem_ec_reco", inputHitCollection=gem_ec_digi.outputHitCollection, @@ -139,7 +138,7 @@ input_tracking_hits = [ str(trk_b_reco.outputHitCollection), str(trk_ec_reco.outputHitCollection), str(vtx_b_reco.outputHitCollection), -# str(tof_b_reco.outputHitCollection), + str(tof_b_reco.outputHitCollection), str(gem_ec_reco.outputHitCollection) ] if 'acadia' in detector_version: input_tracking_hits.append(str(vtx_ec_reco.outputHitCollection)) diff --git a/benchmarks/tof/scripts/rec_multiple_tracks.cxx b/benchmarks/tof/scripts/rec_multiple_tracks.cxx index 972c4e24d2e9b5fac522657d7b2069e7d5f88dea..0a7a89fd98ce32c7ae640b46de4fa186aed80961 100644 --- a/benchmarks/tof/scripts/rec_multiple_tracks.cxx +++ b/benchmarks/tof/scripts/rec_multiple_tracks.cxx @@ -102,7 +102,7 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root") .Define("N_Hits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"}) .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"}) .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"}) - //.Define("N_TOFBarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TOFBarrelRecHits"}) + .Define("N_TOFBarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TOFBarrelRecHits"}) ; auto h_nTracks_vs_theta = df0.Histo2D({"h_nTracks_vs_theta", "; #theta; N tracks ", 40,0,180,10, 0, 10}, "theta0","nTracks"); @@ -121,7 +121,7 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root") auto hNhits_vs_theta = df0.Histo1D({"hNhits_vs_theta", "; #theta [deg.]", 40, 0, 180 }, "theta0", "N_Hits"); auto hBarrel_N_vs_theta = df0.Histo1D({"hBarrel_N_vs_theta", "; #theta [deg.]", 40, 0, 180 }, "theta0", "N_BarrelHits"); auto hEndcap_N_vs_theta = df0.Histo1D({"hEndcap_N_vs_theta", "; #theta [deg.]", 40, 0, 180 }, "theta0", "N_EndcapHits"); - //auto hTOFBarrel_N_vs_theta = df0.Histo1D({"hTOFBarrel_N_vs_theta", "; #theta [deg.]", 40, 0, 180 }, "theta0", "N_TOFBarrelHits"); + auto hTOFBarrel_N_vs_theta = df0.Histo1D({"hTOFBarrel_N_vs_theta", "; #theta [deg.]", 40, 0, 180 }, "theta0", "N_TOFBarrelHits"); auto hHits_Nhits = df0.Histo1D({"hHits_Nhits", "; #theta [deg.]", 20, 0, 20 }, "N_Hits"); auto hBarrel_Nhits = df0.Histo1D({"hBarrel_Nhits", "; #theta [deg.]", 20, 0, 20 }, "N_BarrelHits");