From 08ed1568a45ad108a1f61616f8c4371d79de66c0 Mon Sep 17 00:00:00 2001
From: David Emschermann <d.emschermann@gsi.de>
Date: Tue, 18 Mar 2025 18:23:01 +0100
Subject: [PATCH] Bugfix: Resolve TRD and MUCH mixup
---
macro/mcbm/eventDisplay.C | 22 +++++++++++++++-------
macro/run/eventDisplay.C | 23 ++++++++++++++++-------
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/macro/mcbm/eventDisplay.C b/macro/mcbm/eventDisplay.C
index 8758603bd5..a009ac3159 100644
--- a/macro/mcbm/eventDisplay.C
+++ b/macro/mcbm/eventDisplay.C
@@ -1,6 +1,8 @@
-/* Copyright (C) 2008-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2008-2025 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Andrey Lebedev, David Emschermann, Volker Friese, Mohammad Al-Turany [committer], Florian Uhlig */
+ Authors: Andrey Lebedev, David Emschermann [committer], Volker Friese, Mohammad Al-Turany, Florian Uhlig */
+
+// clang-format off
void eventDisplay(TString dataset = "data/test")
{
@@ -31,26 +33,32 @@ void eventDisplay(TString dataset = "data/test")
FairMCPointDraw* MvdPoint = new FairMCPointDraw("MvdPoint", kBlack, kFullSquare);
FairMCPointDraw* StsPoint = new FairMCPointDraw("StsPoint", kBlue, kFullSquare);
FairMCPointDraw* RichPoint = new FairMCPointDraw("RichPoint", kOrange, kFullSquare);
+
FairMCPointDraw* RefPlanePoint = new FairMCPointDraw("RefPlanePoint", kPink, kFullSquare);
- FairMCPointDraw* TrdPoint = new FairMCPointDraw("MuchPoint", kYellow, kFullSquare);
- FairMCPointDraw* MuchPoint = new FairMCPointDraw("TrdPoint", kCyan, kFullSquare);
+ FairMCPointDraw* MuchPoint = new FairMCPointDraw("MuchPoint", kYellow, kFullSquare);
+ // FairMCPointDraw* MustPoint = new FairMCPointDraw("MustPoint", kOrange, kFullSquare);
+
+ FairMCPointDraw* TrdPoint = new FairMCPointDraw("TrdPoint", kGreen, kFullSquare);
FairMCPointDraw* TofPoint = new FairMCPointDraw("TofPoint", kRed, kFullSquare);
- FairMCPointDraw* EcalPoint = new FairMCPointDraw("EcalPoint", kYellow, kFullSquare);
+ // FairMCPointDraw* EcalPoint = new FairMCPointDraw("EcalPoint", kYellow, kFullSquare);
fMan->AddTask(Track);
fMan->AddTask(MvdPoint);
fMan->AddTask(StsPoint);
fMan->AddTask(RichPoint);
+
fMan->AddTask(RefPlanePoint);
fMan->AddTask(MuchPoint);
+ // fMan->AddTask(MustPoint);
+
fMan->AddTask(TrdPoint);
fMan->AddTask(TofPoint);
- fMan->AddTask(EcalPoint);
+ // fMan->AddTask(EcalPoint);
// fMan->Init(1,4,10000);
fMan->Init(1, 5, 10000); // make STS visible by default
// fMan->Init(1,6,10000); // make MVD visible by default
- // fMan->Init(1,7,10000); // make MVD visible by default
+ // fMan->Init(1,7,10000);
}
diff --git a/macro/run/eventDisplay.C b/macro/run/eventDisplay.C
index cdfbad45b4..10ed64f1e5 100644
--- a/macro/run/eventDisplay.C
+++ b/macro/run/eventDisplay.C
@@ -1,8 +1,11 @@
-/* Copyright (C) 2008-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2008-2025 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Andrey Lebedev, David Emschermann, Volker Friese, Mohammad Al-Turany [committer], Florian Uhlig */
+ Authors: Andrey Lebedev, David Emschermann [committer], Volker Friese, Mohammad Al-Turany, Florian Uhlig */
-void eventDisplay(TString dataset = "data/test")
+// clang-format off
+
+void eventDisplay(TString dataset = "test")
+//void eventDisplay(TString dataset = "data/test")
{
TString inFile = dataset + ".tra.root";
TString parFile = dataset + ".par.root";
@@ -31,22 +34,28 @@ void eventDisplay(TString dataset = "data/test")
FairMCPointDraw* MvdPoint = new FairMCPointDraw("MvdPoint", kBlack, kFullSquare);
FairMCPointDraw* StsPoint = new FairMCPointDraw("StsPoint", kBlue, kFullSquare);
FairMCPointDraw* RichPoint = new FairMCPointDraw("RichPoint", kOrange, kFullSquare);
+
FairMCPointDraw* RefPlanePoint = new FairMCPointDraw("RefPlanePoint", kPink, kFullSquare);
- FairMCPointDraw* TrdPoint = new FairMCPointDraw("MuchPoint", kYellow, kFullSquare);
- FairMCPointDraw* MuchPoint = new FairMCPointDraw("TrdPoint", kCyan, kFullSquare);
+ FairMCPointDraw* MuchPoint = new FairMCPointDraw("MuchPoint", kYellow, kFullSquare);
+ // FairMCPointDraw* MustPoint = new FairMCPointDraw("MustPoint", kOrange, kFullSquare);
+
+ FairMCPointDraw* TrdPoint = new FairMCPointDraw("TrdPoint", kGreen, kFullSquare);
FairMCPointDraw* TofPoint = new FairMCPointDraw("TofPoint", kRed, kFullSquare);
- FairMCPointDraw* EcalPoint = new FairMCPointDraw("EcalPoint", kYellow, kFullSquare);
+ // FairMCPointDraw* EcalPoint = new FairMCPointDraw("EcalPoint", kYellow, kFullSquare);
fMan->AddTask(Track);
fMan->AddTask(MvdPoint);
fMan->AddTask(StsPoint);
fMan->AddTask(RichPoint);
+
fMan->AddTask(RefPlanePoint);
fMan->AddTask(MuchPoint);
+ // fMan->AddTask(MustPoint);
+
fMan->AddTask(TrdPoint);
fMan->AddTask(TofPoint);
- fMan->AddTask(EcalPoint);
+ // fMan->AddTask(EcalPoint);
// fMan->Init(1,4,10000);
--
GitLab