fix: remaining eicd to edm4eic fixes

benchmarks/clustering/scripts/deprecated/barrel_clusters.cxx

 #include <iostream>
 #include "ROOT/RDataFrame.hxx"
 #include "edm4hep/MCParticleCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ClusterData.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ClusterData.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
@@ -54,7 +54,7 @@ auto eta = [](ROOT::VecOps::RVec<edm4hep::MCParticleData> const& in) {
   return result;
 };
 
-auto delta_E_over_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, const std::vector<eicd::ClusterData>& clusters) {
+auto delta_E_over_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, const std::vector<edm4eic::ClusterData>& clusters) {
   std::vector<double> result;
   double best = 1000000.0;
   for (const auto& p : thrown) {
@@ -68,7 +68,7 @@ auto delta_E_over_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, c
   }
   return result;
 };
-auto delta_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, const std::vector<eicd::ClusterData>& clusters) {
+auto delta_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, const std::vector<edm4eic::ClusterData>& clusters) {
   std::vector<double> result;
   double best = 1000000.0;
   for (const auto& p : thrown) {
@@ -99,7 +99,7 @@ int barrel_clusters(const char* in_fname = "topside/rec_barrel_clusters.root")
                 .Define("delta_E_over_E", delta_E_over_E, {"thrownP","SimpleClusters"})
                 .Define("nclusters", "SimpleClusters.size()")
                 .Define("Ecluster",
-                        [](const std::vector<eicd::ClusterData>& in) {
+                        [](const std::vector<edm4eic::ClusterData>& in) {
                           std::vector<double> res;
                           for (const auto& i : in)
                             res.push_back(i.energy);

benchmarks/imaging_shower_ML/scripts/check_edep_dists.py

@@ -62,7 +62,7 @@ if __name__ == '__main__':
     # parser.add_argument('--compact', type=str, default='', dest='compact', help='compact file')
     parser.add_argument('-m', '--macros', type=str, default='rootlogon.C', dest='macros',
                          help='root macros to load (accept multiple paths separated by \",\")')
-    parser.add_argument('--branch', type=str, default='EcalBarrelImagingHitsReco', help='name of data branch (eicd::CalorimeterHitCollection)')
+    parser.add_argument('--branch', type=str, default='EcalBarrelImagingHitsReco', help='name of data branch (edm4eic::CalorimeterHitCollection)')
     parser.add_argument('--truth-branch', type=str, default='MCParticles', help='name of truth mc branch')
     parser.add_argument('--edep-max', type=float, default=0., help='maximum edep (GeV) to plot')
     parser.add_argument('--edep-nbins', type=int, default=200, help='number of bins')