From 33a22d0340eb9ae8086a4977140b8a68d0de74bd Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 9 Sep 2020 11:15:51 +0200
Subject: [PATCH] HltROBDataProviderSvc: Restore behavior when reading
 `DF_Enabled_ROB_IDs`

!36223 introduced a slight change in behavior when reading
`DF_Enabled_ROB_IDs`, i.e. it was always overwriting the list of enabled
ROBs even if a value was set explicitly via job options.
---
 .../TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
index d042e514160..5745a8fe3e1 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
@@ -109,7 +109,8 @@ StatusCode HltROBDataProviderSvc::initialize()
     if ((jobOptionsSvc.retrieve()).isFailure()) {
       ATH_MSG_ERROR("Could not find JobOptionsSvc");
     } else {
-      if (m_enabledROBs.fromString(jobOptionsSvc->get("DataFlowConfig.DF_Enabled_ROB_IDs","[]")).isSuccess()) {
+      if (jobOptionsSvc->has("DataFlowConfig.DF_Enabled_ROB_IDs") &&
+          m_enabledROBs.fromString(jobOptionsSvc->get("DataFlowConfig.DF_Enabled_ROB_IDs")).isSuccess()) {
         robOKSconfigFound = true;
         ATH_MSG_INFO(" ---> Read from OKS                                                = "
                      << MSG::dec << m_enabledROBs.value().size() << " enabled ROB IDs.");
-- 
GitLab