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

change PhotoMultiplierHit to TrackerHit

parent b7ac2bd4
No related branches found
No related tags found
2 merge requests!9change PhotoMultiplierHit to TrackerHit,!8merge integration development branch `irt-init-v02`
Pipeline #27950 failed
...@@ -23,7 +23,7 @@ SET( EVALUATION_SRC ...@@ -23,7 +23,7 @@ SET( EVALUATION_SRC
SET(EVALUATION_ROOTMAP ${CMAKE_CURRENT_BINARY_DIR}/lib${IRTEVAL_LIB}_rdict.pcm ${CMAKE_CURRENT_BINARY_DIR}/lib${IRTEVAL_LIB}.rootmap ) SET(EVALUATION_ROOTMAP ${CMAKE_CURRENT_BINARY_DIR}/lib${IRTEVAL_LIB}_rdict.pcm ${CMAKE_CURRENT_BINARY_DIR}/lib${IRTEVAL_LIB}.rootmap )
ROOT_GENERATE_DICTIONARY(G__${IRTEVAL_LIB} eicd/CherenkovPdgHypothesis.h eicd/CherenkovThetaAngleMeasurement.h eicd/CherenkovParticleIDData.h dd4pod/PhotoMultiplierHitData.h dd4pod/Geant4ParticleData.h LINKDEF include/evaluationLinkDef.h) ROOT_GENERATE_DICTIONARY(G__${IRTEVAL_LIB} eicd/CherenkovPdgHypothesis.h eicd/CherenkovThetaAngleMeasurement.h eicd/CherenkovParticleIDData.h dd4pod/TrackerHitData.h dd4pod/Geant4ParticleData.h LINKDEF include/evaluationLinkDef.h)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
ADD_EXECUTABLE( ${READER_EXE} ${READER_SRC} ) ADD_EXECUTABLE( ${READER_EXE} ${READER_SRC} )
......
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
#pragma link C++ class std::vector<eic::CherenkovThetaAngleMeasurement>+; #pragma link C++ class std::vector<eic::CherenkovThetaAngleMeasurement>+;
#pragma link C++ class std::vector<eic::CherenkovParticleIDData>+; #pragma link C++ class std::vector<eic::CherenkovParticleIDData>+;
#pragma link C++ class std::vector<dd4pod::Geant4ParticleData>+; #pragma link C++ class std::vector<dd4pod::Geant4ParticleData>+;
#pragma link C++ class std::vector<dd4pod::PhotoMultiplierHitData>+; #pragma link C++ class std::vector<dd4pod::TrackerHitData>+;
#endif #endif
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// NPdet // NPdet
#include "dd4pod/Geant4ParticleCollection.h" #include "dd4pod/Geant4ParticleCollection.h"
#include "dd4pod/PhotoMultiplierHitCollection.h" #include "dd4pod/TrackerHitCollection.h"
// IRT // IRT
#include <CherenkovEvent.h> #include <CherenkovEvent.h>
...@@ -80,7 +80,7 @@ int main(int argc, char** argv) ...@@ -80,7 +80,7 @@ int main(int argc, char** argv)
// Use MC truth particles, and deal with just pfRICH hits here; however the interface // Use MC truth particles, and deal with just pfRICH hits here; however the interface
// should work for combinations like pfRICH+DIRC, eventually; // should work for combinations like pfRICH+DIRC, eventually;
std::vector<dd4pod::Geant4ParticleData> *tracks = new std::vector<dd4pod::Geant4ParticleData>(); std::vector<dd4pod::Geant4ParticleData> *tracks = new std::vector<dd4pod::Geant4ParticleData>();
std::vector<dd4pod::PhotoMultiplierHitData> *hits = new std::vector<dd4pod::PhotoMultiplierHitData>(); std::vector<dd4pod::TrackerHitData> *hits = new std::vector<dd4pod::TrackerHitData>();
t->SetBranchAddress("mcparticles", &tracks); t->SetBranchAddress("mcparticles", &tracks);
{ {
TString hname; hname.Form("%sHits", detector->GetName()); TString hname; hname.Form("%sHits", detector->GetName());
......
...@@ -81,7 +81,7 @@ void reader(const char *dfname, const char *cfname, const char *dtname = 0) ...@@ -81,7 +81,7 @@ void reader(const char *dfname, const char *cfname, const char *dtname = 0)
// Use MC truth particles, and deal with just pfRICH hits here; however the interface // Use MC truth particles, and deal with just pfRICH hits here; however the interface
// should work for combinations like pfRICH+DIRC, eventually; // should work for combinations like pfRICH+DIRC, eventually;
std::vector<dd4pod::Geant4ParticleData> *tracks = new std::vector<dd4pod::Geant4ParticleData>(); std::vector<dd4pod::Geant4ParticleData> *tracks = new std::vector<dd4pod::Geant4ParticleData>();
std::vector<dd4pod::PhotoMultiplierHitData> *hits = new std::vector<dd4pod::PhotoMultiplierHitData>(); std::vector<dd4pod::TrackerHitData> *hits = new std::vector<dd4pod::TrackerHitData>();
t->SetBranchAddress("mcparticles", &tracks); t->SetBranchAddress("mcparticles", &tracks);
{ {
TString hname; hname.Form("%sHits", detector->GetName()); TString hname; hname.Form("%sHits", detector->GetName());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment