diff --git a/benchmarks/backgrounds/analysis/synchrotron_raw.cxx b/benchmarks/backgrounds/analysis/synchrotron_raw.cxx index 40ccc1e23bd852c0a09745ccc7fb02f2571712f6..14a7b1fdbb9f9defd7186d5b3f64c8cd6c4830b5 100644 --- a/benchmarks/backgrounds/analysis/synchrotron_raw.cxx +++ b/benchmarks/backgrounds/analysis/synchrotron_raw.cxx @@ -16,7 +16,6 @@ R__LOAD_LIBRARY(libfmt.so) R__LOAD_LIBRARY(libedm4eic.so) - #include "edm4eic/ReconstructedParticleCollection.h" void synchrotron_raw(const char* fname = "rec_synchrotron.raw.root"){ diff --git a/benchmarks/backgrounds/analysis/synchrotron_sim.cxx b/benchmarks/backgrounds/analysis/synchrotron_sim.cxx index 06e28858af07145e20da6f58b996c992a795bf3e..fc22532ee98d213a9a00014d9ec0faa1026226ac 100644 --- a/benchmarks/backgrounds/analysis/synchrotron_sim.cxx +++ b/benchmarks/backgrounds/analysis/synchrotron_sim.cxx @@ -17,7 +17,6 @@ R__LOAD_LIBRARY(libfmt.so) R__LOAD_LIBRARY(libedm4eic.so) - #include "edm4eic/ReconstructedParticleCollection.h" void synchrotron_sim(const char* fname = "sim_synchrotron.edm4hep.root"){ diff --git a/benchmarks/dvcs/analysis/dvcs_tests.cxx b/benchmarks/dvcs/analysis/dvcs_tests.cxx index f527482b6688d51a1bb89fced9380f3f1319b3b8..3218a0a5178ab881b0d0ea043f0667a5c6bb023d 100644 --- a/benchmarks/dvcs/analysis/dvcs_tests.cxx +++ b/benchmarks/dvcs/analysis/dvcs_tests.cxx @@ -16,7 +16,6 @@ R__LOAD_LIBRARY(libfmt.so) R__LOAD_LIBRARY(libedm4eic.so) - #include "edm4eic/InclusiveKinematicsCollection.h" #include "edm4eic/ReconstructedParticleCollection.h" diff --git a/benchmarks/tcs/analysis/tcs_tests.cxx b/benchmarks/tcs/analysis/tcs_tests.cxx index 2624dbc253dad009d7ecd05cc6976080b816c631..0f33fa6b33bd796196f790e86a0a85d9c6a8c7b0 100644 --- a/benchmarks/tcs/analysis/tcs_tests.cxx +++ b/benchmarks/tcs/analysis/tcs_tests.cxx @@ -17,7 +17,6 @@ R__LOAD_LIBRARY(libfmt.so) R__LOAD_LIBRARY(libedm4eic.so) - #include "edm4eic/InclusiveKinematicsCollection.h" #include "edm4eic/ReconstructedParticleCollection.h" diff --git a/benchmarks/u_omega/analysis/demo.cxx b/benchmarks/u_omega/analysis/demo.cxx index d8eb7433348248c52bcd91dac3d8a34a176a6f1d..46f7b472b536615cfa89200d365a808c8a9e39ba 100644 --- a/benchmarks/u_omega/analysis/demo.cxx +++ b/benchmarks/u_omega/analysis/demo.cxx @@ -15,9 +15,7 @@ R__LOAD_LIBRARY(libfmt.so) #include "fmt/color.h" R__LOAD_LIBRARY(libedm4eic.so) -R__LOAD_LIBRARY(libDD4pod.so) -#include "dd4pod/Geant4ParticleCollection.h" #include "edm4eic/TrackParametersCollection.h" #include "edm4eic/ClusterCollection.h" #include "edm4eic/ReconstructedParticleCollection.h" @@ -34,15 +32,6 @@ auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) { return result; }; - -auto pt = [](std::vector<dd4pod::Geant4ParticleData> const& in){ - std::vector<float> result; - for (size_t i = 0; i < in.size(); ++i) { - result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y)); - } - return result; -}; - auto momentum = [](std::vector<ROOT::Math::PxPyPzMVector> const& in) { std::vector<double> result; for (size_t i = 0; i < in.size(); ++i) { @@ -50,6 +39,7 @@ auto momentum = [](std::vector<ROOT::Math::PxPyPzMVector> const& in) { } return result; }; + auto theta = [](std::vector<ROOT::Math::PxPyPzMVector> const& in) { std::vector<double> result; for (size_t i = 0; i < in.size(); ++i) { @@ -57,15 +47,7 @@ auto theta = [](std::vector<ROOT::Math::PxPyPzMVector> const& in) { } return result; }; -auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) { - std::vector<ROOT::Math::PxPyPzMVector> result; - ROOT::Math::PxPyPzMVector lv; - for (size_t i = 0; i < in.size(); ++i) { - lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass); - result.push_back(lv); - } - return result; -}; + auto recfourvec = [](ROOT::VecOps::RVec<edm4eic::ReconstructedParticleData> const& in) { std::vector<ROOT::Math::PxPyPzMVector> result; ROOT::Math::PxPyPzMVector lv; @@ -99,14 +81,6 @@ void demo(const char* fname = "rec_dvcs.root"){ PxPyPzMVector p_ebeam = {0,0,-10, 0.000511}; PxPyPzMVector p_pbeam = {0,0,275, 0.938 }; - auto eprime = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) { - for(const auto& p : in){ - if(p.pdgID == 11 ) { - return PxPyPzMVector(p.ps.x,p.ps.y,p.ps.z,p.mass); - } - } - return PxPyPzMVector(0,0,0,0); - }; auto q_vec = [=](PxPyPzMVector const& p) { return p_ebeam - p; };