Skip to content
Snippets Groups Projects
Commit 0bacc4e1 authored by christopher dilks's avatar christopher dilks
Browse files

eic -> eicd

parent f98f52a9
No related branches found
No related tags found
1 merge request!10Draft: edm4hep refactoring
Pipeline #32183 failed with stages
in 17 seconds
Hide whitespace changes
Inline Side-by-side
evaluation/include/evaluationLinkDef.h
+ 3
− 3
View file @ 0bacc4e1
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#pragma link off all classes; #pragma link off all classes;
#pragma link off all functions; #pragma link off all functions;
#pragma link C++ class std::vector<eic::CherenkovPdgHypothesis>+; #pragma link C++ class std::vector<eicd::CherenkovPdgHypothesis>+;
#pragma link C++ class std::vector<eic::CherenkovThetaAngleMeasurement>+; #pragma link C++ class std::vector<eicd::CherenkovThetaAngleMeasurement>+;
#pragma link C++ class std::vector<eic::CherenkovParticleIDData>+; #pragma link C++ class std::vector<eicd::CherenkovParticleIDData>+;
#pragma link C++ class std::vector<dd4pod::Geant4ParticleData>+; #pragma link C++ class std::vector<dd4pod::Geant4ParticleData>+;
#pragma link C++ class std::vector<dd4pod::TrackerHitData>+; #pragma link C++ class std::vector<dd4pod::TrackerHitData>+;
......
evaluation/source/evaluation.cc
+ 6
− 6
View file @ 0bacc4e1
...@@ -36,8 +36,8 @@ int main(int argc, char** argv) ...@@ -36,8 +36,8 @@ int main(int argc, char** argv)
// Use MC truth particles for a "main" loop; // Use MC truth particles for a "main" loop;
auto mctracks = new std::vector<dd4pod::Geant4ParticleData>(); auto mctracks = new std::vector<dd4pod::Geant4ParticleData>();
auto rctracks = new std::vector<eic::ReconstructedParticleData>(); auto rctracks = new std::vector<eicd::ReconstructedParticleData>();
auto cherenkov = new std::vector<eic::CherenkovParticleIDData>(); auto cherenkov = new std::vector<eicd::CherenkovParticleIDData>();
t->SetBranchAddress("mcparticles", &mctracks); t->SetBranchAddress("mcparticles", &mctracks);
// FIXME: or whatever the branches are called; // FIXME: or whatever the branches are called;
...@@ -45,7 +45,7 @@ int main(int argc, char** argv) ...@@ -45,7 +45,7 @@ int main(int argc, char** argv)
t->SetBranchAddress("rcparticles", &rctracks); t->SetBranchAddress("rcparticles", &rctracks);
#endif #endif
t->SetBranchAddress("PFRICHPID", &cherenkov); t->SetBranchAddress("PFRICHPID", &cherenkov);
auto options = new std::vector<eic::CherenkovPdgHypothesis>(); auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
t->SetBranchAddress("PFRICHPID_0", &options); t->SetBranchAddress("PFRICHPID_0", &options);
// Loop through all events; // Loop through all events;
...@@ -55,14 +55,14 @@ int main(int argc, char** argv) ...@@ -55,14 +55,14 @@ int main(int argc, char** argv)
#ifdef _USE_RECONSTRUCTED_TRACKS_ #ifdef _USE_RECONSTRUCTED_TRACKS_
// First populate the reconstructed-to-simulated particle mapping table; // First populate the reconstructed-to-simulated particle mapping table;
std::map<eic::Index, const eic::ReconstructedParticleData*> mc2rc; std::map<eic::Index, const eicd::ReconstructedParticleData*> mc2rc;
for(const auto &rctrack: *rctracks) for(const auto &rctrack: *rctracks)
mc2rc[rctrack.mcID] = &rctrack; mc2rc[rctrack.mcID] = &rctrack;
#endif #endif
// Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated
// mapping to start with, for the debugging purposes; // mapping to start with, for the debugging purposes;
std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov; std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
for(const auto &pid: *cherenkov) for(const auto &pid: *cherenkov)
rc2cherenkov[pid.recID] = &pid; rc2cherenkov[pid.recID] = &pid;
...@@ -85,7 +85,7 @@ int main(int argc, char** argv) ...@@ -85,7 +85,7 @@ int main(int argc, char** argv)
// Loop through all of the mass hypotheses available for this reconstructed track; // Loop through all of the mass hypotheses available for this reconstructed track;
{ {
const eic::CherenkovPdgHypothesis *best = 0; const eicd::CherenkovPdgHypothesis *best = 0;
//printf("%d %d\n", cherenkov->options_begin, cherenkov->options_end); //printf("%d %d\n", cherenkov->options_begin, cherenkov->options_end);
for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) { for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
......
scripts/evaluation.C
+ 6
− 6
View file @ 0bacc4e1
...@@ -43,14 +43,14 @@ void evaluation(const char *ifname, const char *ofname = 0) ...@@ -43,14 +43,14 @@ void evaluation(const char *ifname, const char *ofname = 0)
// Use MC truth particles for a "main" loop; // Use MC truth particles for a "main" loop;
auto mctracks = new std::vector<dd4pod::Geant4ParticleData>(); auto mctracks = new std::vector<dd4pod::Geant4ParticleData>();
auto rctracks = new std::vector<eic::ReconstructedParticleData>(); auto rctracks = new std::vector<eicd::ReconstructedParticleData>();
auto cherenkov = new std::vector<eic::CherenkovParticleIDData>(); auto cherenkov = new std::vector<eicd::CherenkovParticleIDData>();
it->SetBranchAddress("mcparticles", &mctracks); it->SetBranchAddress("mcparticles", &mctracks);
it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(), &cherenkov); it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(), &cherenkov);
auto options = new std::vector<eic::CherenkovPdgHypothesis>(); auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options); it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options);
auto angles = new std::vector<eic::CherenkovThetaAngleMeasurement>(); auto angles = new std::vector<eicd::CherenkovThetaAngleMeasurement>();
it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles); it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles);
// Loop through all events; // Loop through all events;
...@@ -60,7 +60,7 @@ void evaluation(const char *ifname, const char *ofname = 0) ...@@ -60,7 +60,7 @@ void evaluation(const char *ifname, const char *ofname = 0)
// Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated
// mapping to start with, for the debugging purposes; // mapping to start with, for the debugging purposes;
std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov; std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
for(const auto &pid: *cherenkov) for(const auto &pid: *cherenkov)
rc2cherenkov[pid.recID] = &pid; rc2cherenkov[pid.recID] = &pid;
...@@ -78,7 +78,7 @@ void evaluation(const char *ifname, const char *ofname = 0) ...@@ -78,7 +78,7 @@ void evaluation(const char *ifname, const char *ofname = 0)
// Loop through all of the mass hypotheses available for this reconstructed track; // Loop through all of the mass hypotheses available for this reconstructed track;
{ {
const eic::CherenkovPdgHypothesis *best = 0; const eicd::CherenkovPdgHypothesis *best = 0;
for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) { for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
const auto &option = (*options)[iq]; const auto &option = (*options)[iq];
......
scripts/evaluation.fig12.C
+ 7
− 7
View file @ 0bacc4e1
...@@ -47,8 +47,8 @@ void evaluation(const char *ifname, const char *ofname = 0) ...@@ -47,8 +47,8 @@ void evaluation(const char *ifname, const char *ofname = 0)
// Use MC truth particles for a "main" loop; // Use MC truth particles for a "main" loop;
auto mctracks = new std::vector<dd4pod::Geant4ParticleData>(); auto mctracks = new std::vector<dd4pod::Geant4ParticleData>();
auto rctracks = new std::vector<eic::ReconstructedParticleData>(); auto rctracks = new std::vector<eicd::ReconstructedParticleData>();
auto cherenkov = new std::vector<eic::CherenkovParticleIDData>(); auto cherenkov = new std::vector<eicd::CherenkovParticleIDData>();
it->SetBranchAddress("mcparticles", &mctracks); it->SetBranchAddress("mcparticles", &mctracks);
// FIXME: or whatever the branches are called; // FIXME: or whatever the branches are called;
...@@ -56,9 +56,9 @@ void evaluation(const char *ifname, const char *ofname = 0) ...@@ -56,9 +56,9 @@ void evaluation(const char *ifname, const char *ofname = 0)
it->SetBranchAddress("rcparticles", &rctracks); it->SetBranchAddress("rcparticles", &rctracks);
#endif #endif
it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(), &cherenkov); it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(), &cherenkov);
auto options = new std::vector<eic::CherenkovPdgHypothesis>(); auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options); it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options);
auto angles = new std::vector<eic::CherenkovThetaAngleMeasurement>(); auto angles = new std::vector<eicd::CherenkovThetaAngleMeasurement>();
it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles); it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles);
// Loop through all events; // Loop through all events;
...@@ -68,14 +68,14 @@ void evaluation(const char *ifname, const char *ofname = 0) ...@@ -68,14 +68,14 @@ void evaluation(const char *ifname, const char *ofname = 0)
#ifdef _USE_RECONSTRUCTED_TRACKS_ #ifdef _USE_RECONSTRUCTED_TRACKS_
// First populate the reconstructed-to-simulated particle mapping table; // First populate the reconstructed-to-simulated particle mapping table;
std::map<eic::Index, const eic::ReconstructedParticleData*> mc2rc; std::map<eic::Index, const eicd::ReconstructedParticleData*> mc2rc;
for(const auto &rctrack: *rctracks) for(const auto &rctrack: *rctracks)
mc2rc[rctrack.mcID] = &rctrack; mc2rc[rctrack.mcID] = &rctrack;
#endif #endif
// Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated
// mapping to start with, for the debugging purposes; // mapping to start with, for the debugging purposes;
std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov; std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
for(const auto &pid: *cherenkov) for(const auto &pid: *cherenkov)
rc2cherenkov[pid.recID] = &pid; rc2cherenkov[pid.recID] = &pid;
...@@ -109,7 +109,7 @@ void evaluation(const char *ifname, const char *ofname = 0) ...@@ -109,7 +109,7 @@ void evaluation(const char *ifname, const char *ofname = 0)
// Loop through all of the mass hypotheses available for this reconstructed track; // Loop through all of the mass hypotheses available for this reconstructed track;
{ {
const eic::CherenkovPdgHypothesis *best = 0; const eicd::CherenkovPdgHypothesis *best = 0;
for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) { for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
const auto &option = (*options)[iq]; const auto &option = (*options)[iq];
......
scripts/rejection.C
+ 7
− 7
View file @ 0bacc4e1
...@@ -48,8 +48,8 @@ void rejection(const char *ifname)//, const char *ofname = 0) ...@@ -48,8 +48,8 @@ void rejection(const char *ifname)//, const char *ofname = 0)
// Use MC truth particles for a "main" loop; // Use MC truth particles for a "main" loop;
auto mctracks = new std::vector<dd4pod::Geant4ParticleData>(); auto mctracks = new std::vector<dd4pod::Geant4ParticleData>();
auto rctracks = new std::vector<eic::ReconstructedParticleData>(); auto rctracks = new std::vector<eicd::ReconstructedParticleData>();
auto cherenkov = new std::vector<eic::CherenkovParticleIDData>(); auto cherenkov = new std::vector<eicd::CherenkovParticleIDData>();
it->SetBranchAddress("mcparticles", &mctracks); it->SetBranchAddress("mcparticles", &mctracks);
// FIXME: or whatever the branches are called; // FIXME: or whatever the branches are called;
...@@ -57,9 +57,9 @@ void rejection(const char *ifname)//, const char *ofname = 0) ...@@ -57,9 +57,9 @@ void rejection(const char *ifname)//, const char *ofname = 0)
it->SetBranchAddress("rcparticles", &rctracks); it->SetBranchAddress("rcparticles", &rctracks);
#endif #endif
it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(), &cherenkov); it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(), &cherenkov);
auto options = new std::vector<eic::CherenkovPdgHypothesis>(); auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options); it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options);
auto angles = new std::vector<eic::CherenkovThetaAngleMeasurement>(); auto angles = new std::vector<eicd::CherenkovThetaAngleMeasurement>();
it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles); it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles);
// Loop through all events; // Loop through all events;
...@@ -69,14 +69,14 @@ void rejection(const char *ifname)//, const char *ofname = 0) ...@@ -69,14 +69,14 @@ void rejection(const char *ifname)//, const char *ofname = 0)
#ifdef _USE_RECONSTRUCTED_TRACKS_ #ifdef _USE_RECONSTRUCTED_TRACKS_
// First populate the reconstructed-to-simulated particle mapping table; // First populate the reconstructed-to-simulated particle mapping table;
std::map<eic::Index, const eic::ReconstructedParticleData*> mc2rc; std::map<eic::Index, const eicd::ReconstructedParticleData*> mc2rc;
for(const auto &rctrack: *rctracks) for(const auto &rctrack: *rctracks)
mc2rc[rctrack.mcID] = &rctrack; mc2rc[rctrack.mcID] = &rctrack;
#endif #endif
// Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated
// mapping to start with, for the debugging purposes; // mapping to start with, for the debugging purposes;
std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov; std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
for(const auto &pid: *cherenkov) for(const auto &pid: *cherenkov)
rc2cherenkov[pid.recID] = &pid; rc2cherenkov[pid.recID] = &pid;
...@@ -110,7 +110,7 @@ void rejection(const char *ifname)//, const char *ofname = 0) ...@@ -110,7 +110,7 @@ void rejection(const char *ifname)//, const char *ofname = 0)
// Loop through all of the mass hypotheses available for this reconstructed track; // Loop through all of the mass hypotheses available for this reconstructed track;
{ {
const eic::CherenkovPdgHypothesis *best = 0; const eicd::CherenkovPdgHypothesis *best = 0;
for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) { for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
const auto &option = (*options)[iq]; const auto &option = (*options)[iq];
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment