Skip to content
Snippets Groups Projects
Commit ca3f28f8 authored by Frederic Julian Linz's avatar Frederic Julian Linz Committed by Administrator
Browse files

ATConverter: Get primary vertex from CbmEvent object

(cherry picked from commit be5e2321)
from MR 1945
parent bb5e88ff
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,6 @@ void CbmRecEventHeaderConverter::Init() ...@@ -25,7 +25,6 @@ void CbmRecEventHeaderConverter::Init()
auto* ioman = FairRootManager::Instance(); auto* ioman = FairRootManager::Instance();
assert(ioman != nullptr); assert(ioman != nullptr);
cbm_header_ = (FairMCEventHeader*) ioman->GetObject("MCEventHeader."); cbm_header_ = (FairMCEventHeader*) ioman->GetObject("MCEventHeader.");
cbm_prim_vertex_ = (CbmVertex*) ioman->GetObject("PrimaryVertex.");
cbm_sts_tracks_ = (TClonesArray*) ioman->GetObject("StsTrack"); cbm_sts_tracks_ = (TClonesArray*) ioman->GetObject("StsTrack");
cbm_psd_hits_ = (TClonesArray*) ioman->GetObject("PsdHit"); cbm_psd_hits_ = (TClonesArray*) ioman->GetObject("PsdHit");
fTimeSlice = static_cast<CbmTimeSlice*>(ioman->GetObject("TimeSlice.")); fTimeSlice = static_cast<CbmTimeSlice*>(ioman->GetObject("TimeSlice."));
...@@ -62,8 +61,9 @@ void CbmRecEventHeaderConverter::Init() ...@@ -62,8 +61,9 @@ void CbmRecEventHeaderConverter::Init()
void CbmRecEventHeaderConverter::ProcessData(CbmEvent* event) void CbmRecEventHeaderConverter::ProcessData(CbmEvent* event)
{ {
if (event) { cbm_prim_vertex_ = event->GetVertex(); } if (event) { cbm_prim_vertex_ = event->GetVertex(); }
if (!cbm_prim_vertex_) {
if (!cbm_prim_vertex_) { throw std::runtime_error("No fPrimVtx"); } throw std::runtime_error("No event vertex in CbmEvent");
}
rec_event_header_->SetVertexPosition3({cbm_prim_vertex_->GetX(), cbm_prim_vertex_->GetY(), cbm_prim_vertex_->GetZ()}); rec_event_header_->SetVertexPosition3({cbm_prim_vertex_->GetX(), cbm_prim_vertex_->GetY(), cbm_prim_vertex_->GetZ()});
rec_event_header_->SetField(float(cbm_prim_vertex_->GetChi2() / cbm_prim_vertex_->GetNDF()), ivtx_chi2_); rec_event_header_->SetField(float(cbm_prim_vertex_->GetChi2() / cbm_prim_vertex_->GetNDF()), ivtx_chi2_);
......
...@@ -30,11 +30,11 @@ private: ...@@ -30,11 +30,11 @@ private:
AnalysisTree::EventHeader* rec_event_header_ {nullptr}; AnalysisTree::EventHeader* rec_event_header_ {nullptr};
TClonesArray* cbm_psd_hits_ {nullptr}; TClonesArray* cbm_psd_hits_{nullptr}; ///< non-owning pointer
TClonesArray* cbm_sts_tracks_ {nullptr}; ///< non-owning pointer TClonesArray* cbm_sts_tracks_ {nullptr}; ///< non-owning pointer
FairMCEventHeader* cbm_header_ {nullptr}; ///< non-owning pointer FairMCEventHeader* cbm_header_ {nullptr}; ///< non-owning pointer
CbmVertex* cbm_prim_vertex_ {nullptr}; ///< non-owning pointer CbmVertex* cbm_prim_vertex_ {nullptr}; ///< non-owning pointer
CbmTimeSlice* fTimeSlice {nullptr}; CbmTimeSlice* fTimeSlice{nullptr}; ///< non-owning pointer
int ivtx_chi2_ {AnalysisTree::UndefValueInt}; int ivtx_chi2_ {AnalysisTree::UndefValueInt};
int iEpsd_ {AnalysisTree::UndefValueInt}; int iEpsd_ {AnalysisTree::UndefValueInt};
......
...@@ -49,7 +49,6 @@ void CbmStsTracksConverter::InitInput() ...@@ -49,7 +49,6 @@ void CbmStsTracksConverter::InitInput()
{ {
auto* ioman = FairRootManager::Instance(); auto* ioman = FairRootManager::Instance();
cbm_prim_vertex_ = (CbmVertex*) ioman->GetObject("PrimaryVertex.");
cbm_sts_tracks_ = (TClonesArray*) ioman->GetObject("StsTrack"); cbm_sts_tracks_ = (TClonesArray*) ioman->GetObject("StsTrack");
cbm_sts_match_ = (TClonesArray*) ioman->GetObject("StsTrackMatch"); cbm_sts_match_ = (TClonesArray*) ioman->GetObject("StsTrackMatch");
...@@ -134,6 +133,9 @@ float CbmStsTracksConverter::ExtrapolateToVertex(CbmStsTrack* sts_track, Analysi ...@@ -134,6 +133,9 @@ float CbmStsTracksConverter::ExtrapolateToVertex(CbmStsTrack* sts_track, Analysi
void CbmStsTracksConverter::ReadVertexTracks(CbmEvent* event) void CbmStsTracksConverter::ReadVertexTracks(CbmEvent* event)
{ {
if (event) {
cbm_prim_vertex_ = event->GetVertex();
}
assert(cbm_prim_vertex_ && cbm_sts_tracks_); assert(cbm_prim_vertex_ && cbm_sts_tracks_);
vtx_tracks_->ClearChannels(); vtx_tracks_->ClearChannels();
......
...@@ -56,7 +56,7 @@ private: ...@@ -56,7 +56,7 @@ private:
TClonesArray* cbm_sts_tracks_ {nullptr}; ///< non-owning pointer TClonesArray* cbm_sts_tracks_ {nullptr}; ///< non-owning pointer
TClonesArray* cbm_sts_match_ {nullptr}; ///< non-owning pointer TClonesArray* cbm_sts_match_ {nullptr}; ///< non-owning pointer
CbmMCDataManager* cbm_mc_manager_ {nullptr}; CbmMCDataManager* cbm_mc_manager_{nullptr}; ///< non-owning pointer
bool is_write_kfinfo_ {true}; bool is_write_kfinfo_ {true};
bool is_reproduce_cbmkfpf_ {true}; bool is_reproduce_cbmkfpf_ {true};
......
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