From fb9afd730c1248f396f8be7333677f96637b90d1 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 19 Mar 2021 09:47:03 +0100
Subject: [PATCH] Use correct geometry type for geometry tof_v20a
Norbert pointed out that tof_v20a has to be treated as geometry type v21a. This
is corrected with this commit.
---
core/detectors/tof/CbmTofGeoHandler.cxx | 3 +--
reco/detectors/tof/CbmTofSimpClusterizer.cxx | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/detectors/tof/CbmTofGeoHandler.cxx b/core/detectors/tof/CbmTofGeoHandler.cxx
index 5c87b7e8a1..bdfdfac290 100644
--- a/core/detectors/tof/CbmTofGeoHandler.cxx
+++ b/core/detectors/tof/CbmTofGeoHandler.cxx
@@ -108,8 +108,7 @@ Int_t CbmTofGeoHandler::CheckGeometryVersion() {
else if ((TString(node->GetName()).Contains("v14")) || (TString(node->GetName()).Contains("v16a"))
|| (TString(node->GetName()).Contains("v16c")) || (TString(node->GetName()).Contains("v16d"))
|| (TString(node->GetName()).Contains("v16e")) || (TString(node->GetName()).Contains("v17a"))
- || (TString(node->GetName()).Contains("v17c")) || (TString(node->GetName()).Contains("v19"))
- || ((TString(node->GetName()).Contains("v20a")) && (!(TString(node->GetName()).Contains("mcbm"))))) {
+ || (TString(node->GetName()).Contains("v17c")) || (TString(node->GetName()).Contains("v19"))) {
LOG(info)
<< "CbmTofGeoHandler::CheckGeometryVersion: Found TOF geometry "
<< TString(node->GetName()) << ", treat as Id 14a ";
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
index 4fb32c4a5c..d8687b04b2 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
@@ -11,6 +11,7 @@
#include "CbmTofCreateDigiPar.h"
#include "CbmTofDetectorId_v12b.h" // in cbmdata/tof
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
+#include "CbmTofDetectorId_v21a.h" // in cbmdata/tof
#include "CbmTofDigi.h" // in cbmdata/tof
#include "CbmTofDigiBdfPar.h" // in tof/TofParam
#include "CbmTofDigiPar.h" // in tof/TofParam
@@ -432,6 +433,7 @@ Bool_t CbmTofSimpClusterizer::InitParameters() {
switch (iGeoVersion) {
case k12b: fTofId = new CbmTofDetectorId_v12b(); break;
case k14a: fTofId = new CbmTofDetectorId_v14a(); break;
+ case k21a: fTofId = new CbmTofDetectorId_v21a(); break;
default:
LOG(error)
<< "CbmTofSimpClusterizer::InitParameters => Invalid geometry!!!"
--
GitLab