diff --git a/benchmarks/tracking/scripts/rec_central_pions.cxx b/benchmarks/tracking/scripts/rec_central_pions.cxx
index 24be4f35dabb6577658f8708c4f23e2a5d36988f..716a9a60c4ea67beca1d3e16f1da385d9ac676f2 100644
--- a/benchmarks/tracking/scripts/rec_central_pions.cxx
+++ b/benchmarks/tracking/scripts/rec_central_pions.cxx
@@ -92,40 +92,40 @@ int rec_central_pions(const char* fname = "topside/rec_central_pions.root")
                  .Define("theta0", "theta_thrown[0]")
                  .Define("nTracks", "outputTrackParameters.size()")
                  .Define("p_track", p_track, {"outputTrackParameters"})
-                 .Define("p_track1", p_track, {"outputTrackParameters1"})
+                 //.Define("p_track1", p_track, {"outputTrackParameters1"})
                  //.Define("p_track2", p_track, {"outputTrackParameters2"})
                  .Define("delta_p0",delta_p, {"p_track", "p_thrown"})
-                 .Define("delta_p1",delta_p, {"p_track1", "p_thrown"})
+                 //.Define("delta_p1",delta_p, {"p_track1", "p_thrown"})
                  //.Define("delta_p2",delta_p, {"p_track2", "p_thrown"})
                  .Define("delta_p_over_p0",delta_p_over_p, {"p_track", "p_thrown"})
-                 .Define("delta_p_over_p1",delta_p_over_p, {"p_track1", "p_thrown"})
+                 //.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<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
-                 .Define("N_SiEndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+                 .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
+                 .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
                  ;
 
   auto h_nTracks = df0.Histo1D({"h_nTracks", "; N tracks ", 10, 0, 10}, "nTracks");
   auto h_pTracks = df0.Histo1D({"h_pTracks", "; GeV/c ", 100, 0, 10}, "p_track");
 
   auto h_delta_p0  = df0.Histo1D({"h_delta_p0", "Truth Track Init; GeV/c ",  100, -10, 10}, "delta_p0");
-  auto h_delta_p1 = df0.Histo1D({"h_delta_p1", "Ecal Cluster Init; GeV/c ", 100, -10, 10}, "delta_p1");
+  //auto h_delta_p1 = df0.Histo1D({"h_delta_p1", "Ecal Cluster Init; GeV/c ", 100, -10, 10}, "delta_p1");
   //auto h_delta_p2 = df0.Histo1D({"h_delta_p2", "Ecal Cluster, innner vtx hit Init; GeV/c ", 100, -10, 10}, "delta_p2");
 
   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");
-  auto h_delta_p1_over_p = df0.Histo1D({"h_delta_p1_over_p", "Ecal Cluster Init; delta p/p ", 100, -0.1, 0.1}, "delta_p_over_p1");
+  //auto h_delta_p1_over_p = df0.Histo1D({"h_delta_p1_over_p", "Ecal Cluster Init; delta p/p ", 100, -0.1, 0.1}, "delta_p_over_p1");
   //auto h_delta_p2_over_p = df0.Histo1D({"h_delta_p2_over_p", "Ecal Cluster, innner vtx hit Init; delta p/p ", 100, -0.1, 0.1}, "delta_p_over_p2");
 
-  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");
+  auto hBarrel_N_vs_theta = df0.Histo1D({"hBarrel_N_vs_theta", "; #theta [deg.]",   20, 0, 180 }, "theta0", "N_BarrelHits");
+  auto hEndcap_N_vs_theta = df0.Histo1D({"hEndcap_N_vs_theta", "; #theta [deg.]",   20, 0, 180 }, "theta0", "N_EndcapHits");
   //auto hVtxBarrel_N_vs_theta = df0.Histo1D({"hVtxBarrel_N_vs_theta", "; #theta [deg.]", 20, 0, 180 }, "theta0", "N_VtxBarrelHits");
 
-  auto hSiBarrel_Nhits  = df0.Histo1D({"hSiBarrel_Nhits", "; #theta [deg.]",   20, 0, 20 }, "N_SiBarrelHits");
-  auto hSiEndcap_Nhits  = df0.Histo1D({"hSiEndcap_Nhits", "; #theta [deg.]",   20, 0, 20 }, "N_SiEndcapHits");
+  auto hBarrel_Nhits  = df0.Histo1D({"hBarrel_Nhits", "; #theta [deg.]",   20, 0, 20 }, "N_BarrelHits");
+  auto hEndcap_Nhits  = df0.Histo1D({"hEndcap_Nhits", "; #theta [deg.]",   20, 0, 20 }, "N_EndcapHits");
   //auto hVtxBarrel_Nhits = df0.Histo1D({"hVtxBarrel_Nhits", "; #theta [deg.]", 20, 0, 20 },  "N_VtxBarrelHits");
 
-  auto hSiBarrel_Ntheta = df0.Histo1D({"hSiBarrel_Ntheta", "; #theta [deg.]",   20, 0, 180 }, "theta0");
-  auto hSiEndcap_Ntheta = df0.Histo1D({"hSiEndcap_Ntheta", "; #theta [deg.]",   20, 0, 180 }, "theta0");
+  auto hBarrel_Ntheta = df0.Histo1D({"hBarrel_Ntheta", "; #theta [deg.]",   20, 0, 180 }, "theta0");
+  auto hEndcap_Ntheta = df0.Histo1D({"hEndcap_Ntheta", "; #theta [deg.]",   20, 0, 180 }, "theta0");
   //auto hVtxBarrel_Ntheta = df0.Histo1D({"hVtxBarrel_Ntheta", "; #theta [deg.]", 20, 0, 180 }, "theta0");
 
   auto c = new TCanvas();
@@ -142,9 +142,9 @@ int rec_central_pions(const char* fname = "topside/rec_central_pions.root")
   THStack * hs = new THStack("hs_delta_p","; GeV/c ");
   TH1D* h1 = (TH1D*) h_delta_p0->Clone();
   hs->Add(h1);
-  h1 = (TH1D*) h_delta_p1->Clone();
-  h1->SetLineColor(2);
-  hs->Add(h1);
+  //h1 = (TH1D*) h_delta_p1->Clone();
+  //h1->SetLineColor(2);
+  //hs->Add(h1);
   //h1 = (TH1D*) h_delta_p2->Clone();
   //h1->SetLineColor(4);
   //h1->SetFillStyle(3001);
@@ -159,9 +159,9 @@ int rec_central_pions(const char* fname = "topside/rec_central_pions.root")
   hs = new THStack("hs_delta_p_over_p","; delta p/p ");
   h1 = (TH1D*) h_delta_p0_over_p->Clone();
   hs->Add(h1);
-  h1 = (TH1D*) h_delta_p1_over_p->Clone();
-  h1->SetLineColor(2);
-  hs->Add(h1);
+  //h1 = (TH1D*) h_delta_p1_over_p->Clone();
+  //h1->SetLineColor(2);
+  //hs->Add(h1);
   //h1 = (TH1D*) h_delta_p2_over_p->Clone();
   //h1->SetLineColor(4);
   //h1->SetFillStyle(3001);
@@ -174,12 +174,12 @@ int rec_central_pions(const char* fname = "topside/rec_central_pions.root")
 
   c  = new TCanvas();
   hs = new THStack("n_hits","; #theta  ");
-  h1 = (TH1D*) hSiBarrel_N_vs_theta->Clone();
-  auto h2 = (TH1D*) hSiBarrel_Ntheta->Clone();
+  h1 = (TH1D*) hBarrel_N_vs_theta->Clone();
+  auto h2 = (TH1D*) hBarrel_Ntheta->Clone();
   h1->Divide(h2);
   hs->Add(h1);
-  h1 = (TH1D*) hSiEndcap_N_vs_theta->Clone();
-  h2 = (TH1D*) hSiEndcap_Ntheta->Clone();
+  h1 = (TH1D*) hEndcap_N_vs_theta->Clone();
+  h2 = (TH1D*) hEndcap_Ntheta->Clone();
   h1->Divide(h2);
   h1->SetLineColor(2);
   hs->Add(h1);
@@ -195,12 +195,12 @@ int rec_central_pions(const char* fname = "topside/rec_central_pions.root")
 
   c  = new TCanvas();
   hs = new THStack("theta","; #theta  ");
-  h1 = (TH1D*) hSiBarrel_N_vs_theta->Clone();
-  h2 = (TH1D*) hSiBarrel_Ntheta->Clone();
+  h1 = (TH1D*) hBarrel_N_vs_theta->Clone();
+  h2 = (TH1D*) hBarrel_Ntheta->Clone();
   //h1->Divide(h2);
   hs->Add(h2);
-  h1 = (TH1D*) hSiEndcap_N_vs_theta->Clone();
-  h2 = (TH1D*) hSiEndcap_Ntheta->Clone();
+  h1 = (TH1D*) hEndcap_N_vs_theta->Clone();
+  h2 = (TH1D*) hEndcap_Ntheta->Clone();
   //h1->Divide(h2);
   h1->SetLineColor(2);
   h2->SetLineColor(2);
@@ -217,9 +217,9 @@ int rec_central_pions(const char* fname = "topside/rec_central_pions.root")
 
   c  = new TCanvas();
   hs = new THStack("hits","; hits  ");
-  h1 = (TH1D*) hSiBarrel_Nhits->Clone();
+  h1 = (TH1D*) hBarrel_Nhits->Clone();
   hs->Add(h1);
-  h1 = (TH1D*) hSiEndcap_Nhits->Clone();
+  h1 = (TH1D*) hEndcap_Nhits->Clone();
   h1->SetLineColor(2);
   h2->SetLineColor(2);
   hs->Add(h2);