Merge branch 'HltROBDataProviderSvc_updates' into 'master'

Updates for HltROBDataProviderSvc:

See merge request atlas/athena!34010

HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py

@@ -105,13 +105,13 @@ class HltROBDataProviderSvc(_HltROBDataProviderSvc):
                          xbins=100, xmin=0, xmax=500),
          defineHistogram('TIME_ROBRequest', path='EXPERT', type='TH1F',
                          title='Time for ROB retrievals;time [mu s]',
-                         xbins=100, xmin=0, xmax=10000),
+                         xbins=400, xmin=0, xmax=200000),
          defineHistogram('NUMBER_ROBRequest', path='EXPERT', type='TH1F',
                          title='Number of retrieved ROBs;number',
                          xbins=100, xmin=0, xmax=1000),
          defineHistogram('TIME_CollectAllROBs', path='EXPERT', type='TH1F',
                          title='Time for retrieving complete event data;time [mu s]',
-                         xbins=100, xmin=0, xmax=10000),
+                         xbins=400, xmin=0, xmax=200000),
          defineHistogram('NUMBER_CollectAllROBs', path='EXPERT', type='TH1F',
                          title='Number of received ROBs for collect call;number',
                          xbins=100, xmin=0, xmax=2500)

HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx

@@ -142,6 +142,9 @@ StatusCode HltROBDataProviderSvc::initialize()
     }
   }
 
+  // prefetch all ROBs in a ROS on a first retrieval of ROBs from this ROS
+  ATH_MSG_INFO(" ---> Prefetch all ROBs in a ROS on first retrieval                = " << m_prefetchAllROBsfromROS);
+
   // Setup the slot specific cache
   m_eventsCache = SG::SlotSpecificObj<EventCache>( SG::getNSlots() );
 
@@ -307,6 +310,15 @@ void HltROBDataProviderSvc::setNextEvent(const EventContext& context, const RawE
   ATH_MSG_DEBUG("      current [global id, LVL1 id] = [" << cache->globalEventNumber << "," << cache->currentLvl1ID << "]" );
   ATH_MSG_DEBUG("      number of received ROBs      =  " << rob_fragments.size() );
   ATH_MSG_DEBUG("      size of ROB cache            =  " << cache->robmap.size() );
+
+  //------------------------------+
+  // Initiate whole ROS retrieval |
+  //------------------------------+
+  if ( m_prefetchAllROBsfromROS.value() && m_enabledROBs.value().size() != 0 ) {
+    addROBData( context, m_enabledROBs.value(), "prefetch_HLTROBDataProviderSvc" );
+    ATH_MSG_DEBUG("      ROS prefetch init. size      =  " << m_enabledROBs.value().size() );
+  }
+
   return;
 }
 

HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 #ifndef TRIGSERVICES_HLTROBDATAPROVIDERSVC_H
 #define TRIGSERVICES_HLTROBDATAPROVIDERSVC_H
@@ -161,6 +161,10 @@ private:
   Gaudi::Property< std::vector<uint32_t> > m_enabledROBs{
     this, "enabledROBs", {} , "Enabled ROBs for retrieval"};
 
+  // prefetch all ROBs from a ROS if ROB data from this ROS are requested
+  Gaudi::Property<bool> m_prefetchAllROBsfromROS{
+    this, "prefetchAllROBsfromROS", false , "When ROBs from a ROS are requested then prefetch all ROBs in this ROS"};
+
   /*------------------------+
    * Methods acting on ROBs |
    *------------------------+