From 562ced5d611b497e99f38bae69faafbf2e62e34f Mon Sep 17 00:00:00 2001
From: Frederic Julian Linz <f.linz@gsi.de>
Date: Thu, 13 Jun 2024 09:37:11 +0000
Subject: [PATCH] Allow to revome RICH, TRD and/or TOF from the Setup in AT
Converter macro (JSON)/binary (YAML)
---
.../common/analysis_tree_converter/app/ProgramOptions.h | 2 +-
.../{ATConfig_event_ideal.yaml => ATConfig_event.yaml} | 0
.../common/analysis_tree_converter/steer/TaskFactory.cxx | 4 ++--
.../common/production/run_analysis_tree_maker_json_config.C | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
rename analysis/common/analysis_tree_converter/config/{ATConfig_event_ideal.yaml => ATConfig_event.yaml} (100%)
diff --git a/analysis/common/analysis_tree_converter/app/ProgramOptions.h b/analysis/common/analysis_tree_converter/app/ProgramOptions.h
index 5c128eb3a8..3fa3798513 100644
--- a/analysis/common/analysis_tree_converter/app/ProgramOptions.h
+++ b/analysis/common/analysis_tree_converter/app/ProgramOptions.h
@@ -12,7 +12,7 @@
#ifndef CBM_ATCONVERTER_APP_PROGRAMOPTIONS_H
#define CBM_ATCONVERTER_APP_PROGRAMOPTIONS_H 1
-#define DEFAULT_CONFIG "analysis/common/analysistree_converter/config/ATConfig_event_ideal.yaml"
+#define DEFAULT_CONFIG "analysis/common/analysis_tree_converter/config/ATConfig_event.yaml"
#define DEFAULT_SETUP "sis100_electron"
diff --git a/analysis/common/analysis_tree_converter/config/ATConfig_event_ideal.yaml b/analysis/common/analysis_tree_converter/config/ATConfig_event.yaml
similarity index 100%
rename from analysis/common/analysis_tree_converter/config/ATConfig_event_ideal.yaml
rename to analysis/common/analysis_tree_converter/config/ATConfig_event.yaml
diff --git a/analysis/common/analysis_tree_converter/steer/TaskFactory.cxx b/analysis/common/analysis_tree_converter/steer/TaskFactory.cxx
index 373e99b45f..4efebaf3b1 100644
--- a/analysis/common/analysis_tree_converter/steer/TaskFactory.cxx
+++ b/analysis/common/analysis_tree_converter/steer/TaskFactory.cxx
@@ -87,8 +87,8 @@ namespace cbm::atconverter
man->AddTask(ststracksconverter);
if (fRun->IsDataPresent(ECbmModuleId::kRich)) man->AddTask(new CbmRichRingsConverter("RichRings", "VtxTracks"));
- man->AddTask(new CbmTofHitsConverter("TofHits", "VtxTracks"));
- man->AddTask(new CbmTrdTracksConverter("TrdTracks", "VtxTracks"));
+ if (fRun->IsDataPresent(ECbmModuleId::kTof)) man->AddTask(new CbmTofHitsConverter("TofHits", "VtxTracks"));
+ if (fRun->IsDataPresent(ECbmModuleId::kTrd)) man->AddTask(new CbmTrdTracksConverter("TrdTracks", "VtxTracks"));
if (fRun->IsDataPresent(ECbmModuleId::kPsd)) man->AddTask(new CbmPsdModulesConverter("PsdModules"));
if (fRun->IsDataPresent(ECbmModuleId::kFsd)) {
diff --git a/macro/PWG/common/production/run_analysis_tree_maker_json_config.C b/macro/PWG/common/production/run_analysis_tree_maker_json_config.C
index e12b9e5508..8da63ffd9e 100644
--- a/macro/PWG/common/production/run_analysis_tree_maker_json_config.C
+++ b/macro/PWG/common/production/run_analysis_tree_maker_json_config.C
@@ -155,9 +155,9 @@ void run_analysis_tree_maker_json_config(TString traPath = "test", TString rawPa
taskCbmStsTracksConverter->SetIsReproduceCbmKFPF();
man->AddTask(taskCbmStsTracksConverter);
- man->AddTask(new CbmRichRingsConverter("RichRings", "VtxTracks"));
- man->AddTask(new CbmTofHitsConverter("TofHits", "VtxTracks"));
- man->AddTask(new CbmTrdTracksConverter("TrdTracks", "VtxTracks"));
+ if (setup->IsActive(ECbmModuleId::kRich)) man->AddTask(new CbmRichRingsConverter("RichRings", "VtxTracks"));
+ if (setup->IsActive(ECbmModuleId::kTof)) man->AddTask(new CbmTofHitsConverter("TofHits", "VtxTracks"));
+ if (setup->IsActive(ECbmModuleId::kTrd)) man->AddTask(new CbmTrdTracksConverter("TrdTracks", "VtxTracks"));
if (setup->IsActive(ECbmModuleId::kPsd)) man->AddTask(new CbmPsdModulesConverter("PsdModules"));
if (setup->IsActive(ECbmModuleId::kFsd)) {
man->AddTask(new CbmFsdModulesConverter("FsdModules"));
--
GitLab