diff --git a/benchmarks/tracking/options/tracker_reconstruction.py b/benchmarks/tracking/options/tracker_reconstruction.py index 454eee1d35707575e432686f2dadf1ac4bcf2e86..85f67c7f9292f1f7c148feb8ec8ddc10a571ed04 100644 --- a/benchmarks/tracking/options/tracker_reconstruction.py +++ b/benchmarks/tracking/options/tracker_reconstruction.py @@ -47,27 +47,27 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering podioinput = PodioInput("PodioReader", - collections=["mcparticles","SiTrackerEndcapHits","SiTrackerBarrelHits","EcalBarrelHits"])#, OutputLevel=DEBUG)"SiVertexBarrelHits", + collections=["mcparticles","TrackerEndcapHits","TrackerBarrelHits","EcalBarrelHits"])#, OutputLevel=DEBUG)"SiVertexBarrelHits", ## copiers to get around input --> output copy bug. Note the "2" appended to the output collection. copier = MCCopier("MCCopier", inputCollection="mcparticles", outputCollection="mcparticles2") trkcopier = TrkCopier("TrkCopier", - inputCollection="SiTrackerBarrelHits", - outputCollection="SiTrackerBarrelHits2") + inputCollection="TrackerBarrelHits", + outputCollection="TrackerBarrelHits2") ecal_digi = EMCalorimeterDigi("ecal_digi", inputHitCollection="EcalBarrelHits", outputHitCollection="RawEcalBarrelHits") ufsd_digi = UFSDTrackerDigi("ufsd_digi", - inputHitCollection="SiTrackerBarrelHits", - outputHitCollection="SiTrackerBarrelRawHits", + inputHitCollection="TrackerBarrelHits", + outputHitCollection="TrackerBarrelRawHits", timeResolution=8) ufsd_digi2 = UFSDTrackerDigi("ufsd_digi2", - inputHitCollection="SiTrackerEndcapHits", - outputHitCollection="SiTrackerEndcapRawHits", + inputHitCollection="TrackerEndcapHits", + outputHitCollection="TrackerEndcapRawHits", timeResolution=8) #vtx_digi = UFSDTrackerDigi("vtx_digi", diff --git a/benchmarks/tracking/scripts/hits_central_electrons.cxx b/benchmarks/tracking/scripts/hits_central_electrons.cxx index 66701ec3e31f4a9eaffc0a58ef77ebaf93457dff..e1241b1d15d84350c1f8279c58a12c98ca872385 100644 --- a/benchmarks/tracking/scripts/hits_central_electrons.cxx +++ b/benchmarks/tracking/scripts/hits_central_electrons.cxx @@ -103,11 +103,11 @@ int hits_central_electrons(const char* fname = "sim_central_electrons.root") //.Define("delta_p_over_p1",delta_p_over_p, {"p_track1", "p_thrown"}) //.Define("delta_p_over_p2",delta_p_over_p, {"p_track2", "p_thrown"}) //.Define("N_VtxBarrelHits",[](std::vector<eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"}) - .Define("N_SiBarrelHits", [](std::vector<dd4pod::TrackerHitData> hits) { return hits.size();}, {"SiTrackerBarrelHits"}) - .Define("N_SiEndcapHits", [](std::vector<dd4pod::TrackerHitData> hits) { return hits.size();}, {"SiTrackerEndcapHits"}) + .Define("N_SiBarrelHits", [](std::vector<dd4pod::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelHits"}) + .Define("N_SiEndcapHits", [](std::vector<dd4pod::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapHits"}) ; - auto hSiBarrel_x_vs_y = df0.Histo2D({"hSiBarrel_x_vs_y", "; x ; y ", 100, -900, 900,100, -900, 900 }, "SiTrackerBarrelHits.position.x", "SiTrackerBarrelHits.position.y"); + auto hSiBarrel_x_vs_y = df0.Histo2D({"hSiBarrel_x_vs_y", "; x ; y ", 100, -900, 900,100, -900, 900 }, "TrackerBarrelHits.position.x", "TrackerBarrelHits.position.y"); auto hSiBarrel_N_vs_theta = df0.Histo1D({"hSiBarrel_N_vs_theta", "; #theta [deg.]", 20, 0, 180 }, "theta0", "N_SiBarrelHits"); auto hSiEndcap_N_vs_theta = df0.Histo1D({"hSiEndcap_N_vs_theta", "; #theta [deg.]", 20, 0, 180 }, "theta0", "N_SiEndcapHits");