From db75d3f16ea144b75a70fea88145e1432bcbcdde Mon Sep 17 00:00:00 2001
From: Felix Weiglhofer <weiglhofer@fias.uni-frankfurt.de>
Date: Thu, 22 Jun 2023 09:48:40 +0000
Subject: [PATCH] algo::Unpack: Make default detector list a default parameter.
---
algo/unpack/Unpack.cxx | 12 ++----------
algo/unpack/Unpack.h | 9 ++++++++-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/algo/unpack/Unpack.cxx b/algo/unpack/Unpack.cxx
index 6d179ed130..230cdc86b3 100644
--- a/algo/unpack/Unpack.cxx
+++ b/algo/unpack/Unpack.cxx
@@ -130,17 +130,9 @@ namespace cbm::algo
// ----------------------------------------------------------------------------
// ----- Initialisation ---------------------------------------------------
- bool Unpack::Init(std::optional<std::vector<fles::SubsystemIdentifier>> subIds)
+ bool Unpack::Init(std::vector<fles::SubsystemIdentifier> subIds)
{
- if (!subIds) {
- fSubIds = {
- fles::SubsystemIdentifier::STS, fles::SubsystemIdentifier::MUCH, fles::SubsystemIdentifier::RPC,
- fles::SubsystemIdentifier::T0, fles::SubsystemIdentifier::TRD, fles::SubsystemIdentifier::TRD2D,
- };
- }
- else {
- fSubIds = *subIds;
- }
+ fSubIds = subIds;
// --- Common parameters for all components for STS
uint32_t numChansPerAsicSts = 128; // R/O channels per ASIC for STS
diff --git a/algo/unpack/Unpack.h b/algo/unpack/Unpack.h
index 3a8ab29b4a..00ffce39bd 100644
--- a/algo/unpack/Unpack.h
+++ b/algo/unpack/Unpack.h
@@ -105,7 +105,14 @@ namespace cbm::algo
* @param subIds: vector of subsystem identifiers to unpack, default: all
* @see Init()
**/
- bool Init(std::optional<std::vector<fles::SubsystemIdentifier>> subIds = {});
+ bool Init(std::vector<fles::SubsystemIdentifier> subIds = {
+ fles::SubsystemIdentifier::STS,
+ fles::SubsystemIdentifier::MUCH,
+ fles::SubsystemIdentifier::RPC,
+ fles::SubsystemIdentifier::T0,
+ fles::SubsystemIdentifier::TRD,
+ fles::SubsystemIdentifier::TRD2D,
+ });
bool DetectorEnabled(fles::SubsystemIdentifier subId)
{
--
GitLab