Skip to content
Snippets Groups Projects

fix: remaining eicd to edm4eic fixes

Merged Wouter Deconinck requested to merge eicd-to-edm4eic into master
2 files
+ 6
6
Compare changes
  • Side-by-side
  • Inline
Files
2
#include <iostream>
#include <iostream>
#include "ROOT/RDataFrame.hxx"
#include "ROOT/RDataFrame.hxx"
#include "edm4hep/MCParticleCollection.h"
#include "edm4hep/MCParticleCollection.h"
#include "eicd/ClusterCollection.h"
#include "edm4eic/ClusterCollection.h"
#include "eicd/ClusterData.h"
#include "edm4eic/ClusterData.h"
using ROOT::RDataFrame;
using ROOT::RDataFrame;
using namespace ROOT::VecOps;
using namespace ROOT::VecOps;
@@ -54,7 +54,7 @@ auto eta = [](ROOT::VecOps::RVec<edm4hep::MCParticleData> const& in) {
@@ -54,7 +54,7 @@ auto eta = [](ROOT::VecOps::RVec<edm4hep::MCParticleData> const& in) {
return result;
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;
std::vector<double> result;
double best = 1000000.0;
double best = 1000000.0;
for (const auto& p : thrown) {
for (const auto& p : thrown) {
@@ -68,7 +68,7 @@ auto delta_E_over_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, c
@@ -68,7 +68,7 @@ auto delta_E_over_E = [](std::vector<ROOT::Math::PxPyPzMVector> const& thrown, c
}
}
return result;
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;
std::vector<double> result;
double best = 1000000.0;
double best = 1000000.0;
for (const auto& p : thrown) {
for (const auto& p : thrown) {
@@ -99,7 +99,7 @@ int barrel_clusters(const char* in_fname = "topside/rec_barrel_clusters.root")
@@ -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("delta_E_over_E", delta_E_over_E, {"thrownP","SimpleClusters"})
.Define("nclusters", "SimpleClusters.size()")
.Define("nclusters", "SimpleClusters.size()")
.Define("Ecluster",
.Define("Ecluster",
[](const std::vector<eicd::ClusterData>& in) {
[](const std::vector<edm4eic::ClusterData>& in) {
std::vector<double> res;
std::vector<double> res;
for (const auto& i : in)
for (const auto& i : in)
res.push_back(i.energy);
res.push_back(i.energy);
Loading