From cccbed9b66ee7c7ca7c9a545e78ad530c2bb1bbd Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 1 Mar 2022 18:07:16 +0000
Subject: [PATCH] eic:: to eicd::
---
.../scripts/deprecated/barrel_clusters.cxx | 6 +-
.../analysis/hits_far_forward_protons.cxx | 4 +-
.../analysis/print_far_forward_protons.cxx | 12 +--
.../analysis/rec_far_forward_protons.cxx | 6 +-
.../emcal_barrel_pion_rejection_analysis.cxx | 76 +++++++++----------
.../scripts/check_edep_dists.py | 2 +-
.../scripts/rec_multiple_tracks.cxx | 8 +-
.../scripts/rec_multiple_tracks.cxx | 8 +-
.../scripts/rec_single_tracks.cxx | 8 +-
.../scripts/hits_central_electrons.cxx | 4 +-
.../tracking/scripts/hits_central_pions.cxx | 4 +-
.../scripts/rec_central_electrons.cxx | 10 +--
.../tracking/scripts/rec_central_pions.cxx | 8 +-
.../tracking/scripts/rec_multiple_tracks.cxx | 8 +-
14 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/benchmarks/clustering/scripts/deprecated/barrel_clusters.cxx b/benchmarks/clustering/scripts/deprecated/barrel_clusters.cxx
index efc82914..0f226e92 100644
--- a/benchmarks/clustering/scripts/deprecated/barrel_clusters.cxx
+++ b/benchmarks/clustering/scripts/deprecated/barrel_clusters.cxx
@@ -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<eic::ClusterData>& clusters) {
+auto delta_E_over_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, const std::vector<eicd::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<eic::ClusterData>& clusters) {
+auto delta_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, const std::vector<eicd::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<eic::ClusterData>& in) {
+ [](const std::vector<eicd::ClusterData>& in) {
std::vector<double> res;
for (const auto& i : in)
res.push_back(i.energy);
diff --git a/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx b/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
index 976ad546..639096d5 100644
--- a/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
+++ b/benchmarks/far_forward/analysis/hits_far_forward_protons.cxx
@@ -21,7 +21,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -104,7 +104,7 @@ int hits_far_forward_protons(const char* fname = "sim_far_forward_protons.edm4he
//.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<eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+ //.Define("N_VtxBarrelHits",[](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
.Define("N_BarrelHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"TrackerBarrelHits"})
.Define("N_EndcapHits", [](std::vector<edm4hep::SimTrackerHitData> hits) { return hits.size();}, {"TrackerEndcapHits1"})
;
diff --git a/benchmarks/far_forward/analysis/print_far_forward_protons.cxx b/benchmarks/far_forward/analysis/print_far_forward_protons.cxx
index 841c0bf8..56ad3359 100644
--- a/benchmarks/far_forward/analysis/print_far_forward_protons.cxx
+++ b/benchmarks/far_forward/analysis/print_far_forward_protons.cxx
@@ -25,16 +25,16 @@ int print_far_forward_protons(const char* fname = "topside/rec_far_forward_proto
auto d1 = df0.Display(
{
- "ForwardRomanPotParticles.p.x",
- "ForwardRomanPotParticles.p.y",
- "ForwardRomanPotParticles.p.z"
+ "ForwardRomanPotParticles.momentum.x",
+ "ForwardRomanPotParticles.momentum.y",
+ "ForwardRomanPotParticles.momentum.z"
}
);
auto d2 = df0.Display(
{
- "ForwardOffMTrackerParticles.p.x",
- "ForwardOffMTrackerParticles.p.y",
- "ForwardOffMTrackerParticles.p.z"
+ "ForwardOffMTrackerParticles.momentum.x",
+ "ForwardOffMTrackerParticles.momentum.y",
+ "ForwardOffMTrackerParticles.momentum.z"
}
);
diff --git a/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx b/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx
index 8a84c11c..98a302fb 100644
--- a/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx
+++ b/benchmarks/far_forward/analysis/rec_far_forward_protons.cxx
@@ -19,7 +19,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -102,8 +102,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<eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
- .Define("N_B0TrackerHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"B0TrackerRecHits"})
+ //.Define("N_VtxBarrelHits",[](std::vector<eicd::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+ .Define("N_B0TrackerHits", [](std::vector<eicd::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 288c59c5..3b1e2cc5 100644
--- a/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
@@ -137,7 +137,7 @@ void emcal_barrel_pion_rejection_analysis(
// RecoEcalBarrelImagingHits Functions/////////////////////////////////////////////////////////////////////////////////////
int layerNumImg;
// Energy deposition [GeV]
- auto ERecoImg = [](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto ERecoImg = [](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
total_edep += i.energy;
@@ -146,7 +146,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Nhits in layer
- auto nhitsImgLayer = [&layerNumImg](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto nhitsImgLayer = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt) {
int nhitsTot;
for (const auto& i: evt){
if (i.layer == layerNumImg){nhitsTot++;}
@@ -155,7 +155,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Energy deposition at a layer
- auto ERecoImgLayer = [&layerNumImg](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto ERecoImgLayer = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
if (i.layer == layerNumImg){total_edep += i.energy;}
@@ -164,42 +164,42 @@ void emcal_barrel_pion_rejection_analysis(
};
//###########################################################################################
// Energy deposition at a layer
- auto ERecoImgLayer1 = [](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto ERecoImgLayer1 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoImgLayer2 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoImgLayer3 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoImgLayer4 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoImgLayer5 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoImgLayer6 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
if (i.layer == 6){total_edep += i.energy;}
@@ -209,7 +209,7 @@ void emcal_barrel_pion_rejection_analysis(
//###########################################################################################
// Energy deposition at a layer / Energy of all layers
- auto ERecoImgLayerOverERecoImg = [&layerNumImg](const std::vector<eic::CalorimeterHitData>& evt, const double energy) {
+ auto ERecoImgLayerOverERecoImg = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt, const double energy) {
double total_edep = 0.0;
for (const auto& i: evt){
if (i.layer == layerNumImg){total_edep += i.energy;}
@@ -218,7 +218,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Nhits / Energy Deposition in that layer
- auto nhitsImgLayerOverERecoImg = [&layerNumImg](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto nhitsImgLayerOverERecoImg = [&layerNumImg](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
int nhits;
for (const auto& i: evt){
@@ -229,7 +229,7 @@ void emcal_barrel_pion_rejection_analysis(
// EcalBarrelImagingClustersLayers Functions////////////////////////////////////////////////////////////////////////////////
// Number of hits
- auto nhitsClusLayerImg = [] (const std::vector<eic::ClusterLayerData>& evt) {
+ auto nhitsClusLayerImg = [] (const std::vector<eicd::ClusterLayerData>& evt) {
int nhitsTot = 0;
for (const auto &i : evt){
nhitsTot += i.nhits;
@@ -238,10 +238,10 @@ void emcal_barrel_pion_rejection_analysis(
};
// Number of clusters
- auto nClusLayerImg = [] (const std::vector<eic::ClusterLayerData>& evt) {return (int) evt.size(); };
+ auto nClusLayerImg = [] (const std::vector<eicd::ClusterLayerData>& evt) {return (int) evt.size(); };
// Energy deposition in cluster [GeV]
- auto EClusLayerImg = [](const std::vector<eic::ClusterLayerData>& evt) {
+ auto EClusLayerImg = [](const std::vector<eicd::ClusterLayerData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
total_edep += i.energy;
@@ -250,7 +250,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Max Energy deposition in cluster [GeV]
- auto EClusLayerMaxImg = [](const std::vector<eic::ClusterLayerData>& evt) {
+ auto EClusLayerMaxImg = [](const std::vector<eicd::ClusterLayerData>& evt) {
double max = 0.0;
for (const auto& i: evt){
if (i.energy > max){max = i.energy;}
@@ -259,7 +259,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Min Energy deposition in cluster [GeV]
- auto EClusLayerMax2Img = [](const std::vector<eic::ClusterLayerData>& evt) {
+ auto EClusLayerMax2Img = [](const std::vector<eicd::ClusterLayerData>& evt) {
double max1 = 0.0;
double max2 = 0.0;
for (const auto& i: evt){
@@ -272,7 +272,7 @@ void emcal_barrel_pion_rejection_analysis(
// May want to look at position data as well
// Energy deposition [GeV]
- auto EClusImg = [](const std::vector<eic::ClusterData>& evt) {
+ auto EClusImg = [](const std::vector<eicd::ClusterData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
total_edep += i.energy;
@@ -281,7 +281,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Number of energy deposits
- auto nhitsClusImg = [](const std::vector<eic::ClusterData>& evt) {
+ auto nhitsClusImg = [](const std::vector<eicd::ClusterData>& evt) {
int nhitsTot = 0;
for (const auto& i: evt){
nhitsTot += i.nhits;
@@ -290,7 +290,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Mean number of energy deposits
- auto nhitsClusMeanImg = [](const std::vector<eic::ClusterData>& evt) {
+ auto nhitsClusMeanImg = [](const std::vector<eicd::ClusterData>& evt) {
int nhitsTot = 0;
int count = 0;
for (const auto& i: evt){
@@ -303,7 +303,7 @@ void emcal_barrel_pion_rejection_analysis(
// EcalBarrelScFiHitsReco Functions/////////////////////////////////////////////////////////////////////////////////////
int layerNumScFi;
// Energy deposition [GeV]
- auto ERecoScFi = [](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFi = [](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
total_edep += i.energy;
@@ -312,7 +312,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Nhits in layer
- auto nhitsScFiLayer = [&layerNumScFi](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto nhitsScFiLayer = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt) {
int nhits;
for (const auto& i: evt){
if (i.layer == layerNumScFi){nhits++;}
@@ -321,7 +321,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Energy deposition at a layer
- auto ERecoScFiLayer = [&layerNumScFi](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
if (i.layer == layerNumScFi){total_edep += i.energy;}
@@ -330,7 +330,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// STD Deviation
- auto ERecoSTDScFi = [](const std::vector<eic::CalorimeterHitData>& evt, const double total_energy) {
+ auto ERecoSTDScFi = [](const std::vector<eicd::CalorimeterHitData>& evt, const double total_energy) {
double std = 0.0;
double count = 0.0;
for (const auto& i: evt){
@@ -342,63 +342,63 @@ void emcal_barrel_pion_rejection_analysis(
return std::sqrt(std / count);
};
//########################################################################################
- auto ERecoScFiLayer1 = [](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer1 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer2 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer3 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer4 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer5 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer6 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer7 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer8 = [](const std::vector<eicd::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<eic::CalorimeterHitData>& evt) {
+ auto ERecoScFiLayer9 = [](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
if (i.layer == 9){total_edep += i.energy;}
@@ -408,7 +408,7 @@ void emcal_barrel_pion_rejection_analysis(
//#########################################################################################
// Energy deposition at a layer / Energy of all layers
- auto ERecoScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<eic::CalorimeterHitData>& evt, const double energy) {
+ auto ERecoScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt, const double energy) {
double total_edep = 0.0;
for (const auto& i: evt){
if (i.layer == layerNumScFi){total_edep += i.energy;}
@@ -417,7 +417,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Energy deposition at layer 4 / Energy of all layers
- auto ERecoScFiLayerOverERecoScFi4 = [](const std::vector<eic::CalorimeterHitData>& evt, const double energy) {
+ auto ERecoScFiLayerOverERecoScFi4 = [](const std::vector<eicd::CalorimeterHitData>& evt, const double energy) {
double total_edep = 0.0;
for (const auto& i: evt){
if (i.layer == 4){total_edep += i.energy;}
@@ -426,7 +426,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Nhits / Energy Deposition in that layer
- auto nhitsScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<eic::CalorimeterHitData>& evt) {
+ auto nhitsScFiLayerOverERecoScFi = [&layerNumScFi](const std::vector<eicd::CalorimeterHitData>& evt) {
double total_edep = 0.0;
int nhits;
for (const auto& i: evt){
@@ -439,7 +439,7 @@ void emcal_barrel_pion_rejection_analysis(
// May want to look at position data as well
// Energy deposition [GeV]
- auto EClusScFi = [](const std::vector<eic::ClusterData>& evt) {
+ auto EClusScFi = [](const std::vector<eicd::ClusterData>& evt) {
double total_edep = 0.0;
for (const auto& i: evt){
total_edep += i.energy;
@@ -448,7 +448,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Number of energy deposits
- auto nhitsClusScFi = [](const std::vector<eic::ClusterData>& evt) {
+ auto nhitsClusScFi = [](const std::vector<eicd::ClusterData>& evt) {
int nhitsTot = 0;
for (const auto& i: evt){
nhitsTot += i.nhits;
@@ -457,7 +457,7 @@ void emcal_barrel_pion_rejection_analysis(
};
// Mean number of energy deposits
- auto nhitsClusMeanScFi = [](const std::vector<eic::ClusterData>& evt) {
+ auto nhitsClusMeanScFi = [](const std::vector<eicd::ClusterData>& evt) {
int nhitsTot = 0;
int count = 0;
for (const auto& i: evt){
diff --git a/benchmarks/imaging_shower_ML/scripts/check_edep_dists.py b/benchmarks/imaging_shower_ML/scripts/check_edep_dists.py
index 76dca744..01eab220 100644
--- a/benchmarks/imaging_shower_ML/scripts/check_edep_dists.py
+++ b/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 (eic::CalorimeterHitCollection)')
+ parser.add_argument('--branch', type=str, default='EcalBarrelImagingHitsReco', help='name of data branch (eicd::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')
diff --git a/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx b/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx
index 2f1fa6ad..46600f1d 100644
--- a/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx
+++ b/benchmarks/track_finding/scripts/rec_multiple_tracks.cxx
@@ -19,7 +19,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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_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<eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
- .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
- .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+ .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"})
;
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 99f0ded5..ed1a5cdf 100644
--- a/benchmarks/track_fitting/scripts/rec_multiple_tracks.cxx
+++ b/benchmarks/track_fitting/scripts/rec_multiple_tracks.cxx
@@ -19,7 +19,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -96,9 +96,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<eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
- .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
- .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+ .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"})
;
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 4569358b..df53981b 100644
--- a/benchmarks/track_fitting/scripts/rec_single_tracks.cxx
+++ b/benchmarks/track_fitting/scripts/rec_single_tracks.cxx
@@ -22,7 +22,7 @@ namespace cb = common_bench;
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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_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<eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
- .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
- .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+ .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"})
;
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 b36c350c..cd89209e 100644
--- a/benchmarks/tracking/scripts/hits_central_electrons.cxx
+++ b/benchmarks/tracking/scripts/hits_central_electrons.cxx
@@ -21,7 +21,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -104,7 +104,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<eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+ //.Define("N_VtxBarrelHits",[](std::vector<eicd::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 6263e1c1..00c2afce 100644
--- a/benchmarks/tracking/scripts/hits_central_pions.cxx
+++ b/benchmarks/tracking/scripts/hits_central_pions.cxx
@@ -21,7 +21,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -104,7 +104,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<eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
+ //.Define("N_VtxBarrelHits",[](std::vector<eicd::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 ad241ebb..df64ea46 100644
--- a/benchmarks/tracking/scripts/rec_central_electrons.cxx
+++ b/benchmarks/tracking/scripts/rec_central_electrons.cxx
@@ -19,7 +19,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -102,10 +102,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<eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
- .Define("N_Hits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
- .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
- .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+ //.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"})
;
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 588a5a02..708eebc9 100644
--- a/benchmarks/tracking/scripts/rec_central_pions.cxx
+++ b/benchmarks/tracking/scripts/rec_central_pions.cxx
@@ -19,7 +19,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -102,9 +102,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<eic::TrackerHitData> hits) { return hits.size();},{"VertexBarrelRecHits"})
- .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
- .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+ //.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"})
;
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 99f0ded5..ed1a5cdf 100644
--- a/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
+++ b/benchmarks/tracking/scripts/rec_multiple_tracks.cxx
@@ -19,7 +19,7 @@ R__LOAD_LIBRARY(libDD4pod.so)
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
-auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
+auto p_track = [](std::vector<eicd::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)));
@@ -96,9 +96,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<eic::TrackerHitData> hits) { return hits.size();}, {"trackingHits"})
- .Define("N_BarrelHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerBarrelRecHits"})
- .Define("N_EndcapHits", [](std::vector<eic::TrackerHitData> hits) { return hits.size();}, {"TrackerEndcapRecHits"})
+ .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"})
;
auto h_nTracks_vs_theta = df0.Histo2D({"h_nTracks_vs_theta", "; #theta; N tracks ", 40,0,180,10, 0, 10}, "theta0","nTracks");
--
GitLab