From 3ebe49def5525f48c3c54f48e7daa51d15e640ec Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 4 Sep 2022 22:42:24 -0500
Subject: [PATCH] feat: transition from eicd to edm4eic

---
 .../analysis/analysis_zdc_particles.cxx       | 12 +--
 .../analysis/hits_far_forward_protons.cxx     | 12 +--
 .../analysis/print_far_forward_protons.cxx    | 10 +--
 .../analysis/rec_far_forward_protons.cxx      | 16 ++--
 .../emcal_barrel_pion_rejection_analysis.cxx  | 88 +++++++++----------
 .../scripts/rec_multiple_tracks.cxx           | 18 ++--
 .../scripts/rec_multiple_tracks.cxx           | 18 ++--
 .../scripts/rec_single_tracks.cxx             | 18 ++--
 .../scripts/hits_central_electrons.cxx        | 14 +--
 .../tracking/scripts/hits_central_pions.cxx   | 14 +--
 .../scripts/rec_central_electrons.cxx         | 20 ++---
 .../tracking/scripts/rec_central_pions.cxx    | 18 ++--
 .../tracking/scripts/rec_multiple_tracks.cxx  | 22 ++---
 13 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/benchmarks/far_forward/analysis/analysis_zdc_particles.cxx b/benchmarks/far_forward/analysis/analysis_zdc_particles.cxx
index 516f9a00..fd568eb1 100644
--- a/benchmarks/far_forward/analysis/analysis_zdc_particles.cxx
+++ b/benchmarks/far_forward/analysis/analysis_zdc_particles.cxx
@@ -10,8 +10,8 @@
 
 #include "edm4hep/MCParticleCollection.h"
 #include "edm4hep/SimCalorimeterHitCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
 
 #include "TCanvas.h"
 #include "TStyle.h"
@@ -23,7 +23,7 @@
 #include "TH1D.h"
 #include "TVector3.h"
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "fmt/core.h"
 #include "DD4hep/Detector.h"
 #include "DDG4/Geant4Data.h"
@@ -82,7 +82,7 @@ void analysis_zdc_particles(
     auto theta = std::atan2(std::hypot(p.momentum.x, p.momentum.y), p.momentum.z);
     return theta;
   };
-  auto Thetarec = [](const std::vector<eicd::ClusterData> & input) {
+  auto Thetarec = [](const std::vector<edm4eic::ClusterData> & input) {
     std::vector<float> output;
     for (const auto &c: input) {
       auto r = c.position;
@@ -99,7 +99,7 @@ void analysis_zdc_particles(
     if (phi < 0) phi += 2.*M_PI;
     return phi;
   };
-  auto Phirec = [](const std::vector<eicd::ClusterData> & input) {
+  auto Phirec = [](const std::vector<edm4eic::ClusterData> & input) {
     std::vector<float> output;
     for (const auto &c: input) {
       auto r = c.position;
@@ -117,7 +117,7 @@ void analysis_zdc_particles(
     auto eta = -std::log(std::tan(theta/2));
     return eta;
   };
-  auto Etarec = [](const std::vector<eicd::ClusterData> & input) {
+  auto Etarec = [](const std::vector<edm4eic::ClusterData> & input) {
     std::vector<float> output;
     for (const auto &c: input) {
       auto r = c.position;
diff --git a/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx b/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
index 80bb9858..36eae5c2 100644
--- a/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
+++ b/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
@@ -8,19 +8,19 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/SimTrackerHitData.h"
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
diff --git a/benchmarks/far_forward/analysis/print_far_forward_protons.cxx b/benchmarks/far_forward/analysis/print_far_forward_protons.cxx
index 1f5b2484..0eb21b3b 100644
--- a/benchmarks/far_forward/analysis/print_far_forward_protons.cxx
+++ b/benchmarks/far_forward/analysis/print_far_forward_protons.cxx
@@ -6,12 +6,12 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
diff --git a/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx b/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx
index 50f5da71..4cd414b5 100644
--- a/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx
+++ b/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx
@@ -8,17 +8,17 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -101,8 +101,8 @@ int rec_far_forward_protons(const char* fname = "topside/rec_far_forward_protons
                  .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_p2",delta_p_over_p, {"p_track2", "p_thrown"})
-                 //.Define("N_VtxBarrelHits",[](std::vector<eicd::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
-                 .Define("N_B0TrackerHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"B0TrackerRecHits"})
+                 //.Define("N_VtxBarrelHits",[](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+                 .Define("N_B0TrackerHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"B0TrackerRecHits"})
                  ;
 
   auto h_nTracks = df0.Histo1D({"h_nTracks", "; N tracks ", 10, 0, 10}, "nTracks");
diff --git a/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx b/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
index 584cb99d..440337d0 100644
--- a/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
@@ -11,12 +11,12 @@
 #include "edm4hep/SimCalorimeterHitCollection.h"
 #include "edm4hep/MCParticleCollection.h"
 
-#include "eicd/CalorimeterHitCollection.h"
-#include "eicd/CalorimeterHitData.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/RawCalorimeterHitCollection.h"
-#include "eicd/RawCalorimeterHitData.h"
+#include "edm4eic/CalorimeterHitCollection.h"
+#include "edm4eic/CalorimeterHitData.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/RawCalorimeterHitCollection.h"
+#include "edm4eic/RawCalorimeterHitData.h"
 
 #include "common_bench/benchmark.h"
 #include "common_bench/mt.h"
@@ -135,7 +135,7 @@ void emcal_barrel_pion_rejection_analysis(
   // RecoEcalBarrelImagingHits Functions/////////////////////////////////////////////////////////////////////////////////////
   int layerNumImg;
   // Energy deposition [GeV]
-  auto ERecoImg = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImg = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       total_edep += i.energy;
@@ -144,7 +144,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Nhits in layer
-  auto nhitsImgLayer = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto nhitsImgLayer = [&layerNumImg](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     int nhitsTot;
     for (const auto& i: evt){
       if (i.layer == layerNumImg){nhitsTot++;}
@@ -153,7 +153,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Energy deposition at a layer
-  auto ERecoImgLayer = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImgLayer = [&layerNumImg](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == layerNumImg){total_edep += i.energy;}
@@ -162,42 +162,42 @@ void emcal_barrel_pion_rejection_analysis(
   };
   //###########################################################################################
     // Energy deposition at a layer
-  auto ERecoImgLayer1 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImgLayer1 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 1){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoImgLayer2 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImgLayer2 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 2){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoImgLayer3 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImgLayer3 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 3){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoImgLayer4 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImgLayer4 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 4){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoImgLayer5 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImgLayer5 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 5){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoImgLayer6 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoImgLayer6 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 6){total_edep += i.energy;}
@@ -207,7 +207,7 @@ void emcal_barrel_pion_rejection_analysis(
   //###########################################################################################
 
   // Energy deposition at a layer / Energy of all layers
-  auto ERecoImgLayerOverERecoImg = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt, const double energy) {
+  auto ERecoImgLayerOverERecoImg = [&layerNumImg](const std::vector<edm4eic::CalorimeterHitData>& evt, const double energy) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == layerNumImg){total_edep += i.energy;}
@@ -216,7 +216,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Nhits / Energy Deposition in that layer
-  auto nhitsImgLayerOverERecoImg = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto nhitsImgLayerOverERecoImg = [&layerNumImg](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     int nhits;
     for (const auto& i: evt){
@@ -227,7 +227,7 @@ void emcal_barrel_pion_rejection_analysis(
 
   // EcalBarrelImagingClustersLayers Functions////////////////////////////////////////////////////////////////////////////////
   // Number of hits
-  auto nhitsClusLayerImg = [] (const std::vector<eicd::ClusterData>& evt) {
+  auto nhitsClusLayerImg = [] (const std::vector<edm4eic::ClusterData>& evt) {
     int nhitsTot = 0;
     for (const auto &i : evt){
       nhitsTot += i.nhits;
@@ -236,10 +236,10 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Number of clusters
-  auto nClusLayerImg = [] (const std::vector<eicd::ClusterData>& evt) {return (int) evt.size(); };
+  auto nClusLayerImg = [] (const std::vector<edm4eic::ClusterData>& evt) {return (int) evt.size(); };
 
   // Energy deposition in cluster [GeV]
-  auto EClusLayerImg = [](const std::vector<eicd::ClusterData>& evt) {
+  auto EClusLayerImg = [](const std::vector<edm4eic::ClusterData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       total_edep += i.energy;
@@ -248,7 +248,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Max Energy deposition in cluster [GeV]
-  auto EClusLayerMaxImg = [](const std::vector<eicd::ClusterData>& evt) {
+  auto EClusLayerMaxImg = [](const std::vector<edm4eic::ClusterData>& evt) {
     double max = 0.0;
     for (const auto& i: evt){
       if (i.energy > max){max = i.energy;}
@@ -257,7 +257,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Min Energy deposition in cluster [GeV]
-  auto EClusLayerMax2Img = [](const std::vector<eicd::ClusterData>& evt) {
+  auto EClusLayerMax2Img = [](const std::vector<edm4eic::ClusterData>& evt) {
     double max1 = 0.0;
     double max2 = 0.0;
     for (const auto& i: evt){
@@ -270,7 +270,7 @@ void emcal_barrel_pion_rejection_analysis(
   // May want to look at position data as well
 
   // Energy deposition [GeV]
-  auto EClusImg = [](const std::vector<eicd::ClusterData>& evt) {
+  auto EClusImg = [](const std::vector<edm4eic::ClusterData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       total_edep += i.energy;
@@ -279,7 +279,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Number of energy deposits
-  auto nhitsClusImg = [](const std::vector<eicd::ClusterData>& evt) {
+  auto nhitsClusImg = [](const std::vector<edm4eic::ClusterData>& evt) {
     int nhitsTot = 0;
     for (const auto& i: evt){
       nhitsTot += i.nhits;
@@ -288,7 +288,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Mean number of energy deposits
-  auto nhitsClusMeanImg = [](const std::vector<eicd::ClusterData>& evt) {
+  auto nhitsClusMeanImg = [](const std::vector<edm4eic::ClusterData>& evt) {
     int nhitsTot = 0;
     int count = 0;
     for (const auto& i: evt){
@@ -301,7 +301,7 @@ void emcal_barrel_pion_rejection_analysis(
   // EcalBarrelScFiHitsReco Functions/////////////////////////////////////////////////////////////////////////////////////
   int layerNumScFi;
   // Energy deposition [GeV]
-  auto ERecoScFi = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFi = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       total_edep += i.energy;
@@ -310,7 +310,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Nhits in layer
-  auto nhitsScFiLayer = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto nhitsScFiLayer = [&layerNumScFi](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     int nhits;
     for (const auto& i: evt){
       if (i.layer == layerNumScFi){nhits++;}
@@ -319,7 +319,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Energy deposition at a layer
-  auto ERecoScFiLayer = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer = [&layerNumScFi](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == layerNumScFi){total_edep += i.energy;}
@@ -328,7 +328,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // STD Deviation
-  auto ERecoSTDScFi = [](const std::vector<eicd::CalorimeterHitData>& evt, const double total_energy) {
+  auto ERecoSTDScFi = [](const std::vector<edm4eic::CalorimeterHitData>& evt, const double total_energy) {
     double std = 0.0;
     double count = 0.0;
     for (const auto& i: evt){
@@ -340,63 +340,63 @@ void emcal_barrel_pion_rejection_analysis(
     return std::sqrt(std / count);
   };
   //########################################################################################
-  auto ERecoScFiLayer1 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer1 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 1){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoScFiLayer2 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer2 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 2){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoScFiLayer3 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer3 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 3){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoScFiLayer4 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer4 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 4){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoScFiLayer5 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer5 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 5){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoScFiLayer6 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer6 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 6){total_edep += i.energy;}
     }
     return total_edep;
   };
-    auto ERecoScFiLayer7 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+    auto ERecoScFiLayer7 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 7){total_edep += i.energy;}
     }
     return total_edep;
   };
-    auto ERecoScFiLayer8 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+    auto ERecoScFiLayer8 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 8){total_edep += i.energy;}
     }
     return total_edep;
   };
-  auto ERecoScFiLayer9 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto ERecoScFiLayer9 = [](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 9){total_edep += i.energy;}
@@ -406,7 +406,7 @@ void emcal_barrel_pion_rejection_analysis(
   //#########################################################################################
 
   // Energy deposition at a layer / Energy of all layers
-  auto ERecoScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt, const double energy) {
+  auto ERecoScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<edm4eic::CalorimeterHitData>& evt, const double energy) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == layerNumScFi){total_edep += i.energy;}
@@ -415,7 +415,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Energy deposition at layer 4 / Energy of all layers
-  auto ERecoScFiLayerOverERecoScFi4 = [](const std::vector<eicd::CalorimeterHitData>& evt, const double energy) {
+  auto ERecoScFiLayerOverERecoScFi4 = [](const std::vector<edm4eic::CalorimeterHitData>& evt, const double energy) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       if (i.layer == 4){total_edep += i.energy;}
@@ -424,7 +424,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Nhits / Energy Deposition in that layer
-  auto nhitsScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt) {
+  auto nhitsScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<edm4eic::CalorimeterHitData>& evt) {
     double total_edep = 0.0;
     int nhits;
     for (const auto& i: evt){
@@ -437,7 +437,7 @@ void emcal_barrel_pion_rejection_analysis(
   // May want to look at position data as well
 
   // Energy deposition [GeV]
-  auto EClusScFi = [](const std::vector<eicd::ClusterData>& evt) {
+  auto EClusScFi = [](const std::vector<edm4eic::ClusterData>& evt) {
     double total_edep = 0.0;
     for (const auto& i: evt){
       total_edep += i.energy;
@@ -446,7 +446,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Number of energy deposits
-  auto nhitsClusScFi = [](const std::vector<eicd::ClusterData>& evt) {
+  auto nhitsClusScFi = [](const std::vector<edm4eic::ClusterData>& evt) {
     int nhitsTot = 0;
     for (const auto& i: evt){
       nhitsTot += i.nhits;
@@ -455,7 +455,7 @@ void emcal_barrel_pion_rejection_analysis(
   };
 
   // Mean number of energy deposits
-  auto nhitsClusMeanScFi = [](const std::vector<eicd::ClusterData>& evt) {
+  auto nhitsClusMeanScFi = [](const std::vector<edm4eic::ClusterData>& evt) {
     int nhitsTot = 0;
     int count = 0;
     for (const auto& i: evt){
diff --git a/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx b/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx
index 2e3795c4..49c3be1b 100644
--- a/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx
+++ b/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx
@@ -8,17 +8,17 @@
 
 #include <iostream>
 R__LOAD_LIBRARY(libJugBase.so)
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -100,9 +100,9 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root")
                  .Define("p_track", p_track, {"outputTrackParameters"})
                  .Define("delta_p0",delta_p, {"p_track", "p_thrown"})
                  .Define("delta_p_over_p0",delta_p_over_p, {"p_track", "p_thrown"})
-                 .Define("N_Hits",       [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
-                 .Define("N_BarrelHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
-                 .Define("N_EndcapHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+                 .Define("N_Hits",       [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
+                 .Define("N_BarrelHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
+                 .Define("N_EndcapHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
                  ;
 
   auto h_nTracks_vs_theta = df0.Histo2D({"h_nTracks_vs_theta", "; #theta; N tracks ", 40,0,180,10, 0, 10}, "theta0","nTracks");
diff --git a/benchmarks/track_fitting/scripts/rec_multiple_tracks.cxx b/benchmarks/track_fitting/scripts/rec_multiple_tracks.cxx
index f4043eba..c96827ce 100644
--- a/benchmarks/track_fitting/scripts/rec_multiple_tracks.cxx
+++ b/benchmarks/track_fitting/scripts/rec_multiple_tracks.cxx
@@ -8,17 +8,17 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -95,9 +95,9 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root")
                  .Define("p_track", p_track, {"outputTrackParameters"})
                  .Define("delta_p0",delta_p, {"p_track", "p_thrown"})
                  .Define("delta_p_over_p0",delta_p_over_p, {"p_track", "p_thrown"})
-                 .Define("N_Hits",       [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
-                 .Define("N_BarrelHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
-                 .Define("N_EndcapHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+                 .Define("N_Hits",       [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
+                 .Define("N_BarrelHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
+                 .Define("N_EndcapHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
                  ;
 
   auto h_nTracks_vs_theta = df0.Histo2D({"h_nTracks_vs_theta", "; #theta; N tracks ", 40,0,180,10, 0, 10}, "theta0","nTracks");
diff --git a/benchmarks/track_fitting/scripts/rec_single_tracks.cxx b/benchmarks/track_fitting/scripts/rec_single_tracks.cxx
index 5d2852aa..8a6a97d0 100644
--- a/benchmarks/track_fitting/scripts/rec_single_tracks.cxx
+++ b/benchmarks/track_fitting/scripts/rec_single_tracks.cxx
@@ -8,12 +8,12 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 #include "common_bench/util.h"
 namespace cb = common_bench;
@@ -21,7 +21,7 @@ namespace cb = common_bench;
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -100,9 +100,9 @@ int rec_single_tracks(const char* fname = "topside/rec_single_tracks.root")
                  .Define("p_track", p_track, {"outputTrackParameters"})
                  .Define("delta_p0",delta_p, {"p_track", "p_thrown"})
                  .Define("delta_p_over_p0",delta_p_over_p, {"p_track", "p_thrown"})
-                 .Define("N_Hits",       [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
-                 .Define("N_BarrelHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
-                 .Define("N_EndcapHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+                 .Define("N_Hits",       [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
+                 .Define("N_BarrelHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
+                 .Define("N_EndcapHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
                  ;
 
   auto htrackingHits_x_vs_y = df0.Histo2D({"htrackingHits_x_vs_y", "; x [mm]; y [mm] ", 100, -600, 600, 100, -600, 600},
diff --git a/benchmarks/tracking/scripts/hits_central_electrons.cxx b/benchmarks/tracking/scripts/hits_central_electrons.cxx
index 4e8f29ee..a1e84104 100644
--- a/benchmarks/tracking/scripts/hits_central_electrons.cxx
+++ b/benchmarks/tracking/scripts/hits_central_electrons.cxx
@@ -8,19 +8,19 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/SimTrackerHitData.h"
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -103,7 +103,7 @@ int hits_central_electrons(const char* fname = "sim_central_electrons.edm4hep.ro
                  //.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_p2",delta_p_over_p, {"p_track2", "p_thrown"})
-                 //.Define("N_VtxBarrelHits",[](std::vector<eicd::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+                 //.Define("N_VtxBarrelHits",[](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
                  .Define("N_BarrelHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"TrackerBarrelAllHits"})
                  .Define("N_EndcapHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"TrackerEndcapAllHits"})
                  ;
diff --git a/benchmarks/tracking/scripts/hits_central_pions.cxx b/benchmarks/tracking/scripts/hits_central_pions.cxx
index 866d1fe9..14034f04 100644
--- a/benchmarks/tracking/scripts/hits_central_pions.cxx
+++ b/benchmarks/tracking/scripts/hits_central_pions.cxx
@@ -8,19 +8,19 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/SimTrackerHitData.h"
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -103,7 +103,7 @@ int hits_central_pions(const char* fname = "sim_central_pions.edm4hep.root")
                  //.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_p2",delta_p_over_p, {"p_track2", "p_thrown"})
-                 //.Define("N_VtxBarrelHits",[](std::vector<eicd::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+                 //.Define("N_VtxBarrelHits",[](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
                  .Define("N_BarrelHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"TrackerBarrelAllHits"})
                  .Define("N_EndcapHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"TrackerEndcapAllHits"})
                  ;
diff --git a/benchmarks/tracking/scripts/rec_central_electrons.cxx b/benchmarks/tracking/scripts/rec_central_electrons.cxx
index a4bd4b2c..4a74eab6 100644
--- a/benchmarks/tracking/scripts/rec_central_electrons.cxx
+++ b/benchmarks/tracking/scripts/rec_central_electrons.cxx
@@ -8,17 +8,17 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -101,10 +101,10 @@ int rec_central_electrons(const char* fname = "topside/rec_central_electrons.roo
                  .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_p2",delta_p_over_p, {"p_track2", "p_thrown"})
-                 //.Define("N_VtxBarrelHits",[](std::vector<eicd::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
-                 .Define("N_Hits",       [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
-                 .Define("N_BarrelHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
-                 .Define("N_EndcapHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+                 //.Define("N_VtxBarrelHits",[](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+                 .Define("N_Hits",       [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
+                 .Define("N_BarrelHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
+                 .Define("N_EndcapHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
                  ;
 
   auto h_nTracks_vs_theta = df0.Histo2D({"h_nTracks_vs_theta", "; #theta; N tracks ", 40,0,180,10, 0, 10}, "theta0","nTracks");
diff --git a/benchmarks/tracking/scripts/rec_central_pions.cxx b/benchmarks/tracking/scripts/rec_central_pions.cxx
index f98a027e..b437f09e 100644
--- a/benchmarks/tracking/scripts/rec_central_pions.cxx
+++ b/benchmarks/tracking/scripts/rec_central_pions.cxx
@@ -8,17 +8,17 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -101,9 +101,9 @@ int rec_central_pions(const char* fname = "topside/rec_central_pions.root")
                  .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_p2",delta_p_over_p, {"p_track2", "p_thrown"})
-                 //.Define("N_VtxBarrelHits",[](std::vector<eicd::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
-                 .Define("N_BarrelHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
-                 .Define("N_EndcapHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+                 //.Define("N_VtxBarrelHits",[](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+                 .Define("N_BarrelHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
+                 .Define("N_EndcapHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
                  ;
 
   auto h_nTracks = df0.Histo1D({"h_nTracks", "; N tracks ", 10, 0, 10}, "nTracks");
diff --git a/benchmarks/tracking/scripts/rec_multiple_tracks.cxx b/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
index b5134cab..bf07ff9c 100644
--- a/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
+++ b/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
@@ -8,18 +8,18 @@
 
 #include <iostream>
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
-#include "eicd/TrackerHitCollection.h"
-#include "eicd/TrackSegmentCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
+#include "edm4eic/TrackerHitCollection.h"
+#include "edm4eic/TrackSegmentCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -27,7 +27,7 @@ auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
   return result;
 };
 
-auto z_segments = [](const std::vector<eicd::TrackSegmentData>& segments, const std::vector<eicd::TrackPoint>& points) {
+auto z_segments = [](const std::vector<edm4eic::TrackSegmentData>& segments, const std::vector<edm4eic::TrackPoint>& points) {
   std::vector<double> result;
   for (const auto& segment: segments) {
     for (size_t i = segment.points_begin; i < segment.points_end; i++) {
@@ -105,9 +105,9 @@ int rec_multiple_tracks(const char* fname = "topside/rec_multiple_tracks.root")
                  .Define("p_track", p_track, {"outputTrackParameters"})
                  .Define("delta_p0",delta_p, {"p_track", "p_thrown"})
                  .Define("delta_p_over_p0",delta_p_over_p, {"p_track", "p_thrown"})
-                 .Define("N_Hits",       [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
-                 .Define("N_BarrelHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
-                 .Define("N_EndcapHits", [](std::vector<eicd::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+                 .Define("N_Hits",       [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
+                 .Define("N_BarrelHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
+                 .Define("N_EndcapHits", [](std::vector<edm4eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
                  .Define("zTrackSegments", z_segments, {"HcalEndcapNTrackSegments", "HcalEndcapNTrackSegments_0"})
                  ;
 
-- 
GitLab