From 350628d64f7abc63c266e6cd073b867714d1a21c Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Thu, 6 Mar 2025 19:47:40 +0100
Subject: [PATCH 1/2] Update geometry hash
Remove psd from all setups. Correct
title name of setups.
---
external/InstallGeometry.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 8df28d22dd..f80419d363 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 163fb73b488d85e1cbd4d059806721ddd1ab6bc0)
+set(GEOMETRY_VERSION 3d14de4d5c891a22275bcb9f9d1e101214a90af9)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
download_project_if_needed(PROJECT Geometry_source
--
GitLab
From 7ce50394365e148e2c33b17c116294ad6cfa24f5 Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Mon, 10 Mar 2025 12:26:24 +0100
Subject: [PATCH 2/2] Check if Psd is active in setup
before adding task in analysis tree maker macro when event base mode
used.
---
.../common/analysis_tree_converter/run_analysis_tree_maker.C | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
index 64b45d91b0..19e7268dd4 100644
--- a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
+++ b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
@@ -118,7 +118,9 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
man->AddTask(new CbmRichRingsConverter("RichRings", "VtxTracks"));
man->AddTask(new CbmTofHitsConverter("TofHits", "VtxTracks"));
man->AddTask(new CbmTrdTracksConverter("TrdTracks", "VtxTracks"));
- if (is_event_base) { man->AddTask(new CbmPsdModulesConverter("PsdModules")); }
+ if (is_event_base && setup->IsActive(ECbmModuleId::kPsd)) {
+ man->AddTask(new CbmPsdModulesConverter("PsdModules"));
+ }
run->AddTask(man);
// ----- Parameter database --------------------------------------------
--
GitLab