From 28bdb0ac483aca80dcb681c60bf344fefa1ba4f5 Mon Sep 17 00:00:00 2001
From: fjlinz <f.kornas@gsi.de>
Date: Wed, 31 Jan 2024 08:26:07 +0100
Subject: [PATCH] Renaming Bmon to T0 in AT converter
---
.../CbmRecEventHeaderConverter.cxx | 12 ++++++------
.../CbmRecEventHeaderConverter.h | 2 +-
.../CbmSimEventHeaderConverter.cxx | 8 ++++----
.../CbmSimEventHeaderConverter.h | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
index 0ba9886141..efe6df5e84 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
@@ -39,7 +39,7 @@ void CbmRecEventHeaderConverter::Init()
RecEventHeaderBranch.AddField<float>("start_time", "Start time of the event, ns");
RecEventHeaderBranch.AddField<float>("end_time", "End time of the event, ns");
RecEventHeaderBranch.AddField<float>("match_weight", "");
- RecEventHeaderBranch.AddField<float>("Bmon", "Reconstructed Bmon, ns");
+ RecEventHeaderBranch.AddField<float>("T0", "Reconstructed T0, ns");
RecEventHeaderBranch.AddField<float>("tStartTS", "TS start time, ns");
ivtx_chi2_ = RecEventHeaderBranch.GetFieldId("vtx_chi2");
@@ -49,7 +49,7 @@ void CbmRecEventHeaderConverter::Init()
istart_time_ = RecEventHeaderBranch.GetFieldId("start_time");
iend_time_ = RecEventHeaderBranch.GetFieldId("end_time");
imatch_weight_ = RecEventHeaderBranch.GetFieldId("match_weight");
- iBmon_ = RecEventHeaderBranch.GetFieldId("Bmon");
+ iT0_ = RecEventHeaderBranch.GetFieldId("T0");
iTStartTS_ = RecEventHeaderBranch.GetFieldId("tStartTS");
auto* man = AnalysisTree::TaskManager::GetInstance();
@@ -71,12 +71,12 @@ void CbmRecEventHeaderConverter::ProcessData(CbmEvent* event)
rec_event_header_->SetField(GetPsdEnergy(event), iEpsd_);
int evt_id;
- float match_weight, start_time, end_time, Bmon, tStartTS;
+ float match_weight, start_time, end_time, T0, tStartTS;
if (event) {
evt_id = event->GetUniqueID();
start_time = event->GetStartTime();
end_time = event->GetEndTime();
- Bmon = event->GetTzero();
+ T0 = event->GetTzero();
tStartTS = fTimeSlice->GetStartTime();
@@ -89,14 +89,14 @@ void CbmRecEventHeaderConverter::ProcessData(CbmEvent* event)
evt_id = cbm_header_->GetEventID();
start_time = cbm_header_->GetT();
end_time = cbm_header_->GetT();
- Bmon = -999999.;
+ T0 = -999999.;
tStartTS = -1.;
match_weight = 1.;
}
rec_event_header_->SetField(evt_id, ievt_id_);
rec_event_header_->SetField(start_time, istart_time_);
rec_event_header_->SetField(end_time, iend_time_);
- rec_event_header_->SetField(Bmon, iBmon_);
+ rec_event_header_->SetField(T0, iT0_);
rec_event_header_->SetField(tStartTS, iTStartTS_);
rec_event_header_->SetField(match_weight, imatch_weight_);
}
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
index 0818144388..4a3fc3a351 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
@@ -43,7 +43,7 @@ private:
int istart_time_ {AnalysisTree::UndefValueInt};
int iend_time_ {AnalysisTree::UndefValueInt};
int imatch_weight_ {AnalysisTree::UndefValueInt};
- int iBmon_ {AnalysisTree::UndefValueInt};
+ int iT0_{AnalysisTree::UndefValueInt};
int iTStartTS_ {AnalysisTree::UndefValueInt};
ClassDef(CbmRecEventHeaderConverter, 1)
diff --git a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
index 6328eea784..21222d01a9 100644
--- a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
@@ -39,7 +39,7 @@ void CbmSimEventHeaderConverter::Init()
SimEventHeaderBranch.AddFields<float>({"start_time", "end_time"}, "ns (?), event time");
SimEventHeaderBranch.AddField<int>("run_id", "run identifier");
SimEventHeaderBranch.AddField<int>("event_id", "event identifier");
- SimEventHeaderBranch.AddField<float>("Bmon", "MC event time, ns");
+ SimEventHeaderBranch.AddField<float>("T0", "MC event time, ns");
ipsi_RP_ = SimEventHeaderBranch.GetFieldId("psi_RP");
ib_ = SimEventHeaderBranch.GetFieldId("b");
@@ -47,7 +47,7 @@ void CbmSimEventHeaderConverter::Init()
iend_time_ = SimEventHeaderBranch.GetFieldId("end_time");
irun_id_ = SimEventHeaderBranch.GetFieldId("run_id");
ievent_id_ = SimEventHeaderBranch.GetFieldId("event_id");
- iBmon_ = SimEventHeaderBranch.GetFieldId("Bmon");
+ iT0_ = SimEventHeaderBranch.GetFieldId("T0");
auto* man = AnalysisTree::TaskManager::GetInstance();
man->AddBranch(sim_event_header_, SimEventHeaderBranch);
@@ -71,7 +71,7 @@ void CbmSimEventHeaderConverter::ProcessData(CbmEvent* event)
if (!cbm_header) { throw std::runtime_error("CbmSimEventHeaderConverter::Exec - ERROR! No fHeader!"); }
- LOG(info) << "MCEvent " << cbm_header->GetEventID() << " with Bmon "
+ LOG(info) << "MCEvent " << cbm_header->GetEventID() << " with T0 "
<< cbm_mc_event_list_->GetEventTime(event_id, file_id);
TVector3 pos {cbm_header->GetX(), cbm_header->GetY(), cbm_header->GetZ()};
@@ -81,7 +81,7 @@ void CbmSimEventHeaderConverter::ProcessData(CbmEvent* event)
sim_event_header_->SetField(float(cbm_header->GetB()), ib_);
sim_event_header_->SetField(int(cbm_header->GetEventID()), ievent_id_);
sim_event_header_->SetField(int(cbm_header->GetRunID()), irun_id_);
- sim_event_header_->SetField(float(cbm_mc_event_list_->GetEventTime(event_id, file_id)), iBmon_);
+ sim_event_header_->SetField(float(cbm_mc_event_list_->GetEventTime(event_id, file_id)), iT0_);
if (event) {
LOG(info) << "TIME: " << event->GetStartTime() << " " << event->GetEndTime();
diff --git a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
index ced4c83d26..484f01a8fc 100644
--- a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
@@ -38,7 +38,7 @@ private:
int iend_time_ {AnalysisTree::UndefValueInt};
int irun_id_ {AnalysisTree::UndefValueInt};
int ievent_id_ {AnalysisTree::UndefValueInt};
- int iBmon_ {AnalysisTree::UndefValueInt};
+ int iT0_{AnalysisTree::UndefValueInt};
ClassDef(CbmSimEventHeaderConverter, 1)
};
--
GitLab