diff --git a/benchmarks/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh index 0ea376eff6861f1a4d07d83b8be4b236761c8970..aca9542875c38f84e1c3c028246919d6fd113f2c 100644 --- a/benchmarks/track_finding/multiple_tracks.sh +++ b/benchmarks/track_finding/multiple_tracks.sh @@ -87,6 +87,8 @@ then fi fi +rootls -t ${JUGGLER_REC_FILE} + mkdir -p results/track_finding root -b -q "benchmarks/track_finding/scripts/rec_multiple_tracks.cxx(\"${JUGGLER_REC_FILE}\")" diff --git a/benchmarks/track_finding/options/track_reconstruction.py b/benchmarks/track_finding/options/track_reconstruction.py index 328c0e0ba311a5c469f8891588674595a922b803..945aa99d456ef3a02af975019eca3553ed316a9d 100644 --- a/benchmarks/track_finding/options/track_reconstruction.py +++ b/benchmarks/track_finding/options/track_reconstruction.py @@ -129,7 +129,7 @@ trk_hit_col = TrackingHitsCollector("trk_hit_col", OutputLevel=DEBUG) algorithms.append( trk_hit_col ) -# Hit Source linker +# track finding conformal_find = ConformalXYPeakProtoTracks("conformal_find", inputTrackerHits=trk_hit_col.trackingHits, outputProtoTracks="outputProtoTracks", @@ -141,8 +141,7 @@ algorithms.append( conformal_find ) sourcelinker = TrackerSourceLinker("sourcelinker", inputHitCollection=trk_hit_col.trackingHits, outputSourceLinks="TrackSourceLinks", - outputMeasurements="TrackMeasurements", - OutputLevel=DEBUG) + outputMeasurements="TrackMeasurements") algorithms.append( sourcelinker ) ## Track param init diff --git a/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx b/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx index fdd02666a18ccb94380fdb9924be1322c59f1159..788b9e2a54964b742b6000b5553b4fdaddf79fb5 100644 --- a/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx +++ b/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx @@ -5,7 +5,7 @@ #include "TProfile.h" #include <iostream> - +R__LOAD_LIBRARY(libJugBase.so) R__LOAD_LIBRARY(libeicd.so) R__LOAD_LIBRARY(libDD4pod.so) #include "dd4pod/Geant4ParticleCollection.h" @@ -77,6 +77,9 @@ auto delta_p_over_p = [](const std::vector<double>& tracks, const std::vector<do } return res; }; +//gInterpreter->GenerateDictionary("vector<vector<float> >", "vector") +//gInterpreter->GenerateDictionary("vector<unsigned long>", "vector") +//gInterpreter->GenerateDictionary("vector<vector<unsigned long> >", "vector") int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root") { @@ -88,6 +91,7 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root") .Define("thrownParticles", "mcparticles2[isThrown]") .Define("thrownP", fourvec, {"thrownParticles"}) .Define("nThrown", "thrownParticles.size()") + .Define("nProto", "outputProtoTracks.size()") .Define("p_thrown", momentum, {"thrownP"}) .Define("theta_thrown", theta, {"thrownP"}) .Define("theta0", "theta_thrown[0]") @@ -107,7 +111,8 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root") auto h_delta_p0 = df0.Histo1D({"h_delta_p0", "Truth Track Init; GeV/c ", 100, -10, 10}, "delta_p0"); - auto h_nProtoTracks = df0.Histo1D({"h_nProtoTracks", "; n ", 10, 0, 10}, "nProtoTracks"); + auto h_nProtoTracks = df0.Histo1D({"h_nProtoTracks", "; n ", 10, 0, 10}, "nProto"); + auto h_nProtoTracks2 = df0.Histo1D({"h_nProtoTracks2", "; n ", 10, 0, 10}, "nProtoTracks"); auto h_nThrown = df0.Histo1D({"h_nThrown", "; n ", 10, 0, 10}, "nThrown"); auto h_delta_p0_over_p = df0.Histo1D({"h_delta_p0_over_p", "Truth Track Init; delta p/p ", 100, -0.1, 0.1}, "delta_p_over_p0"); @@ -130,6 +135,8 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root") h_nThrown->SetLineColor(2); h_nThrown->DrawCopy(); h_nProtoTracks->DrawCopy("same"); + h_nProtoTracks2->SetLineColor(4); + h_nProtoTracks2->DrawCopy("same"); c->SaveAs("results/track_finding/rec_multiple_tracks_nProtoTracks.png"); c->SaveAs("results/track_finding/rec_multiple_tracks_nProtoTracks.pdf");