From 92bbec45299c6429ed4418987618dd92abfa385d Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 22 Nov 2022 20:54:36 +0000
Subject: [PATCH] fix: rm DD4pod in cxx macros
---
.../backgrounds/analysis/synchrotron_raw.cxx | 1 -
.../backgrounds/analysis/synchrotron_sim.cxx | 1 -
benchmarks/dvcs/analysis/dvcs_tests.cxx | 1 -
benchmarks/tcs/analysis/tcs_tests.cxx | 1 -
benchmarks/u_omega/analysis/demo.cxx | 30 ++-----------------
5 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/benchmarks/backgrounds/analysis/synchrotron_raw.cxx b/benchmarks/backgrounds/analysis/synchrotron_raw.cxx
index d68b4652..14a7b1fd 100644
--- a/benchmarks/backgrounds/analysis/synchrotron_raw.cxx
+++ b/benchmarks/backgrounds/analysis/synchrotron_raw.cxx
@@ -15,7 +15,6 @@ R__LOAD_LIBRARY(libfmt.so)
#include "fmt/color.h"
R__LOAD_LIBRARY(libedm4eic.so)
-R__LOAD_LIBRARY(libDD4pod.so)
#include "edm4eic/ReconstructedParticleCollection.h"
diff --git a/benchmarks/backgrounds/analysis/synchrotron_sim.cxx b/benchmarks/backgrounds/analysis/synchrotron_sim.cxx
index 742de99a..fc22532e 100644
--- a/benchmarks/backgrounds/analysis/synchrotron_sim.cxx
+++ b/benchmarks/backgrounds/analysis/synchrotron_sim.cxx
@@ -16,7 +16,6 @@ R__LOAD_LIBRARY(libfmt.so)
#include "fmt/color.h"
R__LOAD_LIBRARY(libedm4eic.so)
-R__LOAD_LIBRARY(libDD4pod.so)
#include "edm4eic/ReconstructedParticleCollection.h"
diff --git a/benchmarks/dvcs/analysis/dvcs_tests.cxx b/benchmarks/dvcs/analysis/dvcs_tests.cxx
index 65e68bc3..3218a0a5 100644
--- a/benchmarks/dvcs/analysis/dvcs_tests.cxx
+++ b/benchmarks/dvcs/analysis/dvcs_tests.cxx
@@ -15,7 +15,6 @@ R__LOAD_LIBRARY(libfmt.so)
#include "fmt/color.h"
R__LOAD_LIBRARY(libedm4eic.so)
-R__LOAD_LIBRARY(libDD4pod.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 2c48ee5c..0f33fa6b 100644
--- a/benchmarks/tcs/analysis/tcs_tests.cxx
+++ b/benchmarks/tcs/analysis/tcs_tests.cxx
@@ -16,7 +16,6 @@ R__LOAD_LIBRARY(libfmt.so)
#include "fmt/color.h"
R__LOAD_LIBRARY(libedm4eic.so)
-R__LOAD_LIBRARY(libDD4pod.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 d8eb7433..46f7b472 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;
};
--
GitLab