From 80469f1d59eaa5d50e1ee5d40e4c9c91b8f4cc5a Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 2 Sep 2020 19:11:15 +0200
Subject: [PATCH] Fix log messages
Log information about countertype only if the information is needed. This is
only the case for geometries k21a.
---
core/detectors/tof/CbmTofGeoHandler.cxx | 28 ++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/core/detectors/tof/CbmTofGeoHandler.cxx b/core/detectors/tof/CbmTofGeoHandler.cxx
index a10775ed69..913f3e890b 100644
--- a/core/detectors/tof/CbmTofGeoHandler.cxx
+++ b/core/detectors/tof/CbmTofGeoHandler.cxx
@@ -221,9 +221,16 @@ Int_t CbmTofGeoHandler::GetUniqueDetectorId() {
TString cType = cTemp(8, 2); // 1 character only
countertype = cType.Atoi();
- LOG(debug1) << " SMtype: " << smtype << " SModule: " << smodule
- << " CounterType: " << countertype << " Counter: " << counter
- << " Gap: " << gap << " Strip: " << cell;
+ if (fGeoVersion == k21a) {
+ LOG(debug1) << " SMtype: " << smtype << " SModule: " << smodule
+ << " CounterType: " << countertype
+ << " Counter: " << counter
+ << " Gap: " << gap << " Cell: " << cell;
+ } else {
+ LOG(debug1) << " SMtype: " << smtype << " SModule: " << smodule
+ << " Counter: " << counter
+ << " Gap: " << gap << " Cell: " << cell;
+ }
CbmTofDetectorInfo detInfo(
ECbmModuleId::kTof, smtype, smodule, counter, gap, cell, countertype);
@@ -299,10 +306,17 @@ Int_t CbmTofGeoHandler::GetUniqueCounterId() {
LOG(debug1) << " Volname: " << Volname << ", " << CurrentVolOffName(3) << ", "
<< CurrentVolOffName(2) << ", " << CurrentVolOffName(1) << ", "
<< CurrentVolOffName(0);
- LOG(debug1) << " SMtype: " << smtype << " SModule: " << smodule
- << " CounterType: " << countertype << " Counter: " << counter
- << " Gap: " << gap << " Cell: " << cell;
-
+ if (fGeoVersion == k21a) {
+ LOG(debug1) << " SMtype: " << smtype << " SModule: " << smodule
+ << " CounterType: " << countertype
+ << " Counter: " << counter
+ << " Gap: " << gap << " Cell: " << cell;
+ } else {
+ LOG(debug1) << " SMtype: " << smtype << " SModule: " << smodule
+ << " Counter: " << counter
+ << " Gap: " << gap << " Cell: " << cell;
+ }
+
CbmTofDetectorInfo detInfo(
ECbmModuleId::kTof, smtype, smodule, counter, gap, cell, countertype);
--
GitLab