Skip to content
Snippets Groups Projects
Commit 1afd7507 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

fix benchmarks for new dd4pod

parent d2d405fc
No related branches found
No related tags found
1 merge request!67fix benchmarks for new dd4pod
...@@ -30,7 +30,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) { ...@@ -30,7 +30,7 @@ auto p_track = [](std::vector<eic::TrackParametersData> const& in) {
auto pt = [](std::vector<dd4pod::Geant4ParticleData> const& in){ auto pt = [](std::vector<dd4pod::Geant4ParticleData> const& in){
std::vector<float> result; std::vector<float> result;
for (size_t i = 0; i < in.size(); ++i) { for (size_t i = 0; i < in.size(); ++i) {
result.push_back(std::sqrt(in[i].psx * in[i].psx + in[i].psy * in[i].psy)); result.push_back(std::sqrt(in[i].ps.x * in[i].ps.x + in[i].ps.y * in[i].ps.y));
} }
return result; return result;
}; };
...@@ -53,7 +53,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) { ...@@ -53,7 +53,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
std::vector<ROOT::Math::PxPyPzMVector> result; std::vector<ROOT::Math::PxPyPzMVector> result;
ROOT::Math::PxPyPzMVector lv; ROOT::Math::PxPyPzMVector lv;
for (size_t i = 0; i < in.size(); ++i) { for (size_t i = 0; i < in.size(); ++i) {
lv.SetCoordinates(in[i].psx, in[i].psy, in[i].psz, in[i].mass); lv.SetCoordinates(in[i].ps.x, in[i].ps.y, in[i].ps.z, in[i].mass);
result.push_back(lv); result.push_back(lv);
} }
return result; return result;
...@@ -94,7 +94,7 @@ void dvcs_tests(const char* fname = "rec_dvcs.root"){ ...@@ -94,7 +94,7 @@ void dvcs_tests(const char* fname = "rec_dvcs.root"){
auto eprime = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) { auto eprime = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
for(const auto& p : in){ for(const auto& p : in){
if(p.pdgID == 11 ) { if(p.pdgID == 11 ) {
return PxPyPzMVector(p.psx,p.psy,p.psz,p.mass); return PxPyPzMVector(p.ps.x,p.ps.y,p.ps.z,p.mass);
} }
} }
return PxPyPzMVector(0,0,0,0); return PxPyPzMVector(0,0,0,0);
......
...@@ -28,9 +28,9 @@ namespace util { ...@@ -28,9 +28,9 @@ namespace util {
std::vector<ROOT::Math::PxPyPzMVector> momenta{7}; std::vector<ROOT::Math::PxPyPzMVector> momenta{7};
int order_map[7] = {0, 3, 2, 6, 5, 7, 8}; int order_map[7] = {0, 3, 2, 6, 5, 7, 8};
for(int i = 0 ; i < 7 ; i++){ for(int i = 0 ; i < 7 ; i++){
double px = parts[order_map[i]].psx; double px = parts[order_map[i]].ps.x;
double py = parts[order_map[i]].psy; double py = parts[order_map[i]].ps.y;
double pz = parts[order_map[i]].psz; double pz = parts[order_map[i]].ps.z;
double mass = parts[order_map[i]].mass; double mass = parts[order_map[i]].mass;
double e = sqrt(px*px + py*py + pz*pz + mass*mass); double e = sqrt(px*px + py*py + pz*pz + mass*mass);
momenta[i].SetPxPyPzE(px, py, pz, e); momenta[i].SetPxPyPzE(px, py, pz, e);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment