diff --git a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
index 3a9761d10dbbc137a4fa62345d4e01fbc2947c44..47d1fa11d17978a44cd9b19ed8a25491b50a46f0 100644
--- a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
@@ -56,7 +56,7 @@ datamodel_run_test (xAODTestRead DEPENDS xAODTestWrite) #i:xaoddata.root o:xaodd
datamodel_run_test (xAODTestRead2 DEPENDS xAODTestRead) #i:xaoddata2.root o:xaoddata2x.root
datamodel_run_test (xAODTestTypelessRead DEPENDS xAODTestWrite)
datamodel_run_test (xAODTestRead3 DEPENDS xAODTestTypelessRead)
-datamodel_run_test (xAODTestReadRename DEPENDS xaAODTestWrite)
+datamodel_run_test (xAODTestReadRename DEPENDS xAODTestWrite)
datamodel_run_test (xAODTestReadRenameMT
COMMAND "athena.py --thread=1"
DEPENDS xAODTestWrite)
diff --git a/Control/DataModelTest/DataModelRunTests/test/post.sh b/Control/DataModelTest/DataModelRunTests/test/post.sh
index 7c177930a9fa98efcaa673c25523c23d0a231815..cc91e52a5e29546440861a9ef1ed38dd89dfd776 100755
--- a/Control/DataModelTest/DataModelRunTests/test/post.sh
+++ b/Control/DataModelTest/DataModelRunTests/test/post.sh
@@ -183,6 +183,7 @@ PP="$PP"'|^GUID: Class|^AthenaRootStr.* INFO|^Warning in .* found in .* is alrea
PP="$PP"'|no dictionary for class|INFO eformat version|INFO event storage'
PP="$PP"'|^RootDatabase.open *I[nN][fF][oO]'
PP="$PP"'|Unable to locate catalog'
+PP="$PP"'|CLIDRegistry entries for module'
# StoreGate INFO messages changed to VERBOSE
PP="$PP"'|^(StoreGateSvc|DetectorStore|MetaDataStore|InputMetaDataStore|TagMetaDataStore) +(INFO|VERBOSE) (Stop|stop|Start)'
@@ -225,6 +226,7 @@ PP="$PP"'|INFO Found MetaDataTools'
PP="$PP"'|INFO AthenaOutputStream'
PP="$PP"'|^DbSession.*INFO'
PP="$PP"'|^IOVDb(Svc|Folder).*INFO (Folder|Connection|Total payload|.*bytes in)'
+PP="$PP"'|Resolved path'
# xAODMaker::EventInfoCnvAlg
PP="$PP"'|^xAODMaker::Even.*(WARNING|INFO)'
diff --git a/Control/PileUpComps/CMakeLists.txt b/Control/PileUpComps/CMakeLists.txt
index 0447977975ae4d11ff038be44197cb0b6af768d4..18d80ceba95eac0a698a3a1ff458fe904cb988ac 100644
--- a/Control/PileUpComps/CMakeLists.txt
+++ b/Control/PileUpComps/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PRIVATE
Event/EventInfoUtils
Event/xAOD/xAODEventInfo
Event/xAOD/xAODCnvInterfaces
- Event/xAOD/xAODEventInfoCnv
GaudiKernel )
# External dependencies:
@@ -30,6 +29,6 @@ atlas_add_component( PileUpComps
LINK_LIBRARIES ${Boost_LIBRARIES}
${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel
PileUpToolsLib StoreGateLib SGtests EventInfo
- EventInfoUtils xAODEventInfo xAODEventInfoCnv GaudiKernel )
+ EventInfoUtils xAODEventInfo GaudiKernel )
diff --git a/DataQuality/DataQualityTools/DataQualityTools/DQTNonCollBkg_ZDC.h b/DataQuality/DataQualityTools/DataQualityTools/DQTNonCollBkg_ZDC.h
index 01b593516219b7fffd3a0af1796bb023a27974d7..2f0222d474ee0f4ad21d3cb466c9e127773117cd 100644
--- a/DataQuality/DataQualityTools/DataQualityTools/DQTNonCollBkg_ZDC.h
+++ b/DataQuality/DataQualityTools/DataQualityTools/DQTNonCollBkg_ZDC.h
@@ -68,11 +68,6 @@
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ToolHandle.h"
-/*
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/TriggerInfo.h"
-*/
#include "TrigDecisionTool/TrigDecisionTool.h"
#include "ZdcIdentifier/ZdcID.h"
diff --git a/DetectorDescription/IdDict/IdDict/ATLAS_CHECK_THREAD_SAFETY b/DetectorDescription/IdDict/IdDict/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..8d4017a3d23ed6ac31d51ea0a2e377bfc8c1eb90
--- /dev/null
+++ b/DetectorDescription/IdDict/IdDict/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+DetectorDescription/IdDict
diff --git a/DetectorDescription/IdDict/IdDict/IdDictDefs.h b/DetectorDescription/IdDict/IdDict/IdDictDefs.h
index 71acce53fb7784cd64ee0db3aa8fb41096086618..dc3c36e3e9bb2cb2d57b1cef9f2dfea9cb7b5fa2 100755
--- a/DetectorDescription/IdDict/IdDict/IdDictDefs.h
+++ b/DetectorDescription/IdDict/IdDict/IdDictDefs.h
@@ -89,8 +89,8 @@ private:
std::set<std::string> m_subdictionary_names;
bool m_resolved_references;
bool m_generated_implementation;
- mutable bool m_do_checks;
- mutable bool m_do_neighbours;
+ bool m_do_checks;
+ bool m_do_neighbours;
};
class IdDictDictionary
@@ -310,8 +310,8 @@ private:
std::string m_dict_tag;
//bool m_resolved_references;
bool m_generated_implementation;
- mutable bool m_do_checks;
- mutable bool m_do_neighbours;
+ bool m_do_checks;
+ bool m_do_neighbours;
};
class IdDictField
diff --git a/DetectorDescription/IdDict/src/IdDictMgr.cxx b/DetectorDescription/IdDict/src/IdDictMgr.cxx
index f5daf711759d0dd82381f71430cc1d89ef339ee1..a6256fce4f876b70cdf9302d819032cf8db63515 100755
--- a/DetectorDescription/IdDict/src/IdDictMgr.cxx
+++ b/DetectorDescription/IdDict/src/IdDictMgr.cxx
@@ -8,65 +8,26 @@
#include <iostream>
#include <stdio.h>
-#include <cstdlib>
+#include <cstdlib>
+#include <atomic>
#include "IdDict/IdDictDefs.h"
class Debugger
{
-public:
+public:
+ static bool get_debug_state()
+ {
+ if (::getenv ("IDDEBUG") != 0) {
+ return true;
+ }
+ return false;
+ }
static bool debug ()
{
- static bool first = true;
- static bool debug_state = false;
-
- if (first)
- {
- first = false;
- if (::getenv ("IDDEBUG") == 0)
- {
- debug_state = false;
- }
- else
- {
- debug_state = true;
- }
- }
-
- return (debug_state);
+ static const bool debug_state = get_debug_state();
+ return debug_state;
}
-
- static void up ()
- {
- level (1);
- }
-
- static void down ()
- {
- level (-1);
- }
-
- static void tab (int nspaces = 0)
- {
- int n = (nspaces) ? nspaces : level ();
-
- for (int i = 0; i < n; ++i)
- {
- std::cout << " ";
- }
- }
-
-private:
-
- static int level (int d = 0)
- {
- static int n = 0;
-
- n += d;
-
- return (n);
- }
-
};
static bool isNumber(const std::string& str)
@@ -98,14 +59,14 @@ class TypeId
public:
operator int ()
{
- static int i = TypeIdBuilder::build_id ();
+ static const int i = TypeIdBuilder::build_id ();
return (i);
}
};
int TypeIdBuilder::build_id ()
{
- static int i = 0;
+ static std::atomic<int> i = 0;
i++;
return (i);
}
@@ -172,7 +133,7 @@ const std::string&
IdDictMgr::find_metadata (const std::string& name) const
{
metadata_map::const_iterator it = m_metadata.find(name);
- static std::string empty;
+ static const std::string empty;
if (it != m_metadata.end()) return (it->second);
else return empty;
}
@@ -258,7 +219,7 @@ void IdDictMgr::generate_implementation (std::string tag)
if (Debugger::debug ())
{
- Debugger::tab (); std::cout << "IdDictMgr::generate_implementation>" << std::endl;
+ std::cout << "IdDictMgr::generate_implementation>" << std::endl;
}
// Must reset the implementation for multiple passes, this resets
@@ -575,7 +536,6 @@ static void get_bits (const RV& regions, size_t level, const std::string& group)
//
-// Debugger::tab (level);
// std::cout << " get_bits : level " << level;
// std::cout << " regions size " << regions.size() << std::endl;
@@ -616,7 +576,6 @@ static void get_bits (const RV& regions, size_t level, const std::string& group)
RV mr = regions;
- // Debugger::tab (level);
// std::cout << " or-ing fields : level " << level;
// std::cout << " name " << mr[0]->m_implementation[level].m_range->m_field_name ;
@@ -643,7 +602,7 @@ static void get_bits (const RV& regions, size_t level, const std::string& group)
for (;;) {
if (mr.size () == 0) {
- //Debugger::tab (level); std::cout << "empty RV" << std::endl;
+ //std::cout << "empty RV" << std::endl;
break;
}
@@ -664,7 +623,7 @@ static void get_bits (const RV& regions, size_t level, const std::string& group)
// std::cout << "k in level " << k << " " << level << std::endl;
/*
- Debugger::tab (level); std::cout << "Install the non empty Region : " <<
+ std::cout << "Install the non empty Region : " <<
reference_region->m_index;
const IdDictFieldImplementation& f = reference_region->m_implementation[level];
@@ -689,7 +648,7 @@ static void get_bits (const RV& regions, size_t level, const std::string& group)
if (reference_region == 0) break;
if (overlapping.size () == 0) {
-// Debugger::tab (level); std::cout << "RV only contains empty Regions" << std::endl;
+// std::cout << "RV only contains empty Regions" << std::endl;
break;
}
@@ -746,7 +705,7 @@ static void get_bits (const RV& regions, size_t level, const std::string& group)
if (region->m_implementation.size () <= level) continue;
-// Debugger::tab (level); std::cout << "Check a non empty Region : " << region->m_index;
+// std::cout << "Check a non empty Region : " << region->m_index;
bool overlap = false;
@@ -807,7 +766,7 @@ static void get_bits (const RV& regions, size_t level, const std::string& group)
if (all_within_group) temp.clear();
-// Debugger::tab (level); std::cout << "now we have " << overlapping.size () <<
+// std::cout << "now we have " << overlapping.size () <<
// " vs " <<
// temp.size () << " regions" << std::endl;
@@ -831,7 +790,7 @@ void IdDictDictionary::generate_implementation (const IdDictMgr& idd,
if (Debugger::debug ())
{
- Debugger::tab (); std::cout << "IdDictDictionary::generate_implementation>" << std::endl;
+ std::cout << "IdDictDictionary::generate_implementation>" << std::endl;
}
if (!m_generated_implementation) {
@@ -2356,7 +2315,7 @@ IdDictGroup::generate_implementation (const IdDictMgr& idd,
{
if (Debugger::debug ())
{
- Debugger::tab (); std::cout << "IdDictGroup::generate_implementation>" << std::endl;
+ std::cout << "IdDictGroup::generate_implementation>" << std::endl;
}
if (!m_generated_implementation) {
@@ -2659,7 +2618,7 @@ void IdDictRegion::generate_implementation (const IdDictMgr& idd,
if (Debugger::debug ())
{
- Debugger::tab (); std::cout << "IdDictRegion::generate_implementation>" << std::endl;
+ std::cout << "IdDictRegion::generate_implementation>" << std::endl;
}
// std::cout << "IdDictRegion::generate_implementation - name, tag "
@@ -2875,7 +2834,7 @@ IdDictSubRegion::generate_implementation (const IdDictMgr& idd,
if (Debugger::debug ())
{
- Debugger::tab (); std::cout << "IdDictSubRegion::generate_implementation>" << std::endl;
+ std::cout << "IdDictSubRegion::generate_implementation>" << std::endl;
}
// NOTE: we DO NOT protect this method with
@@ -3038,7 +2997,7 @@ void IdDictRange::generate_implementation (const IdDictMgr& /*idd*/,
if (Debugger::debug ())
{
- Debugger::tab (); std::cout << "IdDictRange::generate_implementation>" << std::endl;
+ std::cout << "IdDictRange::generate_implementation>" << std::endl;
}
@@ -3279,7 +3238,7 @@ void IdDictReference::generate_implementation (const IdDictMgr& idd,
if (Debugger::debug ())
{
- Debugger::tab (); std::cout << "IdDictReference::generate_implementation>" << std::endl;
+ std::cout << "IdDictReference::generate_implementation>" << std::endl;
}
if (m_subregion != 0) m_subregion->generate_implementation (idd, dictionary, region, tag);
diff --git a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/IROBDataProviderSvc.h b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/IROBDataProviderSvc.h
index f78e47850d28771a97e8339f4941ef51920b3dea..da4f888ce9a74eb085c97aaf42f9f01338c4381c 100755
--- a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/IROBDataProviderSvc.h
+++ b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/IROBDataProviderSvc.h
@@ -12,6 +12,7 @@
#include <cstdint>
#include <vector>
#include <string>
+#include <string_view>
#include <stdexcept>
#include <functional>
@@ -32,7 +33,7 @@ public:
DeclareInterfaceID(IROBDataProviderSvc, 1, 1);
/// Add ROBFragments to cache for given ROB ids, ROB fragments may be retrieved with DataCollector
- virtual void addROBData(const std::vector<uint32_t>& robIds, const std::string callerName="UNKNOWN") = 0 ;
+ virtual void addROBData(const std::vector<uint32_t>& robIds, const std::string_view callerName="UNKNOWN") = 0 ;
/// Add a given LVL1/LVL2 ROBFragment to cache
virtual void setNextEvent(const std::vector<ROBF>& result) = 0 ;
@@ -43,7 +44,7 @@ public:
/// Retrieve ROBFragments for given ROB ids from cache
- virtual void getROBData(const std::vector<uint32_t>& robIds, VROBFRAG& robFragments, const std::string callerName="UNKNOWN") = 0;
+ virtual void getROBData(const std::vector<uint32_t>& robIds, VROBFRAG& robFragments, const std::string_view callerName="UNKNOWN") = 0;
/// Retrieve the whole event.
@@ -59,8 +60,8 @@ public:
// variants for MT, it has an implementation for now in order not to require change in all implementations yet, they will all become pure virtual methods
- virtual void addROBData(const EventContext& /*context*/, const std::vector<uint32_t>& /*robIds*/, const std::string callerName="UNKNOWN") {
- throw std::runtime_error( std::string( callerName+" is using unimplemented ") + __FUNCTION__ ) ;
+ virtual void addROBData(const EventContext& /*context*/, const std::vector<uint32_t>& /*robIds*/, const std::string_view callerName="UNKNOWN") {
+ throw std::runtime_error( std::string(callerName)+ std::string(" is using unimplemented ") + __FUNCTION__ ) ;
}
virtual void setNextEvent(const EventContext& /*context*/, const std::vector<ROBF>& /*result*/) {
throw std::runtime_error( std::string("Unimplemented ") + __FUNCTION__ );
@@ -68,8 +69,9 @@ public:
virtual void setNextEvent( const EventContext& /*context*/, const RawEvent* /*re*/) {
throw std::runtime_error(std::string("Unimplemented ") + __FUNCTION__ );
}
- virtual void getROBData(const EventContext& /*context*/, const std::vector<uint32_t>& /*robIds*/, VROBFRAG& /*robFragments*/, const std::string callerName="UNKNOWN") {
- throw std::runtime_error( std::string( callerName+" is using unimplemented ") + __FUNCTION__ ) ;
+ virtual void getROBData(const EventContext& /*context*/, const std::vector<uint32_t>& /*robIds*/, VROBFRAG& /*robFragments*/,
+ const std::string_view callerName="UNKNOWN") {
+ throw std::runtime_error( std::string(callerName)+ std::string(" is using unimplemented ") + __FUNCTION__ ) ;
}
virtual const RawEvent* getEvent(const EventContext& /*context*/) {
throw std::runtime_error(std::string("Unimplemented ") + __FUNCTION__ );
@@ -102,8 +104,8 @@ public:
/// @brief Collect all data for an event from the ROS and put them into the cache
/// @return value: number of ROBs which were retrieved to complete the event
/// Optionally the name of the caller of this method can be specified for monitoring
- virtual int collectCompleteEventData(const EventContext& /*context*/, const std::string callerName="UNKNOWN") {
- throw std::runtime_error(std::string(callerName + " is using unimplemented ") + __FUNCTION__ );
+ virtual int collectCompleteEventData(const EventContext& /*context*/, const std::string_view callerName="UNKNOWN") {
+ throw std::runtime_error(std::string(callerName) + std::string(" is using unimplemented ") + __FUNCTION__ );
return 0;
}
diff --git a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ROBDataProviderSvc.h b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ROBDataProviderSvc.h
index bedb316f828554e7922b2885042e3f9d1065517b..fe62e9b69206e5280c63cce1cac4c21d088f7375 100755
--- a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ROBDataProviderSvc.h
+++ b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ROBDataProviderSvc.h
@@ -51,7 +51,7 @@ public:
// virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface);
/// Add ROBFragments to cache for given ROB ids, ROB fragments may be retrieved with DataCollector
- virtual void addROBData(const std::vector<uint32_t>& robIds, const std::string callerName="UNKNOWN") override;
+ virtual void addROBData(const std::vector<uint32_t>& robIds, const std::string_view callerName="UNKNOWN") override;
/// Add a given LVL1/LVL2 ROBFragment to cache
virtual void setNextEvent(const std::vector<ROBF>& result) override;
@@ -60,7 +60,7 @@ public:
virtual void setNextEvent(const RawEvent* re) override;
/// Retrieve ROBFragments for given ROB ids from cache
- virtual void getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments, const std::string callerName="UNKNOWN") override;
+ virtual void getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments, const std::string_view callerName="UNKNOWN") override;
/// Retrieve the whole event.
virtual const RawEvent* getEvent() override;
@@ -73,10 +73,11 @@ public:
/// MT variants
- virtual void addROBData(const EventContext& context, const std::vector<uint32_t>& robIds, const std::string callerName="UNKNOWN") override;
+ virtual void addROBData(const EventContext& context, const std::vector<uint32_t>& robIds, const std::string_view callerName="UNKNOWN") override;
virtual void setNextEvent(const EventContext& context, const std::vector<OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment>& result) override;
virtual void setNextEvent(const EventContext& context, const RawEvent* re) override;
- virtual void getROBData(const EventContext& context, const std::vector<uint32_t>& robIds, VROBFRAG& robFragments, const std::string callerName="UNKNOWN") override;
+ virtual void getROBData(const EventContext& context, const std::vector<uint32_t>& robIds, VROBFRAG& robFragments,
+ const std::string_view callerName="UNKNOWN") override;
virtual const RawEvent* getEvent(const EventContext& context) override;
virtual void setEventStatus(const EventContext& context, uint32_t status) override;
virtual uint32_t getEventStatus(const EventContext& context) override;
@@ -85,9 +86,7 @@ public:
const std::function< void(const ROBF* )>& fn ) const override;
virtual bool isEventComplete(const EventContext& /*context*/) const override { return true; }
- virtual int collectCompleteEventData(const EventContext& /*context*/, const std::string /*callerName*/ ) override { return 0; }
-
-
+ virtual int collectCompleteEventData(const EventContext& /*context*/, const std::string_view /*callerName*/ ) override { return 0; }
protected:
/// vector of ROBFragment class
@@ -125,8 +124,6 @@ protected:
BooleanProperty m_filterEmptyROB;
bool m_maskL2EFModuleID = false;
-
-
private: // data
private: //
diff --git a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderSvc.cxx b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderSvc.cxx
index 879cd668dec2e068e2887a84daa36db7a5366f2c..ab5c970fcdd662a9b5a6244c6a675f3310d9b126 100755
--- a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderSvc.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderSvc.cxx
@@ -170,12 +170,12 @@ StatusCode ROBDataProviderSvc::initialize() {
-void ROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, const std::string callerName) {
+void ROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, const std::string_view callerName) {
const EventContext context{ Gaudi::Hive::currentContext() };
return addROBData( context, robIds, callerName );
}
-void ROBDataProviderSvc::addROBData(const EventContext& context, const std::vector<uint32_t>& robIds, const std::string callerName) {
+void ROBDataProviderSvc::addROBData(const EventContext& context, const std::vector<uint32_t>& robIds, const std::string_view callerName) {
EventCache* cache = m_eventsCache.get( context );
// Copy missing ROB ids to vector with pthread allocator
@@ -318,12 +318,13 @@ void ROBDataProviderSvc::setNextEvent( const EventContext& context, const RawEve
}
/** return ROBData for ROBID
*/
-void ROBDataProviderSvc::getROBData(const std::vector<uint32_t>& ids, std::vector<const ROBF*>& v, const std::string callerName) {
+void ROBDataProviderSvc::getROBData(const std::vector<uint32_t>& ids, std::vector<const ROBF*>& v, const std::string_view callerName) {
const EventContext context{ Gaudi::Hive::currentContext() };
return getROBData( context, ids, v, callerName );
}
-void ROBDataProviderSvc::getROBData(const EventContext& context, const std::vector<uint32_t>& ids, std::vector<const ROBF*>& v, const std::string callerName) {
+void ROBDataProviderSvc::getROBData(const EventContext& context, const std::vector<uint32_t>& ids, std::vector<const ROBF*>& v,
+ const std::string_view callerName) {
EventCache* cache = m_eventsCache.get( context );
for (std::vector<uint32_t>::const_iterator it = ids.begin(), it_end = ids.end(); it != it_end; it++) {
diff --git a/Event/EventInfoUtils/CMakeLists.txt b/Event/EventInfoUtils/CMakeLists.txt
index 4aafaf0e65a7d8a02858c0f9a64b3796a8854859..3d2168afe775b906e32cf78989468469c337df13 100644
--- a/Event/EventInfoUtils/CMakeLists.txt
+++ b/Event/EventInfoUtils/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/StoreGate
PRIVATE
Control/SGTools
- Event/Eventinfo
+ Event/EventInfo
Event/xAOD/xAODEventInfo
)
diff --git a/Event/xAOD/xAODTrackingAthenaPool/src/xAODSCTRDOContainerCnv.cxx b/Event/xAOD/xAODTrackingAthenaPool/src/xAODSCTRDOContainerCnv.cxx
index f3d85fb051b5e8ca2174f88c1104f7cd52b93d70..8d74ff2d9ea6e7bfb627633b6325795e9eaf3a05 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/src/xAODSCTRDOContainerCnv.cxx
+++ b/Event/xAOD/xAODTrackingAthenaPool/src/xAODSCTRDOContainerCnv.cxx
@@ -38,7 +38,7 @@ xAODSCTRDOContainerCnv::createPersistent( xAOD::SCTRawHitValidationContainer* tr
xAOD::SCTRawHitValidationContainer* xAODSCTRDOContainerCnv::createTransient() {
// The known ID(s) for this container:
- static pool::Guid v1_guid( "BC8CE35A-5785-4F97-82B6-1E4A21A8C28F" );
+ const pool::Guid v1_guid( "BC8CE35A-5785-4F97-82B6-1E4A21A8C28F" );
// Check if we're reading the most up to date type:
if( compareClassGuid( v1_guid ) ) {
diff --git a/Event/xAOD/xAODTrigger/Root/TrigCompositeAuxContainer_v2.cxx b/Event/xAOD/xAODTrigger/Root/TrigCompositeAuxContainer_v2.cxx
index d6fdf943c3c83cf817a3029d6c74f86162652e55..a9ae9559fdfc0a3e7b0e7170c94c3fe98d315603 100644
--- a/Event/xAOD/xAODTrigger/Root/TrigCompositeAuxContainer_v2.cxx
+++ b/Event/xAOD/xAODTrigger/Root/TrigCompositeAuxContainer_v2.cxx
@@ -18,6 +18,8 @@ namespace xAOD {
AUX_VARIABLE( linkColKeys );
AUX_VARIABLE( linkColIndices );
AUX_VARIABLE( linkColClids );
+
+ AUX_VARIABLE( decisions );
}
} // namespace xAOD
diff --git a/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx b/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx
index 50905d65e450824752caf6dcab3f24291161530e..c0603fb755d73a457b5927bf541d7f068f2cae46 100644
--- a/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx
+++ b/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx
@@ -47,6 +47,9 @@ namespace xAOD {
AUXSTORE_OBJECT_SETTER_AND_GETTER( TrigComposite_v1, std::string,
name, setName )
+ AUXSTORE_OBJECT_SETTER_AND_GETTER( TrigComposite_v1, std::vector<TrigCompositeUtils::DecisionID>,
+ decisions, setDecisions )
+
//
/////////////////////////////////////////////////////////////////////////////
@@ -97,6 +100,10 @@ namespace xAOD {
if (newName == "") {
newName = name;
}
+ if (newName == "self") {
+ if (s_throwOnCopyError) throw std::runtime_error("It does not make sense for the 'self' link to be in a collection. There can be only one.");
+ return false;
+ }
const std::string mangledName = name + s_collectionSuffix;
const std::string mangledNewName = newName + s_collectionSuffix;
if (other.hasObjectLink(mangledName)) {
@@ -123,8 +130,8 @@ namespace xAOD {
bool TrigComposite_v1::copyAllLinksFrom(const xAOD::TrigComposite_v1& other) {
bool didCopy = false;
for (const std::string& name : other.linkColNames()) {
- // Cannot copy any 'self' links as *this does not know its own location in its parent container
- if (name == "self") continue;
+ // Cannot copy any 'self' link(s) as *this does not know its own location in its parent container
+ if (name == "self" || name == "self" + s_collectionSuffix) continue;
// Check we don't have one (or more) entries with this raw name (raw = might be mangled).
if (this->hasObjectLink(name)) continue;
// Check if the link is for a single object or collection of objects by looking for the mangled suffix
@@ -173,6 +180,17 @@ namespace xAOD {
return hasObjectLink( mangledName );
}
+ bool TrigComposite_v1::hasObjectLinkExact(const std::string& name, const uint32_t key, const uint16_t index, const uint32_t clid) const {
+ for (size_t i = 0; i < this->linkColNames().size(); ++i) {
+ if (this->linkColNames().at(i) != name) continue;
+ if (this->linkColKeys().at(i) != key) continue;
+ if (this->linkColIndices().at(i) != index) continue;
+ if (this->linkColClids().at(i) != clid) continue;
+ return true;
+ }
+ return false;
+ }
+
AUXSTORE_OBJECT_GETTER( TrigComposite_v1, std::vector< std::string >,
linkColNames )
AUXSTORE_OBJECT_GETTER( TrigComposite_v1, std::vector< uint32_t >,
@@ -209,7 +227,7 @@ namespace xAOD {
void TrigComposite_v1::typelessSetObjectLink( const std::string& name, const uint32_t key, const uint32_t clid, const uint16_t beginIndex, const uint16_t endIndex ) {
// Loop over collections
- if ( endIndex - beginIndex > 1 ) {
+ if ( endIndex - beginIndex > 1 ) { // Adding a *collection* of links
// Check uniqueness
const std::string mangledName = name + s_collectionSuffix;
@@ -247,7 +265,7 @@ namespace xAOD {
this->linkColClidsNC().push_back( clid );
}
}
- else {
+ else { // Adding a *single* link
// Check uniqueness
if ( std::find( linkColNamesNC().begin(), linkColNamesNC().end(), name ) == linkColNamesNC().end() ) {
@@ -280,12 +298,19 @@ namespace xAOD {
std::ostream& operator<<(std::ostream& os, const xAOD::TrigComposite_v1& tc) {
- os << "TrigComposite_v1 '" << tc.name() << "' link: name, key, index, CLID" << std::endl;
+ os << "TrigComposite_v1 name:'" << tc.name() << "'" << std::endl;
+ os << " N Lnks:" << tc.linkColNames().size();
for (size_t i=0; i<tc.linkColNames().size(); ++i){
- os << tc.linkColNames()[i] << ", ";
- os << tc.linkColKeys()[i] << ", ";
- os << tc.linkColIndices()[i] << ", ";
- os << tc.linkColClids()[i] << std::endl;
+ if (!i) os << std::endl;
+ os << " Link Name:" << tc.linkColNames()[i];
+ os << ", Key:" << tc.linkColKeys()[i];
+ os << ", Index:" << tc.linkColIndices()[i];
+ os << ", CLID:" << tc.linkColClids()[i];
+ if (i != tc.linkColNames().size() - 1) os << std::endl;
+ }
+ if (tc.decisions().size()) {
+ os << std::endl << " N Decisions: '" << tc.decisions().size() << std::endl << " ";
+ for (const TrigCompositeUtils::DecisionID id : tc.decisions()) os << id << ", ";
}
return os;
}
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/TrigComposite.h b/Event/xAOD/xAODTrigger/xAODTrigger/TrigComposite.h
index 32524ccb8d3133b433503338bf811cd71a1dcd2e..6fc5a85eec5a526e1af68657fd44b202c3c74789 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/TrigComposite.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/TrigComposite.h
@@ -11,8 +11,6 @@
// Local include(s):
#include "xAODTrigger/versions/TrigComposite_v1.h"
-#include <set>
-
namespace xAOD{
/// Declare the latest version of the class
typedef TrigComposite_v1 TrigComposite;
@@ -20,9 +18,6 @@ namespace xAOD{
namespace TrigCompositeUtils{
typedef xAOD::TrigComposite Decision;
-
- typedef unsigned int DecisionID;
- typedef std::set<DecisionID> DecisionIDContainer;
}
// Declare a CLID for the type:
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigCompositeAuxContainer_v2.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigCompositeAuxContainer_v2.h
index a930c557c246d21a8ce1ae5b7aa37d3da8c18465..fce55c86b240c21e0ed0c09e311e6487ed1aebcf 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigCompositeAuxContainer_v2.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigCompositeAuxContainer_v2.h
@@ -18,6 +18,8 @@ extern "C" {
// xAOD include(s):
#include "xAODCore/AuxContainerBase.h"
+#include "xAODTrigger/TrigComposite.h"
+
namespace xAOD {
/// Auxiliary store for TrigComposite containers
@@ -41,6 +43,8 @@ namespace xAOD {
std::vector< std::vector< uint16_t > > linkColIndices;
std::vector< std::vector< uint32_t > > linkColClids;
+ std::vector< std::vector< TrigCompositeUtils::DecisionID > > decisions;
+
}; // class TrigCompositeAuxContainer_v2
} // namespace xAOD
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h
index b65c66e1b880f035c1d2cd9b6e3624d65b05836b..6b529cabc190dd0102630bb320c80a2a6ca45c79 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h
@@ -14,12 +14,18 @@ extern "C" {
}
#include <string>
#include <vector>
+#include <set>
// EDM include(s):
#include "AthContainers/AuxElement.h"
#include "AthLinks/ElementLink.h"
#include "AthLinks/ElementLinkVector.h"
+namespace TrigCompositeUtils{
+ typedef unsigned int DecisionID;
+ typedef std::set<DecisionID> DecisionIDContainer;
+}
+
namespace xAOD {
/// Class used to describe composite objects in the HLT
@@ -54,6 +60,11 @@ namespace xAOD {
/// Set a human-readable name for the object
void setName( const std::string& name );
+ /// Get positive HLT chain decisions associated with this TrigComposite. Navigation use
+ const std::vector<TrigCompositeUtils::DecisionID>& decisions() const;
+ /// Set positive HLT chain decisions associated with this TrigComposite. Navigation use
+ void setDecisions( const std::vector<TrigCompositeUtils::DecisionID>& decisions );
+
/// @}
/// @name Functions for accessing basic properties on the object
@@ -94,11 +105,11 @@ namespace xAOD {
template< class OBJECT >
const OBJECT* object( const std::string& name ) const;
- /// Add a link to a single object within a collection
+ /// Add a link to a single object within a collection. Performs de-duplication
template< class CONTAINER >
bool addObjectCollectionLink( const std::string& collectionName,
const ElementLink< CONTAINER >& link );
- /// Add links to multiple objects within a collection
+ /// Add links to multiple objects within a collection. Performs de-duplication
template< class CONTAINER >
bool addObjectCollectionLinks( const std::string& collectionName,
const ElementLinkVector< CONTAINER >& links );
@@ -176,6 +187,9 @@ namespace xAOD {
/// Raw access to the persistent link CLIDs (non-const)
std::vector< uint32_t >& linkColClidsNC();
+ // Helper function, check for exact link match
+ bool hasObjectLinkExact(const std::string& name, const uint32_t key, const uint16_t index, const uint32_t clid) const;
+
/// Helper function, copy one link into this object
void copyLinkInternal(const xAOD::TrigComposite_v1& other, const size_t index, const std::string& newName);
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc
index 360664965ada39b4a054b1a6beaf1e6d3a60151e..598f26110174cef2457cc5c9481e81e35d5ed487 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc
@@ -184,12 +184,14 @@ namespace xAOD {
// No method currently provided to update or check for uniqueness of a link
// being added to a container.
- // Add a new object:
+ // Add a new object (unless it would duplicate an existing one):
const std::string mangledName = collectionName + s_collectionSuffix;
- linkColNamesNC().push_back( mangledName );
- linkColKeysNC().push_back( link.key() );
- linkColIndicesNC().push_back( link.index() );
- linkColClidsNC().push_back( ClassID_traits< CONTAINER >::ID() );
+ if (!hasObjectLinkExact(mangledName, link.key(), link.index(), ClassID_traits< CONTAINER >::ID())) {
+ linkColNamesNC().push_back( mangledName );
+ linkColKeysNC().push_back( link.key() );
+ linkColIndicesNC().push_back( link.index() );
+ linkColClidsNC().push_back( ClassID_traits< CONTAINER >::ID() );
+ }
return true;
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
index 90df1bb827479f4b16b52d6243e582543a598272..e778a7736a982b223e085bca97a4c56b21a02154 100644
--- a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
@@ -32,6 +32,7 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( tdaq COMPONENTS omniORB4 omnithread ipc is owl )
find_package( tdaq-common COMPONENTS CTPfragment eformat eformat_write hltinterface )
+find_package( TBB )
# Component(s) in the package:
atlas_add_library( TrigServicesLib
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
index ab121e6cb5fa9c30003b50ab380385ba246b63d3..4f7f02252d2c028da54c2a435c08c49f4d327aae 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
@@ -41,7 +41,7 @@ def setupMessageSvc():
MessageSvc = svcMgr.MessageSvc
MessageSvc.OutputLevel = theApp.OutputLevel
- MessageSvc.Format = "%t % F%35W%S%4W%e%s%7W%R%T %0W%M"
+ MessageSvc.Format = "% F%40W%S%4W%e%s%7W%R%T %0W%M"
# Message suppression
MessageSvc.enableSuppression = False
@@ -75,3 +75,34 @@ def setupMessageSvc():
# publish message counts during RUNNING in histogram
MessageSvc.publishStats = True
MessageSvc.publishLevel = INFO
+
+# online ROB data provider service
+from TrigServicesConf import HltROBDataProviderSvc as _HltROBDataProviderSvc
+class HltROBDataProviderSvc(_HltROBDataProviderSvc):
+ __slots__ = ()
+
+ def __init__(self, name='ROBDataProviderSvc'):
+ super(HltROBDataProviderSvc, self).__init__(name)
+ from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool,defineHistogram
+ self.MonTool = GenericMonitoringTool('MonTool')
+ self.MonTool.Histograms = [
+ defineHistogram('TIME_ROBReserveData', path='EXPERT', type='TH1F',
+ title='Time to reserve ROBs for later retrieval;time [ms]',
+ xbins=100, xmin=0, xmax=100),
+ defineHistogram('NUMBER_ROBReserveData', path='EXPERT', type='TH1F',
+ title='Number of reserved ROBs for later retrieval;number',
+ xbins=100, xmin=0, xmax=500),
+ defineHistogram('TIME_ROBRequest', path='EXPERT', type='TH1F',
+ title='Time for ROB retrievals;time [ms]',
+ xbins=100, xmin=0, xmax=500),
+ 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 [ms]',
+ xbins=100, xmin=0, xmax=1000),
+ defineHistogram('NUMBER_CollectAllROBs', path='EXPERT', type='TH1F',
+ title='Number of received ROBs for collect call;number',
+ xbins=100, xmin=0, xmax=2500)
+ ]
+ return
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
index edee483270a46d0448bec4ece286421f975e8f14..8523783a3fa3c58edc6705bc4a4d44abc2630b06 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
@@ -65,6 +65,23 @@ def setupCommonServices():
from PyUtils.Helpers import ROOT6Setup
ROOT6Setup()
+ # Setup online THistSvc unless specifically configured otherwise
+ # setup the THistSvc early and force the creation of the ThistSvc
+ # so that it can be used by infrastructure services to book histograms
+ # (to avoid problems e.g. with histograms in ROBDataProviderSvc)
+ if _Conf.useOnlineTHistSvc:
+ if hasattr(svcMgr, 'THistSvc'):
+ log.fatal("The offline histogramming THistSvc is already in place.")
+ raise RuntimeError("Cannot setup online histogramming TrigMonTHistSvc")
+ log.debug("Using online histogramming service (TrigMonTHistSvc)")
+ from TrigServices.TrigServicesConf import TrigMonTHistSvc
+ svcMgr += TrigMonTHistSvc("THistSvc")
+ else:
+ log.debug("Using offline histogramming service (THistSvc)")
+ from GaudiSvc.GaudiSvcConf import THistSvc
+ svcMgr += THistSvc()
+ theApp.CreateSvc += [ svcMgr.THistSvc.getFullName() ]
+
# StoreGateSvc
svcMgr.StoreGateSvc.ActivateHistory = False
@@ -109,18 +126,9 @@ def setupCommonServices():
from TrigServices.TrigServicesConfig import TrigCOOLUpdateHelper
svcMgr.HltEventLoopMgr.CoolUpdateTool = TrigCOOLUpdateHelper()
- # Setup online THistSvc unless specifically configured otherwise
- if _Conf.useOnlineTHistSvc:
- if hasattr(svcMgr, 'THistSvc'):
- log.fatal("The offline histogramming THistSvc is already in place.")
- raise RuntimeError("Cannot setup online histogramming TrigMonTHistSvc")
- log.debug("Using online histogramming service (TrigMonTHistSvc)")
- from TrigServices.TrigServicesConf import TrigMonTHistSvc
- svcMgr += TrigMonTHistSvc("THistSvc")
- else:
- log.debug("Using offline histogramming service (THistSvc)")
- from GaudiSvc.GaudiSvcConf import THistSvc
- svcMgr += THistSvc()
+ # Configure the online ROB data provider service
+ from TrigServices.TrigServicesConfig import HltROBDataProviderSvc
+ svcMgr += HltROBDataProviderSvc()
# Explicitly set a few OutputLevels (needed because some services are created in
# different order when running with the PSC)
@@ -155,7 +163,6 @@ def setupCommonServicesEnd():
if 1 not in [ o.count('EXPERT') for o in svcMgr.THistSvc.Output ]:
svcMgr.THistSvc.Output += ["EXPERT DATAFILE='expert-monitoring.root' OPT='RECREATE'"]
-
# Set default properties for some important services after all user job options
log.info('Configure core services for online runnig')
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
index 550eff3e3028a54b5cc5a4e379117750ea6e86d6..182d6a8f7a210d729cd079d99e065784a4e21831 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
@@ -241,7 +241,7 @@ private:
/// "Event" context of current run (invalid event/slot)
EventContext m_currentRunCtx;
/// Event counter used for local bookkeeping; incremental per instance of HltEventLoopMgr, unrelated to global_id
- size_t m_localEventNumber;
+ size_t m_localEventNumber{0};
/// Event selector context
IEvtSelector::Context* m_evtSelContext;
/// Vector of top level algorithms
@@ -261,7 +261,7 @@ private:
/// Flag set to false if timer thread should be stopped
std::atomic<bool> m_runEventTimer;
/// Counter of framework errors
- int m_nFrameworkErrors;
+ int m_nFrameworkErrors{0};
/// Application name
std::string m_applicationName;
/// Worker ID
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
index a1451a407ebcb4bcda12fc7087f06b1ff4c428de..a796a8f58d3a423bd2e7e2dfb50c43fe4e3c2d78 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
@@ -1,137 +1,109 @@
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-
-// Include files.
#include "HltROBDataProviderSvc.h"
-#include "TrigMonitorBase/TrigLockedHist.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ITHistSvc.h"
+#include "TrigKernel/HltExceptions.h"
+
+// Gaudi
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IAlgContextSvc.h"
-#include "GaudiKernel/IAlgorithm.h"
+
+// hltinterface / data collector
#include "hltinterface/DataCollector.h"
-#include "eformat/Version.h"
-
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <cassert>
-#include <bitset>
-#include <TH1F.h>
-#include <TH2F.h>
-
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6,0,0)
-# define CAN_REBIN(hist) hist->SetCanExtend(TH1::kAllAxes)
-#else
-# define CAN_REBIN(hist) hist->SetBit(TH1::kCanRebin)
-#endif
-
-namespace HltROBDataProviderConstants {
- // reserve a number of ROB monitor collections
- static const int Number_of_Rob_Monitor_Structs = 10;
- // number of ROBs in an event, used to reserve space in an array
- static const int Max_Number_Of_ROBs = 2000;
-}
-// Constructor.
-HltROBDataProviderSvc::HltROBDataProviderSvc(const std::string& name, ISvcLocator* svcloc)
-:ROBDataProviderSvc(name,svcloc),
- m_storeGateSvc( "StoreGateSvc", name ),
- m_algContextSvc(0),
- m_onlineRunning(false),
- m_removeEmptyROB(false),
- m_isEventComplete(false),
- m_callerName("UNKNOWN"),
- m_RobRequestInfo(0),
- m_histProp_requestedROBsPerCall(Gaudi::Histo1DDef("RequestedROBsPerCall" ,0,300,50)),
- m_histProp_receivedROBsPerCall(Gaudi::Histo1DDef("ReceivedROBsPerCall" ,0,300,50)),
- m_histProp_timeROBretrieval(Gaudi::Histo1DDef("TimeForROBretrieval" ,0.,500.,50)),
- m_hist_requestedROBsPerCall(0),
- m_hist_receivedROBsPerCall(0),
- m_hist_timeROBretrieval(0),
- m_hist_genericStatusForROB(0),
- m_hist_specificStatusForROB(0)
+// eformat
+#include "eformat/Status.h"
+#include "eformat/write/FullEventFragment.h" // max number of possible ROB fragments
+
+// Athena
+
+HltROBDataProviderSvc::HltROBDataProviderSvc(const std::string& name, ISvcLocator* pSvcLocator) :
+ base_class(name, pSvcLocator)
{
- declareProperty("ignoreROB", m_ignoreROB,"List of ROBs to ignore for retrieval");
- declareProperty("enabledROBs", m_enabledROBs,"List of enabled detector ROBs");
- declareProperty("LArMetROBs", m_enabledLArMetROBs,"List of enabled LAr MET ROBs");
- declareProperty("TileMetROBs", m_enabledTileMetROBs,"List of enabled Tile MET ROBs");
- declareProperty("readROBfromOKS", m_readROBfromOKS=true,"Read enabled ROBs from OKS");
- declareProperty("doMonitoring", m_doMonitoring=false,"Enable histograms");
- declareProperty("doDetailedROBMonitoring", m_doDetailedROBMonitoring=false,"Produce ROB cost data");
- declareProperty("ROBDataMonitorCollectionSGName", m_ROBDataMonitorCollection_SG_Name="ROBDataMonitorCollection","Name of cost monitoring collection in SG");
- declareProperty("HistRequestedROBsPerCall", m_histProp_requestedROBsPerCall,"Number of ROBs requested");
- declareProperty("HistReceivedROBsPerCall", m_histProp_receivedROBsPerCall,"Number of ROBs received");
- declareProperty("HistTimeROBretrieval", m_histProp_timeROBretrieval,"Timing for ROB retrieval");
- declareProperty("ModuleIDGenericLArMetROB", m_genericLArMetModuleID=0xffff,"Generic module id for LAr MET ROB retrieval");
- declareProperty("ModuleIDGenericTileMetROB", m_genericTileMetModuleID=0xffff,"Generic module id for Tile MET ROB retrieval");
- declareProperty("SeparateMETandDetROBRetrieval", m_separateMETandDetROBRetrieval=true,"Separate retrieval of MET and detector ROBs");
-
- // fill map with generic status codes
- m_map_GenericStatus[eformat::UNCLASSIFIED] = "UNCLASSIFIED";
- m_map_GenericStatus[eformat::BCID_CHECK_FAIL] = "BCID_CHECK_FAIL";
- m_map_GenericStatus[eformat::LVL1ID_CHECK_FAIL] = "LVL1ID_CHECK_FAIL";
- m_map_GenericStatus[eformat::TIMEOUT] = "TIMEOUT";
- m_map_GenericStatus[eformat::DATA_CORRUPTION] = "DATA_CORRUPTION";
- m_map_GenericStatus[eformat::INTERNAL_OVERFLOW] = "INTERNAL_OVERFLOW";
- m_map_GenericStatus[eformat::DUMMY_FRAGMENT] = "DUMMY_FRAGMENT";
-
- // fill vector with specific status codes
- m_vec_SpecificStatus.reserve(16);
- m_vec_SpecificStatus.push_back("TRIGGER_TYPE_SYNC_ERROR/DATAFLOW_DUMMY");
- m_vec_SpecificStatus.push_back("FRAGMENT_SIZE_ERROR");
- m_vec_SpecificStatus.push_back("DATABLOCK_ERROR");
- m_vec_SpecificStatus.push_back("CTRL_WORD_ERROR");
- m_vec_SpecificStatus.push_back("MISSING_BOF");
- m_vec_SpecificStatus.push_back("MISSING_EOF");
- m_vec_SpecificStatus.push_back("INVALID_HEADER_MARKER");
- m_vec_SpecificStatus.push_back("FORMAT_ERROR");
- m_vec_SpecificStatus.push_back("DUPLICATE_EVENT");
- m_vec_SpecificStatus.push_back("SEQUENCE_ERROR");
- m_vec_SpecificStatus.push_back("TRANSMISSION_ERROR");
- m_vec_SpecificStatus.push_back("TRUNCATION");
- m_vec_SpecificStatus.push_back("SHORT_FRAGMENT");
- m_vec_SpecificStatus.push_back("FRAGMENT_LOST");
- m_vec_SpecificStatus.push_back("FRAGMENT_PENDING");
- m_vec_SpecificStatus.push_back("ROBIN_DISCARD_MODE");
}
-// Destructor.
HltROBDataProviderSvc::~HltROBDataProviderSvc()
{
}
-// Initialization
StatusCode HltROBDataProviderSvc::initialize()
{
- StatusCode sc = ROBDataProviderSvc::initialize();
-
- ATH_MSG_INFO(" ---> HltROBDataProviderSvc = " << name() << " initialize "
- << " - package version " << PACKAGE_VERSION);
-
- // get Property filterEmptyROB from base class
- if ( !sc.isSuccess() ) {
- ATH_MSG_ERROR(" ROBDataProviderSvc::initialize() failed.");
- return sc;
- } else {
- BooleanProperty filterEmptyROB;
- filterEmptyROB.setName("filterEmptyROB");
- if (filterEmptyROB.assign(getProperty("filterEmptyROB"))) {
- m_removeEmptyROB = filterEmptyROB.value() ;
- ATH_MSG_INFO(" ---> getProperty('filterEmptyROB') = " << filterEmptyROB);
- } else {
- ATH_MSG_WARNING(" ROBDataProviderSvc::getProperty('filterEmptyROB') failed.");
+ ATH_MSG_INFO("HltROBDataProviderSvc::" << __FUNCTION__ << ": name = " << name());
+//===================================================================
+// The filtering of ROBs can be configured with job options as:
+//
+// for individual ROBs as :
+// ------------------------
+// ROBDataProviderSvc.filterRobWithStatus = [ (ROB SourceId, StatusCode to remove),
+// (ROB SourceId 2, StatusCode to remove 2), ... ]
+// and:
+// ROBDataProviderSvc.filterRobWithStatus += [ (ROB SourceId n, StatusCode to remove n) ]
+//
+// Example:
+// ROBDataProviderSvc.filterRobWithStatus = [ (0x42002a,0x0000000f), (0x42002e,0x00000008) ]
+// ROBDataProviderSvc.filterRobWithStatus += [ (0x42002b,0x00000000) ]
+//
+// for all ROBs of a given sub detector as :
+// -----------------------------------------
+// ROBDataProviderSvc.filterSubDetWithStatus = [ (Sub Det Id, StatusCode to remove),
+// (Sub Det Id 2, StatusCode to remove 2), ... ]
+// and:
+// ROBDataProviderSvc.filterSubDetWithStatus += [ (Sub Det Id n, StatusCode to remove n) ]
+//
+// Example:
+// ROBDataProviderSvc.filterSubDetWithStatus = [ (0x41,0x00000000), (0x42,0x00000000) ]
+// ROBDataProviderSvc.filterSubDetWithStatus += [ (0x41,0xcb0002) ]
+//
+// For valid ROB Source Ids, Sub Det Ids and ROB Status elements see the event format
+// document ATL-D-ES-0019 (EDMS)
+//===================================================================
+ // get list of ROBs to filter out by status code
+ for (unsigned int i = 0; i < m_filterRobWithStatus.value().size(); i++) {
+ eformat::helper::SourceIdentifier tmpsrc(m_filterRobWithStatus.value()[i].first);
+ if (tmpsrc.human_detector() != "UNKNOWN") {
+ m_filterRobMap[tmpsrc.code()].push_back(m_filterRobWithStatus.value()[i].second);
+ }
+ }
+
+ // get list of subdetectors to filter out by status code
+ for (unsigned int i = 0; i < m_filterSubDetWithStatus.value().size(); i++) {
+ eformat::helper::SourceIdentifier tmpsrc((eformat::SubDetector)m_filterSubDetWithStatus.value()[i].first, 0);
+ if (tmpsrc.human_detector() != "UNKNOWN") {
+ m_filterSubDetMap[tmpsrc.subdetector_id()].push_back(m_filterSubDetWithStatus.value()[i].second);
+ }
+ }
+ ATH_MSG_INFO(" ---> Filter out empty ROB fragments = " << m_filterEmptyROB);
+
+ // print list of ROBs to filter out by status code
+ ATH_MSG_INFO(" ---> Filter out specific ROBs by Status Code: # ROBs = " << m_filterRobMap.size());
+ for (auto it : m_filterRobMap) {
+ eformat::helper::SourceIdentifier tmpsrc(it.first);
+ ATH_MSG_INFO(" RobId=0x" << MSG::hex << it.first << " -> in Sub Det = " << tmpsrc.human_detector());
+
+ for (auto it_status: it.second) {
+ eformat::helper::Status tmpstatus(it_status);
+ ATH_MSG_INFO(" Status Code=0x"
+ << MSG::hex << std::setfill( '0' ) << std::setw(8) << tmpstatus.code()
+ << " Generic Part=0x" << std::setw(4) << tmpstatus.generic()
+ << " Specific Part=0x" << std::setw(4) << tmpstatus.specific() << MSG::dec);
+ }
+ }
+
+ // print list of subdetectors to filter out by status code
+ ATH_MSG_INFO(" ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = " << m_filterSubDetMap.size());
+ for (auto it : m_filterSubDetMap) {
+ eformat::helper::SourceIdentifier tmpsrc(it.first, 0);
+ ATH_MSG_INFO(" SubDetId=0x" << MSG::hex << it.first << " -> " << tmpsrc.human_detector());
+ for (auto it_status : it.second) {
+ eformat::helper::Status tmpstatus(it_status);
+ ATH_MSG_INFO(" Status Code=0x"
+ << MSG::hex << std::setfill( '0' ) << std::setw(8) << tmpstatus.code()
+ << " Generic Part=0x" << std::setw(4) << tmpstatus.generic()
+ << " Specific Part=0x" << std::setw(4) << tmpstatus.specific() << MSG::dec);
}
}
// get the list of enabled ROBs from OKS
bool robOKSconfigFound = false;
- bool robLArMetOKSconfigFound = false;
- bool robTileMetOKSconfigFound = false;
if ( m_readROBfromOKS.value() ) {
ServiceHandle<IJobOptionsSvc> p_jobOptionsSvc("JobOptionsSvc", name());
@@ -148,1136 +120,516 @@ StatusCode HltROBDataProviderSvc::initialize()
if ( cur->name() == "DF_Enabled_ROB_IDs" ) {
if (m_enabledROBs.assign(*cur)) {
robOKSconfigFound = true;
- ATH_MSG_INFO(" ---> Read from OKS = " << m_enabledROBs.value().size() << " enabled ROB IDs.");
+ ATH_MSG_INFO(" ---> Read from OKS = "
+ << MSG::dec << m_enabledROBs.value().size() << " enabled ROB IDs.");
} else {
ATH_MSG_WARNING(" Could not set Property 'enabledROBs' from OKS.");
}
}
-
- // the LAr MET ROB list is found
- if ( cur->name() == "DF_LAr_MET_ROB_IDs" ) {
- if (m_enabledLArMetROBs.assign(*cur)) {
- robLArMetOKSconfigFound = true;
- ATH_MSG_INFO(" ---> Read from OKS = " << m_enabledLArMetROBs.value().size() << " LAr MET ROB IDs.");
- } else {
- ATH_MSG_WARNING(" Could not set Property 'LArMetROBs' from OKS.");
- }
- }
-
- // the Tile MET ROB list is found
- if ( cur->name() == "DF_Tile_MET_ROB_IDs" ) {
- if (m_enabledTileMetROBs.assign(*cur)) {
- robTileMetOKSconfigFound = true;
- ATH_MSG_INFO(" ---> Read from OKS = " << m_enabledTileMetROBs.value().size() << " Tile MET ROB IDs.");
- } else {
- ATH_MSG_WARNING(" Could not set Property 'TileMetROBs' from OKS.");
- }
- }
}
}
p_jobOptionsSvc.release().ignore();
}
}
- ATH_MSG_INFO(" ---> HltROBDataProviderSvc = " << name() << " special properties <---");
- ATH_MSG_INFO(" ---> Filter out empty ROB fragments = " << m_removeEmptyROB);
- ATH_MSG_INFO(" ---> Fill monitoring histograms = " << m_doMonitoring);
- ATH_MSG_INFO(" Hist:RequestedROBsPerCall = " << m_histProp_requestedROBsPerCall);
- ATH_MSG_INFO(" Hist:ReceivedROBsPerCall = " << m_histProp_receivedROBsPerCall);
- ATH_MSG_INFO(" Hist:TimeROBretrieval = " << m_histProp_timeROBretrieval);
- ATH_MSG_INFO(" ---> Do detailed ROB monitoring = " << m_doDetailedROBMonitoring);
- ATH_MSG_INFO(" ---> SG name for ROB monitoring collect. = " << m_ROBDataMonitorCollection_SG_Name);
- ATH_MSG_INFO(" ---> Read list of enabled ROBs from OKS = " << m_readROBfromOKS);
+ // print list of enabled ROBs, read from OKS
+ ATH_MSG_INFO(" ---> Read list of enabled ROBs from OKS = " << m_readROBfromOKS);
if (m_enabledROBs.value().size() == 0) {
- ATH_MSG_INFO(" ---> The list of enabled ROBs has size = 0. No check will be performed ");
+ ATH_MSG_INFO(" ---> The list of enabled ROBs has size = 0. No check will be performed ");
} else {
if (m_readROBfromOKS.value() && robOKSconfigFound) {
- ATH_MSG_INFO(" ---> The list of enabled ROBs has size = " << m_enabledROBs.value().size()
- << ". It was read from the partition database." );
- } else {
- ATH_MSG_INFO(" ---> The list of enabled ROBs has size = " << m_enabledROBs.value().size()
- << ". It was read from job options." );
- }
- }
-
- ATH_MSG_INFO(" ---> Generic Module ID for LAr MET ROB = " << m_genericLArMetModuleID);
- if (m_enabledLArMetROBs.value().size() == 0) {
- ATH_MSG_INFO(" ---> The list of LAr MET ROBs has size = 0. No LAr MET ROB access will be done.");
- } else {
- if (m_readROBfromOKS.value() && robLArMetOKSconfigFound) {
- ATH_MSG_INFO(" ---> The list of LAr MET ROBs has size = " << m_enabledLArMetROBs.value().size()
+ ATH_MSG_INFO(" ---> The list of enabled ROBs has size = " << MSG::dec << m_enabledROBs.value().size()
<< ". It was read from the partition database." );
} else {
- ATH_MSG_INFO(" ---> The list of LAr MET ROBs has size = " << m_enabledLArMetROBs.value().size()
+ ATH_MSG_INFO(" ---> The list of enabled ROBs has size = " << MSG::dec << m_enabledROBs.value().size()
<< ". It was read from job options." );
}
}
- ATH_MSG_INFO(" ---> Generic Module ID for Tile MET ROB = " << m_genericTileMetModuleID);
- if (m_enabledTileMetROBs.value().size() == 0) {
- ATH_MSG_INFO(" ---> The list of Tile MET ROBs has size = 0. No Tile MET ROB access will be done.");
- } else {
- if (m_readROBfromOKS.value() && robTileMetOKSconfigFound) {
- ATH_MSG_INFO(" ---> The list of Tile MET ROBs has size = " << m_enabledTileMetROBs.value().size()
- << ". It was read from the partition database." );
- } else {
- ATH_MSG_INFO(" ---> The list of Tile MET ROBs has size = " << m_enabledTileMetROBs.value().size()
- << ". It was read from job options." );
- }
- }
+ // Setup the slot specific cache
+ m_eventsCache = SG::SlotSpecificObj<EventCache>( SG::getNSlots() );
- ATH_MSG_INFO(" ---> Separate MET and Det ROB Retrieval = " << m_separateMETandDetROBRetrieval);
+ // Retrieve the monitoring tool
+ if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
- if (m_ignoreROB.value().size() == 0) {
- ATH_MSG_INFO(" ---> The list of ROBs to ignore has size = 0. No check will be performed ");
- } else {
- ATH_MSG_INFO(" ---> The list of ROBs to ignore has size = " << m_ignoreROB.value().size());
- }
-
- for (unsigned int i=0; i<m_ignoreROB.value().size(); i++) {
- ATH_MSG_INFO(" ---> do not retrieve ROB[" << i << "]: hex(id)=0x"
- << MSG::hex << m_ignoreROB.value()[i]<<MSG::dec
- << " dec(id)="<< m_ignoreROB.value()[i]);
- }
-
- // register incident handler for begin run
- ServiceHandle<IIncidentSvc> incidentSvc("IncidentSvc", name());
- ATH_CHECK(incidentSvc.retrieve());
+ return(StatusCode::SUCCESS);
+}
- long int pri=100;
- incidentSvc->addListener(this,"BeginRun",pri);
- incidentSvc.release().ignore();
+StatusCode HltROBDataProviderSvc::finalize()
+{
+ ATH_CHECK(m_monTool.release());
+ return StatusCode::SUCCESS;
+}
- // Setup the StoreGateSvc
- ATH_CHECK(m_storeGateSvc.retrieve());
+/// --- Implementation of IROBDataProviderSvc interface ---
+/// --- Legacy interface (depricated) ---
- return sc;
+/// Signal ROB fragments which should be considered for prefetching in online running
+void HltROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds,
+ const std::string_view callerName)
+{
+ const EventContext context{ Gaudi::Hive::currentContext() };
+ return addROBData( context, robIds, callerName );
}
-// Initialization
-StatusCode HltROBDataProviderSvc::finalize()
+/// Start a new event with a set of ROB fragments, e.g. from LVL1 result, in online and add the fragments to the ROB cache
+void HltROBDataProviderSvc::setNextEvent(const std::vector<ROBF>& result)
{
- StatusCode sc = ROBDataProviderSvc::finalize();
- if ( !sc.isSuccess() ) {
- ATH_MSG_ERROR(" ROBDataProviderSvc::finalize() failed.");
- }
-
- // release the AlgContextSvc if used
- if ( m_algContextSvc ) m_algContextSvc->release();
+ const EventContext context{ Gaudi::Hive::currentContext() };
+ return setNextEvent( context, result );
+}
- return sc;
+/// Start a new event with a full event fragment and add all ROB fragments in to the ROB cache
+void HltROBDataProviderSvc::setNextEvent(const RawEvent* re)
+{
+ const EventContext context{ Gaudi::Hive::currentContext() };
+ return setNextEvent( context, re );
}
-/// Query interface
-StatusCode HltROBDataProviderSvc::queryInterface(const InterfaceID& riid, void** ppvInterface)
+/// Retrieve ROB fragments for given ROB ids from the ROB cache
+void HltROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments,
+ const std::string_view callerName)
{
- if ( IROBDataProviderSvc::interfaceID().versionMatch(riid) ) {
- *ppvInterface = (IROBDataProviderSvc*)this;
- } else if ( ITrigROBDataProviderSvc::interfaceID().versionMatch(riid) ) {
- *ppvInterface = (ITrigROBDataProviderSvc*)this;
- } else if ( ITrigROBDataProviderSvcPrefetch::interfaceID().versionMatch(riid) ) {
- *ppvInterface = (ITrigROBDataProviderSvcPrefetch*)this;
- } else if ( IIncidentListener::interfaceID().versionMatch(riid) ) {
- *ppvInterface = (IIncidentListener*)this;
- } else {
- return Service::queryInterface(riid, ppvInterface);
- }
- addRef();
- return StatusCode::SUCCESS;
+ const EventContext context{ Gaudi::Hive::currentContext() };
+ return getROBData( context, robIds, robFragments, callerName );
}
-/** - in online add ROB fragments for given ROB ids to the map
- call the DataCollector to retrieve the ROB fragments
-
- - in offline only check that given ROB ids are in the map, issue an
- error if not
- */
-void HltROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, const std::string callerName)
-{
- //-------------------
- // remove empty calls
- //-------------------
- if (robIds.size() == 0) return;
-
- //--------------------
- // set the caller name
- //--------------------
- if (callerName != "UNKNOWN") m_callerName = callerName;
-
- //--------------------
- // make unique ROB IDs
- //--------------------
- std::vector<uint32_t>::iterator remove_duplicate;
- std::vector<uint32_t> robIdsUnique(robIds);
-
- sort(robIdsUnique.begin(), robIdsUnique.end());
- remove_duplicate = unique(robIdsUnique.begin(), robIdsUnique.end());
- robIdsUnique.erase(remove_duplicate, robIdsUnique.end());
-
- //------------------------------------------------------------------
- // Replace the generic MET ROB ID with the full list of all MET ROBs
- //------------------------------------------------------------------
- // LAr MET ROBs
- uint32_t generic_LAr_MET_id = eformat::helper::SourceIdentifier(eformat::TDAQ_LAR_MET,m_genericLArMetModuleID.value()).code();
- std::vector<uint32_t>::iterator rob_LAr_Met_it = std::find(robIdsUnique.begin(), robIdsUnique.end(), generic_LAr_MET_id);
- if (rob_LAr_Met_it != robIdsUnique.end()) {
- robIdsUnique.erase(rob_LAr_Met_it);
- if (m_enabledLArMetROBs.value().size() != 0) robIdsUnique.insert(robIdsUnique.end(),m_enabledLArMetROBs.value().begin(),m_enabledLArMetROBs.value().end());
- }
+/// Retrieve the full event fragment
+const RawEvent* HltROBDataProviderSvc::getEvent()
+{
+ const EventContext context{ Gaudi::Hive::currentContext() };
+ return getEvent( context );
+}
- // Tile MET ROBs
- uint32_t generic_Tile_MET_id = eformat::helper::SourceIdentifier(eformat::TDAQ_TILE_MET,m_genericTileMetModuleID.value()).code();
- std::vector<uint32_t>::iterator rob_Tile_Met_it = std::find(robIdsUnique.begin(), robIdsUnique.end(), generic_Tile_MET_id);
- if (rob_Tile_Met_it != robIdsUnique.end()) {
- robIdsUnique.erase(rob_Tile_Met_it);
- if (m_enabledTileMetROBs.value().size() != 0) robIdsUnique.insert(robIdsUnique.end(),m_enabledTileMetROBs.value().begin(),m_enabledTileMetROBs.value().end());
- }
+/// Store the status for the event.
+void HltROBDataProviderSvc::setEventStatus(uint32_t status)
+{
+ const EventContext context{ Gaudi::Hive::currentContext() };
+ setEventStatus( context, status );
+}
- //-------------------
- //--- offline running
- //-------------------
- if (!m_onlineRunning) {
-
- // for offline running all requested ROBs should be found in cache
- // if not issue error
- ROBDataProviderSvc::addROBData(robIdsUnique);
- //------------------
- //--- online running
- //------------------
- } else {
- // detailed ROB monitoring
- //------------------------
- // Create a ROB monitoring collection and register it to StoreGate
- ROBDataMonitorCollection* p_robMonCollection(0);
- if ( m_doDetailedROBMonitoring.value() ) {
- if ( !(m_storeGateSvc->transientContains<ROBDataMonitorCollection>(m_ROBDataMonitorCollection_SG_Name.value())) ) {
- p_robMonCollection = new ROBDataMonitorCollection;
- if ( p_robMonCollection ) {
- p_robMonCollection->reserve( HltROBDataProviderConstants::Number_of_Rob_Monitor_Structs ) ;
- if ( (m_storeGateSvc->record(p_robMonCollection, m_ROBDataMonitorCollection_SG_Name.value(), true)).isFailure() ) {
- ATH_MSG_WARNING(" Registering ROB Monitoring collection in StoreGate failed.");
- delete p_robMonCollection;
- p_robMonCollection = 0;
- }
- }
- } else {
- if ( m_storeGateSvc->retrieve(p_robMonCollection).isFailure() ) {
- ATH_MSG_WARNING(" Retrieval of ROB Monitoring collection from StoreGate failed.");
- p_robMonCollection = 0;
- }
- }
- }
+/// Retrieve the status for the event.
+uint32_t HltROBDataProviderSvc::getEventStatus()
+{
+ const EventContext context{ Gaudi::Hive::currentContext() };
+ return getEventStatus( context );
+}
- // create a new ROBDataMonitorStruct and fill it
- robmonitor::ROBDataMonitorStruct* p_robMonStruct(0);
- if ( p_robMonCollection ) {
- // caller name
- std::string caller_name("UNKNOWN");
- if (callerName != "UNKNOWN") {
- caller_name = callerName;
- } else if ((callerName == "UNKNOWN") && (m_callerName != "UNKNOWN")) {
- caller_name = m_callerName;
- } else {
- IAlgorithm* alg(0);
- if ( m_algContextSvc ) {
- alg = m_algContextSvc->currentAlg();
- caller_name = (alg ? alg->name() : "<NONE>");
- }
- }
+/// --- Implementation of IROBDataProviderSvc interface ---
+/// --- Context aware interface for MT ---
- // initialize new ROBDataMonitorStruct
- p_robMonStruct = new robmonitor::ROBDataMonitorStruct(m_currentLvl1ID, robIdsUnique, caller_name);
+/// Signal ROB fragments which should be considered for prefetching in online running
+void HltROBDataProviderSvc::addROBData(const EventContext& context, const std::vector<uint32_t>& robIds,
+ const std::string_view callerName)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__ << ": Number of ROB Ids to add = " << robIds.size()
+ << " caller name = " << callerName);
+ EventCache* cache = m_eventsCache.get( context );
+
+ // allocate vector of missing ROB Ids
+ std::vector<uint32_t> robIds_missing ;
+ robIds_missing.reserve( robIds.size() ) ;
+
+ // allocate vector with existing ROB fragments in cache
+ std::vector<const ROBF*> robFragments_inCache ;
+ robFragments_inCache.reserve( robIds.size() ) ;
+
+ // check input ROB list against cache
+ eventCache_checkRobListToCache(cache,robIds, robFragments_inCache, robIds_missing ) ;
+
+ // call data collector
+ if (robIds_missing.size() > 0) {
+ ATH_MSG_DEBUG( __FUNCTION__ << ": Number of ROB Ids to reserve with DCM = " << robIds_missing.size());
+ // reserve the ROBs in the DCM
+ try {
+ auto mon_robres_t = Monitored::Timer("TIME_ROBReserveData");
+ hltinterface::DataCollector::instance()->reserveROBData(cache->globalEventNumber, robIds_missing);
+ mon_robres_t.stop();
+ // Fill monitoring histograms
+ auto mon_robres_nROBs = Monitored::Scalar("NUMBER_ROBReserveData",robIds_missing.size());
+ auto mon = Monitored::Group(m_monTool, mon_robres_t, mon_robres_nROBs);
+ } catch (const std::exception& ex) {
+ ATH_MSG_ERROR( __FUNCTION__ << ":" << __LINE__
+ << "Failed to reserve ROB data, caught an unexpected exception: " << ex.what());
+ } catch (...) {
+ ATH_MSG_ERROR( __FUNCTION__ << ":" << __LINE__
+ << "Failed to reserve ROB data, caught an unexpected exception.");
}
+ }
+}
- // for online running the requested ROBs should be not found in cache
- // ------------------------------------------------------------------
- // vector with missing ROB ids for DataCollector
- std::vector<uint32_t> vRobIds;
- vRobIds.reserve( robIdsUnique.size() ) ;
-
- // find missing ROB ids which should be retrieved
- ATH_MSG_DEBUG(" ---> addROBData: Number of ROB Ids requested : " << robIdsUnique.size());
-
- for (uint32_t id : robIdsUnique) {
-
- // check if ROB is already in cache
- ONLINE_ROBMAP::iterator map_it = m_online_robmap.find(id) ;
- if(map_it != m_online_robmap.end()) {
- ATH_MSG_DEBUG(" ---> addROBData: Found ROB Id : 0x" << MSG::hex << (*map_it).second.source_id());
- continue;
- }
-
- // check if ROB should be ignored
- if (m_ignoreROB.value().size() != 0) {
- std::vector<uint32_t>::const_iterator rob_ignore_it =
- std::find(m_ignoreROB.value().begin(), m_ignoreROB.value().end(),id);
- if(rob_ignore_it != m_ignoreROB.value().end()) {
- ATH_MSG_DEBUG(" ---> addROBData: ROB Id : 0x" << MSG::hex << id << MSG::dec << " will be not retrieved, since it is on the veto list.");
- continue;
- }
- }
+/// Start a new event with a set of ROB fragments, e.g. from LVL1 result, in online and add the fragments to the ROB cache
+void HltROBDataProviderSvc::setNextEvent(const EventContext& context, const std::vector<ROBF>& result)
+{
+ ATH_MSG_FATAL("Obsolete method HltROBDataProviderSvc::setNextEvent(const EventContext& context, const std::vector<ROBF>& result) called "
+ << "\n context = " << context << " number of ROB fragments = " << result.size() );
+}
- // check if ROB is actually enabled for readout
- // do not perform this check for MET ROBs
- if ( (m_enabledROBs.value().size() != 0) &&
- (eformat::helper::SourceIdentifier(id).subdetector_id() != eformat::TDAQ_LAR_MET) &&
- (eformat::helper::SourceIdentifier(id).subdetector_id() != eformat::TDAQ_TILE_MET) ){
- std::vector<uint32_t>::const_iterator rob_enabled_it =
- std::find(m_enabledROBs.value().begin(), m_enabledROBs.value().end(),id);
- if(rob_enabled_it == m_enabledROBs.value().end()) {
- ATH_MSG_DEBUG(" ---> addROBData: ROB Id : 0x" << MSG::hex << id << MSG::dec
- << " will be not retrieved, since it is not on the list of enabled ROBs.");
- continue;
- }
- }
- // Only Monitor SCHEDULED ROBs
- if ( p_robMonStruct ) {
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::SCHEDULED;
- }
+/// Start a new event with a full event fragment and add all ROB fragments in to the ROB cache
+void HltROBDataProviderSvc::setNextEvent(const EventContext& context, const RawEvent* re)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+ EventCache* cache = m_eventsCache.get( context );
+
+ // clear the event cache of the previous event
+ eventCache_clear( cache );
- // the ROB should be retrieved from the ROS
- ATH_MSG_DEBUG(" ---> addROBData: Request ROB Id : 0x" << MSG::hex << id <<" from ROS ");
- vRobIds.push_back( id ) ;
- } // end loop over requested input ROBs
-
- if (vRobIds.size() == 0) {
- ATH_MSG_DEBUG(" ---> addROBData: either all requested ROBs are found in cache for running mode ONLINE, \n"
- << " or input ROB Id list was empty, \n"
- << " or all requested ROBs were not retrieved due to the veto list.\n"
- << " Number of requested ROB Ids = " << robIdsUnique.size() << "\n"
- << " Lvl1 id = " << m_currentLvl1ID);
- // Set ROB request time also in the case when no DataCollector request is necessary
- // to allow correlation with RoI request times
- // start and stop times will be equal
- if ( p_robMonStruct ) {
- struct timeval time_start;
- struct timeval time_stop;
-
- gettimeofday(&time_start, 0);
- gettimeofday(&time_stop, 0);
-
- p_robMonStruct->start_time_of_ROB_request = time_start;
- p_robMonStruct->end_time_of_ROB_request = time_stop;
- }
- } else {
- //
- // Tell the DCM that these ROBs may be needed
- // ---------------------------------------------------------------
- //
- if (msgLvl(MSG::DEBUG)) {
- std::ostringstream ost;
- ost << " Number of scheduled ROB Ids = " << vRobIds.size() << "\n" ;
- unsigned int rob_counter = 1;
- for (uint32_t rob : vRobIds) {
- ost << " # = "<< std::setw(5) << rob_counter++ << " ROB id = 0x" << std::hex << rob << std::dec << "\n";
- }
- ATH_MSG_DEBUG(" ---> addROBData: The following ROB Ids are scheduled for retrieval and are reserved in the DCM: \n"
- << " Lvl1 id = " << m_currentLvl1ID << "\n"
- << ost.str());
- }
- // reserve the ROBs in the DCM
- hltinterface::DataCollector::instance()->reserveROBData(m_currentLvl1ID, vRobIds);
- }
+ //----------------------------------------------+
+ // Fill the event cache with the new event data |
+ //----------------------------------------------+
- // add the ROB monitoring structure to the collection
- if ( p_robMonCollection && p_robMonStruct ) p_robMonCollection->push_back( p_robMonStruct );
- } // end online running
+ // store the pointer to the event
+ cache->event = re;
+ // set the LVL1 id
+ cache->currentLvl1ID = re->lvl1_id();
+ // set the global event number
+ cache->globalEventNumber = re->global_id();
+ // set flag for masking L2/EF module ID, this is only necessary for the separate L2 and EF systems from Run 1
+ m_maskL2EFModuleID = (re->nlvl2_trigger_info() != 0);
+
+ //--------------------+
+ // Fill the ROB cache |
+ //--------------------+
+
+ // get all the ROBFragments
+ OFFLINE_FRAGMENTS_NAMESPACE::PointerType robF[eformat::write::MAX_UNCHECKED_FRAGMENTS];
+ size_t number_robs = re->children(robF,eformat::write::MAX_UNCHECKED_FRAGMENTS);
+ if (number_robs == eformat::write::MAX_UNCHECKED_FRAGMENTS) {
+ ATH_MSG_ERROR("ROB buffer overflow: ROBs found = " << number_robs
+ << " Max. number of ROBs allowed = " << eformat::write::MAX_UNCHECKED_FRAGMENTS);
+ }
+ std::vector<ROBF> rob_fragments;
+ rob_fragments.reserve(number_robs);
+ // loop over all ROBs
+ for (size_t irob = 0; irob < number_robs; irob++) {
+ rob_fragments.push_back(ROBF(robF[irob]));
+ }
+ // add the ROBs to the cache/rob map
+ eventCache_addRobData(cache, rob_fragments) ;
+
+ ATH_MSG_DEBUG(" ---> setNextEvent for " << name() );
+ 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() );
return;
}
-/** - in online add the LVL1/HLT result
- - rebuild the map
- - set flag for online running
- */
-void HltROBDataProviderSvc::setNextEvent(const std::vector<ROBF>& result)
-{
- // clear the ROB map
- m_online_robmap.clear();
- m_currentLvl1ID = 0;
-
- // set the online flag
- m_onlineRunning = true ;
+/// Retrieve ROB fragments for given ROB ids from the ROB cache
+void HltROBDataProviderSvc::getROBData(const EventContext& context,
+ const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments,
+ const std::string_view callerName)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__ << ": Number of ROB Ids to get = " << robIds.size()
+ << " caller name = " << callerName);
+ EventCache* cache = m_eventsCache.get( context );
- // set the complete event flag
- m_isEventComplete = false;
+ // allocate vector of missing ROB Ids
+ std::vector<uint32_t> robIds_missing ;
+ robIds_missing.reserve( robIds.size() ) ;
- // clear the ROB info object from steering
- if (m_RobRequestInfo) m_RobRequestInfo->clearRequestScheduledRobIDs();
+ // check input ROB list against cache
+ eventCache_checkRobListToCache(cache, robIds, robFragments, robIds_missing) ;
- if ( result.size() == 0 ) {
- ATH_MSG_ERROR(" ---> setNextEvent online for "<< name()
- <<" failed: Size of received vector of ROB fragments = " << result.size());
+ // missing ROB fragments from the DCM and add them to the cache
+ if (robIds_missing.size() == 0) {
+ ATH_MSG_DEBUG( __FUNCTION__ << ": All requested ROB Ids were found in the cache. ");
return;
}
- // set the LVL1 id
- m_currentLvl1ID = result[0].rod_lvl1_id();
-
- // add fragments to map
- std::vector<ROBF>::const_iterator it_robf = result.begin();
- std::vector<ROBF>::const_iterator it_robf_end = result.end();
- for(; it_robf!=it_robf_end; ++it_robf) {
- uint32_t id = it_robf->source_id() ;
- // check current L1 ID against CTP fragment when possible
- if ( (eformat::helper::SourceIdentifier(id).subdetector_id() == eformat::TDAQ_CTP) &&
- (it_robf->rod_lvl1_id() != m_currentLvl1ID) ) {
- ATH_MSG_ERROR(" ---> Lvl1 ID mismatch for CTP fragment with SourceId = 0x" << MSG::hex << id << MSG::dec
- << " and L1 Id = " << it_robf->rod_lvl1_id()
- << " to currently used L1 Id = " << m_currentLvl1ID
- << " -> Use CTP version from now on.");
- m_currentLvl1ID = it_robf->rod_lvl1_id() ;
- }
- // remove empty ROB fragments or ones with bad status, if requested
- if ((it_robf->rod_ndata() == 0) && (m_removeEmptyROB)) {
- ATH_MSG_DEBUG(" ---> Empty ROB Id = 0x" << MSG::hex << id << MSG::dec
- << " removed for L1 Id = " << m_currentLvl1ID);
- } else if ( ROBDataProviderSvc::filterRobWithStatus(&*it_robf) ) {
- if (msgLvl(MSG::DEBUG) && (it_robf->nstatus() > 0)) {
- const uint32_t* it_status;
- it_robf->status(it_status);
- eformat::helper::Status tmpstatus( (*it_status) ) ;
- ATH_MSG_DEBUG(" ---> ROB Id = 0x" << MSG::hex << id
- << std::setfill( '0' )
- << " with Generic Status Code = 0x" << std::setw(4) << tmpstatus.generic()
- << " and Specific Status Code = 0x" << std::setw(4) << tmpstatus.specific()
- << MSG::dec
- << " removed for L1 Id = " << m_currentLvl1ID);
- }
- } else {
- m_online_robmap[id]= (*it_robf) ;
- }
-
- //* fill monitoring histogram for ROB generic status
- if ( ( m_hist_genericStatusForROB ) && ( it_robf->nstatus() != 0 ) ) {
- const uint32_t* it_status;
- it_robf->status(it_status);
- if ((*it_status) != 0) {
- scoped_lock_histogram lock;
- m_hist_genericStatusForROB->Fill(eformat::helper::SourceIdentifier(it_robf->source_id()).human_detector().c_str(),
- m_map_GenericStatus[eformat::helper::Status(*it_status).generic()].c_str(),1.);
- }
- }
+ // There were missing ROB fragments retrieve them from the DCM and add them to the cache
+ ATH_MSG_DEBUG( __FUNCTION__ << ": Number of ROB Ids to retrieve with DCM = " << robIds_missing.size());
- //* fill monitoring histogram for ROB specific status
- if ( ( m_hist_specificStatusForROB ) && ( it_robf->nstatus() != 0 ) ) {
- const uint32_t* it_status;
- it_robf->status(it_status);
- if ((*it_status) != 0) {
- scoped_lock_histogram lock;
- std::bitset<16> specificBits(eformat::helper::Status(*it_status).specific());
- for (unsigned int index=0; index < 16; ++index) {
- if (specificBits[index]) m_hist_specificStatusForROB->Fill(eformat::helper::SourceIdentifier(it_robf->source_id()).human_detector().c_str(),
- m_vec_SpecificStatus[index].c_str(),1.);
- }
- }
- }
- }
+ typedef std::vector<hltinterface::DCM_ROBInfo> ROBInfoVec;
+ ROBInfoVec vRobInfos ;
- if(msgLvl(MSG::DEBUG)) {
- msg() << MSG::DEBUG << " ---> setNextEvent online for "<< name() << endmsg;
- msg() << MSG::DEBUG << " online running = " << m_onlineRunning << endmsg;
- msg() << MSG::DEBUG << " current LVL1 id = " << m_currentLvl1ID << endmsg;
- msg() << MSG::DEBUG << " # LVL1 ROBs = " << result.size() << endmsg;
- msg() << MSG::DEBUG << " size of ROB cache = " << m_online_robmap.size() << endmsg;
- msg() << MSG::DEBUG << dumpROBcache() << endmsg;
- }
- return;
+ // Get ROB Fragments with DataCollector
+ vRobInfos.reserve( robIds_missing.size() ) ;
+ try {
+ auto mon_rob_t = Monitored::Timer("TIME_ROBRequest");
+ hltinterface::DataCollector::instance()->collect(vRobInfos, cache->globalEventNumber, robIds_missing);
+ mon_rob_t.stop();
+ // Fill monitoring histograms
+ auto mon_rob_nROBs = Monitored::Scalar("NUMBER_ROBRequest",vRobInfos.size());
+ auto mon = Monitored::Group(m_monTool, mon_rob_t, mon_rob_nROBs);
+ } catch (const std::exception& ex) {
+ ATH_MSG_ERROR( __FUNCTION__ << ":" << __LINE__
+ << "Failed to collect ROBs, caught an unexpected exception: " << ex.what()
+ << ". Throwing hltonl::Exception::EventSourceCorrupted" );
+ throw hltonl::Exception::EventSourceCorrupted();
+ } catch (...) {
+ ATH_MSG_ERROR( __FUNCTION__ << ":" << __LINE__
+ << "Failed to collect ROBs, caught an unexpected exception. "
+ << "Throwing hltonl::Exception::EventSourceCorrupted" );
+ throw hltonl::Exception::EventSourceCorrupted();
+ }
+
+ // Store retrieved ROB data in the cache
+ std::vector<ROBF> robFragments_missing;
+ robFragments_missing.reserve( vRobInfos.size() );
+ for(ROBInfoVec::const_iterator it=vRobInfos.begin(); it!=vRobInfos.end(); ++it) {
+ ATH_MSG_DEBUG(__FUNCTION__ << " ROB Id = 0x" << MSG::hex << it->robFragment.source_id() << MSG::dec
+ << " retrieved from DCM for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
+ robFragments_missing.push_back( it->robFragment );
+ }
+ // add the ROBs to the cache/rob map
+ eventCache_addRobData(cache, robFragments_missing) ;
+
+ // return all the requested ROB fragments from the cache
+ robFragments.clear() ;
+ eventCache_checkRobListToCache(cache, robIds, robFragments, robIds_missing) ;
}
-/** - add a new Raw event
- - rebuild the map
- - set flag for offline running
- */
-void HltROBDataProviderSvc::setNextEvent(const RawEvent* re)
-{
- // set the offline flag
- m_onlineRunning = false ;
-
- // set the event complete flag
- m_isEventComplete = true ;
-
- ROBDataProviderSvc::setNextEvent(re);
- return ;
+/// Retrieve the full event fragment
+const RawEvent* HltROBDataProviderSvc::getEvent(const EventContext& context)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+ return m_eventsCache.get( context )->event;
}
-/** return ROBData for ROBID
- */
-void HltROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments, std::string callerName)
+/// Store the status for the event.
+void HltROBDataProviderSvc::setEventStatus(const EventContext& context, uint32_t status)
{
- //--------------------
- // set the caller name
- //--------------------
- if (callerName != "UNKNOWN") m_callerName = callerName;
-
- //-------------------
- //--- offline running
- //-------------------
- if (!m_onlineRunning) {
- ROBDataProviderSvc::getROBData(robIds,robFragments);
- //------------------
- //--- online running
- //------------------
- } else {
- // ---------------------------------------------------------------------------------------------
- // make sure that all ROB prefetching information is taken into account before the ROB retrieval
- // ---------------------------------------------------------------------------------------------
- if (m_RobRequestInfo) {
- // add ROBs in the info object to the prefetching list
- addROBData(m_RobRequestInfo->requestScheduledRobIDs());
- m_RobRequestInfo->clearRequestScheduledRobIDs();
- }
-
- //--------------------
- // make unique ROB IDs
- //--------------------
- std::vector<uint32_t>::iterator remove_duplicate;
- std::vector<uint32_t> robIdsUnique(robIds);
-
- sort(robIdsUnique.begin(), robIdsUnique.end());
- remove_duplicate = unique(robIdsUnique.begin(), robIdsUnique.end());
- robIdsUnique.erase(remove_duplicate, robIdsUnique.end());
-
- //------------------------------------------------------------------
- // Replace the generic MET ROB ID with the full list of all MET ROBs
- //------------------------------------------------------------------
- // LAr MET ROBs
- uint32_t generic_LAr_MET_id = eformat::helper::SourceIdentifier(eformat::TDAQ_LAR_MET,m_genericLArMetModuleID.value()).code();
- std::vector<uint32_t>::iterator rob_LAr_Met_it = std::find(robIdsUnique.begin(), robIdsUnique.end(), generic_LAr_MET_id);
- if (rob_LAr_Met_it != robIdsUnique.end()) {
- robIdsUnique.erase(rob_LAr_Met_it);
- if (m_enabledLArMetROBs.value().size() != 0) robIdsUnique.insert(robIdsUnique.end(),m_enabledLArMetROBs.value().begin(),m_enabledLArMetROBs.value().end());
- }
-
- // Tile MET ROBs
- uint32_t generic_Tile_MET_id = eformat::helper::SourceIdentifier(eformat::TDAQ_TILE_MET,m_genericTileMetModuleID.value()).code();
- std::vector<uint32_t>::iterator rob_Tile_Met_it = std::find(robIdsUnique.begin(), robIdsUnique.end(), generic_Tile_MET_id);
- if (rob_Tile_Met_it != robIdsUnique.end()) {
- robIdsUnique.erase(rob_Tile_Met_it);
- if (m_enabledTileMetROBs.value().size() != 0) robIdsUnique.insert(robIdsUnique.end(),m_enabledTileMetROBs.value().begin(),m_enabledTileMetROBs.value().end());
- }
-
- // detailed ROB monitoring
- //------------------------
- // Create a ROB monitoring collection and register it to StoreGate
- ROBDataMonitorCollection* p_robMonCollection(0);
- if ((m_doDetailedROBMonitoring.value()) && (robIdsUnique.size() != 0)) {
- if ( !(m_storeGateSvc->transientContains<ROBDataMonitorCollection>(m_ROBDataMonitorCollection_SG_Name.value())) ) {
- p_robMonCollection = new ROBDataMonitorCollection;
- if ( p_robMonCollection ) {
- p_robMonCollection->reserve( HltROBDataProviderConstants::Number_of_Rob_Monitor_Structs ) ;
- if ( (m_storeGateSvc->record(p_robMonCollection, m_ROBDataMonitorCollection_SG_Name.value(), true)).isFailure() ) {
- ATH_MSG_WARNING(" getROBData: Registering ROB Monitoring collection in StoreGate failed.");
- delete p_robMonCollection;
- p_robMonCollection = 0;
- }
- }
- } else {
- if ( m_storeGateSvc->retrieve(p_robMonCollection).isFailure() ) {
- ATH_MSG_WARNING(" getROBData: Retrieval of ROB Monitoring collection from StoreGate failed.");
- p_robMonCollection = 0;
- }
- }
- }
-
- // create a new ROBDataMonitorStruct and fill it
- robmonitor::ROBDataMonitorStruct* p_robMonStruct(0);
- if ( p_robMonCollection ) {
- // caller name
- std::string caller_name("UNKNOWN");
- if (callerName != "UNKNOWN") {
- caller_name = callerName;
- } else if ((callerName == "UNKNOWN") && (m_callerName != "UNKNOWN")) {
- caller_name = m_callerName;
- } else {
- IAlgorithm* alg(0);
- if ( m_algContextSvc ) {
- alg = m_algContextSvc->currentAlg();
- caller_name = (alg ? alg->name() : "<NONE>");
- }
- }
-
- // initialize new ROBDataMonitorStruct
-
- p_robMonStruct = new robmonitor::ROBDataMonitorStruct(m_currentLvl1ID, robIdsUnique, caller_name);
- }
-
- //--------------------------
- // update internal ROB cache
- //--------------------------
- addROBDataToCache(robIdsUnique, p_robMonStruct);
-
- // add the ROB monitoring structure to the collection
- if ( p_robMonCollection && p_robMonStruct ) p_robMonCollection->push_back( p_robMonStruct );
-
-
- //------------------------------------------------------------------
- // Return requested ROBs from internal cache
- //------------------------------------------------------------------
- for(std::vector<uint32_t>::const_iterator it = robIdsUnique.begin(); it != robIdsUnique.end(); ++it){
- uint32_t id = (*it);
- ONLINE_ROBMAP::iterator map_it = m_online_robmap.find(id) ;
- if(map_it != m_online_robmap.end()) {
- robFragments.push_back( &((*map_it).second) );
- } else {
- ATH_MSG_DEBUG(" ---> getROBData: Failed to find ROB for id 0x"
- << MSG::hex << id << MSG::dec);
- ATH_MSG_VERBOSE(dumpROBcache());
- }
- }
- }
-
- return ;
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+ m_eventsCache.get(context)->eventStatus = status;
}
-/// Retrieve the whole event.
-const RawEvent* HltROBDataProviderSvc::getEvent(){
- if (m_onlineRunning) return 0;
- return ROBDataProviderSvc::getEvent();
+/// Retrieve the status for the event.
+uint32_t HltROBDataProviderSvc::getEventStatus(const EventContext& context)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+ return m_eventsCache.get( context )->eventStatus;
}
-/// Return vector with all ROBFragments stored in the cache
-void HltROBDataProviderSvc::getAllROBData(std::vector<const ROBF*>& robFragments)
+/// Apply a function to all ROBs in the cache
+void HltROBDataProviderSvc::processCachedROBs(const EventContext& context, const std::function< void(const ROBF* )>& fn) const
{
- //------------------
- //--- online running
- //------------------
- if (m_onlineRunning) {
- for(ONLINE_ROBMAP::iterator it=m_online_robmap.begin(); it!=m_online_robmap.end(); ++it) {
- robFragments.push_back( &((*it).second) );
- }
- }
- return ;
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+ for ( const auto& el : m_eventsCache.get( context )->robmap )
+ {
+ fn( &el.second );
+ }
}
-// Dump ROB cache
-std::string HltROBDataProviderSvc::dumpROBcache() const {
-
- ONLINE_ROBMAP::const_iterator cache_it = m_online_robmap.begin() ;
- ONLINE_ROBMAP::const_iterator cache_end = m_online_robmap.end() ;
- int nrob = 0;
-
- std::ostringstream ost;
- ost << " --- Dump of ROB cache ids --- total size = "
- << m_online_robmap.size() <<"\n";
- for(; cache_it!=cache_end; ++cache_it){
- ++nrob;
- ost <<" # = "<< std::setw(5) << nrob << " cache id = 0x" << std::hex << (*cache_it).first
- << " hex: source id = 0x" << std::hex << (*cache_it).second.source_id()
- << std::dec << " decimal: source id = " << (*cache_it).second.source_id() << "\n";
- }
- std::string ret(ost.str());
- return ret;
+/// Flag to check if all event data have been retrieved
+bool HltROBDataProviderSvc::isEventComplete(const EventContext& context) const
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+ return m_eventsCache.get( context )->isEventComplete;
}
-/// Collect all data for an event from the ROS and put them into the cache
-/// Return value: number of ROBs which were retrieved to complete event
-int HltROBDataProviderSvc::collectCompleteEventData(const std::string callerName) {
+/// retrieve in online running all ROBs for the event from the readout system. Only those ROBs are retrieved which are not already in the cache
+int HltROBDataProviderSvc::collectCompleteEventData(const EventContext& context, const std::string_view callerName)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__ << " caller name = " << callerName);
- // return if call was already issued
- if (m_isEventComplete) return 0;
+ EventCache* cache = m_eventsCache.get( context );
- //--------------------
- // set the caller name
- //--------------------
- if (callerName != "UNKNOWN") m_callerName = callerName;
+ // return if event is already complete
+ if (cache->isEventComplete) return 0;
typedef std::vector<hltinterface::DCM_ROBInfo> ROBInfoVec;
ROBInfoVec vRobInfos ;
if (m_enabledROBs.value().size() != 0) {
vRobInfos.reserve( m_enabledROBs.value().size() ) ;
} else {
- vRobInfos.reserve( HltROBDataProviderConstants::Max_Number_Of_ROBs ) ;
+ vRobInfos.reserve( eformat::write::MAX_UNCHECKED_FRAGMENTS ) ;
}
- struct timeval time_start;
- struct timeval time_stop;
- if ( m_doMonitoring || m_doDetailedROBMonitoring.value() ) gettimeofday(&time_start, 0);
-
// Get ROB Fragments for complete event with DataCollector
- hltinterface::DataCollector::instance()->collect(vRobInfos, m_currentLvl1ID);
-
- if ( m_doMonitoring || m_doDetailedROBMonitoring.value() ) gettimeofday(&time_stop, 0);
-
- if (msgLvl(MSG::DEBUG)) {
- std::ostringstream ost;
- unsigned int rob_counter = 1;
- for (const auto& rob : vRobInfos) {
- ost << " # = "<< std::setw(5) << rob_counter++ << " ROB id = 0x"
- << std::hex << rob.robFragment.source_id() << std::dec << "\n" ;
- }
- ATH_MSG_DEBUG(" ---> collectCompleteEventData: The following ROB Ids were received from DataCollector : \n"
- << " Lvl1 id = " << m_currentLvl1ID << "\n"
- << " Number of actually received ROB Ids = " << vRobInfos.size() << "\n"
- << ost.str());
- }
-
-
- // detailed ROB monitoring
- //------------------------
- // Create a ROB monitoring collection and register it to StoreGate
- ROBDataMonitorCollection* p_robMonCollection(0);
- if ( m_doDetailedROBMonitoring.value() ) {
- if ( !(m_storeGateSvc->transientContains<ROBDataMonitorCollection>(m_ROBDataMonitorCollection_SG_Name.value())) ) {
- p_robMonCollection = new ROBDataMonitorCollection;
- if ( p_robMonCollection ) {
- p_robMonCollection->reserve( HltROBDataProviderConstants::Number_of_Rob_Monitor_Structs ) ;
- if ( (m_storeGateSvc->record(p_robMonCollection, m_ROBDataMonitorCollection_SG_Name.value(), true)).isFailure() ) {
- ATH_MSG_WARNING(" Registering ROB Monitoring collection in StoreGate failed.");
- delete p_robMonCollection;
- p_robMonCollection = 0;
- }
- }
- } else {
- if ( m_storeGateSvc->retrieve(p_robMonCollection).isFailure() ) {
- ATH_MSG_WARNING(" Retrieval of ROB Monitoring collection from StoreGate failed.");
- p_robMonCollection = 0;
- }
- }
- }
-
- // create a new ROBDataMonitorStruct and fill it
- robmonitor::ROBDataMonitorStruct* p_robMonStruct(0);
- if ( p_robMonCollection ) {
- // caller name
- std::string caller_name("UNKNOWN");
- if (callerName != "UNKNOWN") {
- caller_name = callerName;
- } else if ((callerName == "UNKNOWN") && (m_callerName != "UNKNOWN")) {
- caller_name = m_callerName;
- } else {
- IAlgorithm* alg(0);
- if ( m_algContextSvc ) {
- alg = m_algContextSvc->currentAlg();
- caller_name = (alg ? alg->name() : "<NONE>");
- }
- }
-
- // get ROB Ids
- std::vector<uint32_t> robIds;
- robIds.reserve(vRobInfos.size());
- for(ROBInfoVec::const_iterator it=vRobInfos.begin(); it!=vRobInfos.end(); ++it) {
- robIds.push_back( it->robFragment.source_id() ) ;
- }
-
- // initialize new ROBDataMonitorStruct
- p_robMonStruct = new robmonitor::ROBDataMonitorStruct(m_currentLvl1ID, robIds, caller_name);
- }
-
- if ( m_doMonitoring || p_robMonStruct ) {
- int secs = 0 ;
- if (time_stop.tv_sec >= time_start.tv_sec)
- secs = time_stop.tv_sec - time_start.tv_sec;
-
- int usecs = time_stop.tv_usec - time_start.tv_usec;
- float mtime = static_cast<float>(secs)*1000 + static_cast<float>(usecs)/1000;
-
- //* timing histogram
- if (m_hist_timeROBretrieval) {
- scoped_lock_histogram lock;
- m_hist_timeROBretrieval->Fill(mtime);
- m_hist_timeROBretrieval->LabelsDeflate("X");
- }
- //* number of received ROBs
- if ( m_hist_receivedROBsPerCall ) {
- scoped_lock_histogram lock;
- m_hist_receivedROBsPerCall->Fill(vRobInfos.size());
- m_hist_receivedROBsPerCall->LabelsDeflate("X");
- }
-
- //* detailed monitoring
- if ( p_robMonStruct ) {
- p_robMonStruct->start_time_of_ROB_request = time_start;
- p_robMonStruct->end_time_of_ROB_request = time_stop;
- }
- }
-
- // add ROBs to cache
- updateROBDataCache(vRobInfos,p_robMonStruct);
-
- // add the ROB monitoring structure to the collection
- if ( p_robMonCollection && p_robMonStruct ) p_robMonCollection->push_back( p_robMonStruct );
+ try {
+ auto mon_col_t = Monitored::Timer("TIME_CollectAllROBs");
+ hltinterface::DataCollector::instance()->collect(vRobInfos, cache->globalEventNumber);
+ mon_col_t.stop();
+ ATH_MSG_DEBUG( __FUNCTION__ << ": Number of received ROB Ids = " << vRobInfos.size() );
+ // Fill monitoring histograms
+ auto mon_col_nROBs = Monitored::Scalar("NUMBER_CollectAllROBs",vRobInfos.size());
+ auto mon = Monitored::Group(m_monTool, mon_col_t, mon_col_nROBs);
+ } catch (const std::exception& ex) {
+ ATH_MSG_ERROR( __FUNCTION__ << ":" << __LINE__
+ << "Failed to collect complete event, caught an unexpected exception: " << ex.what()
+ << ". Throwing hltonl::Exception::EventSourceCorrupted" );
+ throw hltonl::Exception::EventSourceCorrupted();
+ } catch (...) {
+ ATH_MSG_ERROR( __FUNCTION__ << ":" << __LINE__
+ << "Failed to collect complete event, caught an unexpected exception. "
+ << "Throwing hltonl::Exception::EventSourceCorrupted" );
+ throw hltonl::Exception::EventSourceCorrupted();
+ }
+
+ // Store retrieved ROB data in the cache
+ std::vector<ROBF> robFragments_missing;
+ robFragments_missing.reserve( vRobInfos.size() );
+ for(ROBInfoVec::const_iterator it=vRobInfos.begin(); it!=vRobInfos.end(); ++it) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id = 0x" << MSG::hex << it->robFragment.source_id() << MSG::dec
+ << " retrieved from DCM for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
+ robFragments_missing.push_back( it->robFragment );
+ }
+ // add the ROBs to the cache/rob map
+ eventCache_addRobData(cache, robFragments_missing) ;
// update event complete flag
- m_isEventComplete = true;
+ cache->isEventComplete = true;
return vRobInfos.size();
-} // end int collectCompleteEventData(...)
-
-/// set the name of the program which uses the ROBDataProviderSvc
-void HltROBDataProviderSvc::setCallerName(const std::string callerName) {
- m_callerName = callerName;
}
-// handler for BeginRun
-void HltROBDataProviderSvc::handle(const Incident& incident) {
- if (incident.type()!="BeginRun") return;
- ATH_MSG_DEBUG("In BeginRun incident.");
-
- // if detailed ROB monitoring is requested, check if the AlgContextSvc is running,
- // if yes use it to obtain the calling algorithm name
- if ( m_doDetailedROBMonitoring.value() ) {
- if ( service("AlgContextSvc", m_algContextSvc, /*createIf=*/ false).isFailure() ) {
- ATH_MSG_ERROR("Error retrieving AlgContextSvc."
- << "Calling algorithm name not available in detailed ROB monitoring");
- m_algContextSvc=0;
- }
- }
-
- // define histograms if monitoring is requested
- if ( !m_doMonitoring.value() ) return;
-
- // find histogramming service
- ServiceHandle<ITHistSvc> rootHistSvc("THistSvc", name());
- if ((rootHistSvc.retrieve()).isFailure()) {
- ATH_MSG_ERROR("Unable to locate THistSvc");
- rootHistSvc.release().ignore();
- return;
- }
-
- // *-- booking path
- std::string path = std::string("/EXPERT/") + name() + "/";
-
- // *-- number of bins for sub detector plots (55 SubDet max.)
- uint32_t n_bins_partEBSubDet = eformat::helper::SubDetectorDictionary.size();
-
- // *-- number of requested ROBs per call
- m_hist_requestedROBsPerCall = new TH1F (m_histProp_requestedROBsPerCall.value().title().c_str(),
- (m_histProp_requestedROBsPerCall.value().title()+";number of ROBs").c_str(),
- m_histProp_requestedROBsPerCall.value().bins(),
- m_histProp_requestedROBsPerCall.value().lowEdge(),
- m_histProp_requestedROBsPerCall.value().highEdge());
- if (m_hist_requestedROBsPerCall) {
- CAN_REBIN(m_hist_requestedROBsPerCall);
- if( rootHistSvc->regHist(path + m_hist_requestedROBsPerCall->GetName(), m_hist_requestedROBsPerCall).isFailure() ) {
- ATH_MSG_WARNING("Can not register monitoring histogram: " << m_hist_requestedROBsPerCall->GetName());
- }
- }
-
- // *-- number of received ROBs per call
- m_hist_receivedROBsPerCall = new TH1F (m_histProp_receivedROBsPerCall.value().title().c_str(),
- (m_histProp_receivedROBsPerCall.value().title()+";number of ROBs").c_str(),
- m_histProp_receivedROBsPerCall.value().bins(),
- m_histProp_receivedROBsPerCall.value().lowEdge(),
- m_histProp_receivedROBsPerCall.value().highEdge());
- if (m_hist_receivedROBsPerCall) {
- CAN_REBIN(m_hist_receivedROBsPerCall);
- if( rootHistSvc->regHist(path + m_hist_receivedROBsPerCall->GetName(), m_hist_receivedROBsPerCall).isFailure() ) {
- ATH_MSG_WARNING("Can not register monitoring histogram: " << m_hist_receivedROBsPerCall->GetName());
- }
- }
-
- // *-- timing of ROB retrieval
- m_hist_timeROBretrieval = new TH1F (m_histProp_timeROBretrieval.value().title().c_str(),
- (m_histProp_timeROBretrieval.value().title()+";time [ms]").c_str(),
- m_histProp_timeROBretrieval.value().bins(),
- m_histProp_timeROBretrieval.value().lowEdge(),
- m_histProp_timeROBretrieval.value().highEdge());
- if (m_hist_timeROBretrieval) {
- CAN_REBIN(m_hist_timeROBretrieval);
- if( rootHistSvc->regHist(path + m_hist_timeROBretrieval->GetName(), m_hist_timeROBretrieval).isFailure() ) {
- ATH_MSG_WARNING("Can not register monitoring histogram: " << m_hist_timeROBretrieval->GetName());
- }
- }
-
- // *-- Generic Status for ROBs per sub detector
- m_hist_genericStatusForROB = new TH2F ("GenericStatusForROBsFromSubDetectors",
- "GenericStatusForROBsFromSubDetectors;;",
- n_bins_partEBSubDet,0.,(float) n_bins_partEBSubDet,
- m_map_GenericStatus.size(),0., (float) m_map_GenericStatus.size());
- if (m_hist_genericStatusForROB) {
- uint32_t n_tmp_bin = 1;
- for (eformat::helper::EnumClass<eformat::SubDetector>::const_iterator it_sub=eformat::helper::SubDetectorDictionary.begin();
- it_sub != eformat::helper::SubDetectorDictionary.end(); ++it_sub ) {
- m_hist_genericStatusForROB->GetXaxis()->SetBinLabel( n_tmp_bin, (it_sub->second).c_str() );
- n_tmp_bin++;
- }
+/// method to filter ROBs with given Status code
+bool HltROBDataProviderSvc::robmap_filterRobWithStatus(const ROBF* rob)
+{
+ // No filter criteria defined
+ if ((m_filterRobMap.size() == 0) && (m_filterSubDetMap.size() == 0)) {
+ return(false);
+ }
+
+ // There should be at least one status element if there was an error
+ // in case there are 0 status elements then there was no known error
+ // (see event format document ATL-D-ES-0019 (EDMS))
+ const uint32_t* rob_it_status;
+ const uint32_t null_status(0);
+ // The ROB has no status elements
+ if (rob->nstatus() == 0) {
+ rob_it_status = &null_status;
+ } else {
+ // The ROB has at least one status element, access it via an iterator
+ rob->status(rob_it_status);
+ }
- n_tmp_bin = 1;
- for (std::map<eformat::GenericStatus, std::string>::const_iterator it = m_map_GenericStatus.begin();it != m_map_GenericStatus.end();++it) {
- m_hist_genericStatusForROB->GetYaxis()->SetBinLabel( n_tmp_bin, (*it).second.c_str() );
- n_tmp_bin++;
- }
- if( rootHistSvc->regHist(path + m_hist_genericStatusForROB->GetName(), m_hist_genericStatusForROB).isFailure() ) {
- ATH_MSG_WARNING("Can not register monitoring histogram: " << m_hist_genericStatusForROB->GetName());
+ // Build the full ROB Sourceidentifier
+ eformat::helper::SourceIdentifier tmpsrc(rob->rob_source_id());
+
+ // Check if there is a ROB specific filter rule defined for this ROB Id and match the status code
+ FilterRobMap::iterator map_it_rob = m_filterRobMap.find(tmpsrc.code());
+ if (map_it_rob != m_filterRobMap.end()) {
+ for (auto it_status: (*map_it_rob).second) {
+ if (*rob_it_status == it_status) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id = 0x" << MSG::hex << tmpsrc.code()
+ << " with status = 0x" << *rob_it_status << MSG::dec
+ << " removed due to ROB filter rule.");
+ return(true);
+ }
}
}
- // *-- Specific Status Bits for ROBs per sub detector
- m_hist_specificStatusForROB = new TH2F ("SpecificStatusBitsForROBsFromSubDetectors",
- "SpecificStatusBitsForROBsFromSubDetectors;;",
- n_bins_partEBSubDet,0.,(float) n_bins_partEBSubDet,
- m_vec_SpecificStatus.size(),0., (float) m_vec_SpecificStatus.size());
- if (m_hist_specificStatusForROB) {
- uint32_t n_tmp_bin = 1;
- for (eformat::helper::EnumClass<eformat::SubDetector>::const_iterator it_sub=eformat::helper::SubDetectorDictionary.begin();
- it_sub != eformat::helper::SubDetectorDictionary.end(); ++it_sub ) {
- m_hist_specificStatusForROB->GetXaxis()->SetBinLabel( n_tmp_bin, (it_sub->second).c_str() );
- n_tmp_bin++;
- }
-
- n_tmp_bin = 1;
- for (std::vector<std::string>::const_iterator it = m_vec_SpecificStatus.begin();it != m_vec_SpecificStatus.end();++it) {
- m_hist_specificStatusForROB->GetYaxis()->SetBinLabel( n_tmp_bin, (*it).c_str() );
- n_tmp_bin++;
- }
- if( rootHistSvc->regHist(path + m_hist_specificStatusForROB->GetName(), m_hist_specificStatusForROB).isFailure() ) {
- ATH_MSG_WARNING("Can not register monitoring histogram: " << m_hist_specificStatusForROB->GetName());
+ // Check if there is a sub detector specific filter rule defined for this ROB Id and match the status code
+ FilterSubDetMap::iterator map_it_subdet = m_filterSubDetMap.find(tmpsrc.subdetector_id());
+ if (map_it_subdet != m_filterSubDetMap.end()) {
+ for (auto it_status: (*map_it_subdet).second) {
+ if (*rob_it_status == it_status) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id = 0x" << MSG::hex << tmpsrc.code()
+ << " with status = 0x" << *rob_it_status << MSG::dec
+ << " removed due to SubDet filter rule.");
+ return(true);
+ }
}
}
+ return(false);
+}
- // release histogramming service
- rootHistSvc.release().ignore();
-} // end handler for BeginRun
-
-// helper function to retrieve ROB fragments over the network and to add them to the cache
-void HltROBDataProviderSvc::addROBDataToCache(std::vector<uint32_t>& robIdsForRetrieval,
- robmonitor::ROBDataMonitorStruct* p_robMonStruct) {
-
- struct timeval time_start;
- struct timeval time_stop;
+void HltROBDataProviderSvc::eventCache_clear(EventCache* cache)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+ cache->event = nullptr;
+ cache->currentLvl1ID = 0;
+ cache->globalEventNumber = 0;
+ cache->eventStatus = 0;
+ cache->isEventComplete = false;
+ cache->robmap.clear();
+}
- ATH_MSG_DEBUG(" ---> addROBDataToCache: Number of ROB Ids requested for retrieval : "
- << robIdsForRetrieval.size() << ", Lvl1 id = " << m_currentLvl1ID);
+void HltROBDataProviderSvc::eventCache_checkRobListToCache(EventCache* cache, const std::vector<uint32_t>& robIds_toCheck,
+ std::vector<const ROBF*>& robFragments_inCache,
+ std::vector<uint32_t>& robIds_missing )
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__ << " number of ROB Ids to check = " << robIds_toCheck.size());
- // return if no ROBs are requested
- if (robIdsForRetrieval.size() == 0) return;
+ for (uint32_t id : robIds_toCheck) {
-
- std::vector<uint32_t> vRobIds, vMETRobIds;
- vRobIds.reserve( robIdsForRetrieval.size() );
- vMETRobIds.reserve( robIdsForRetrieval.size() );
-
- // Check requested ROBs
- for (std::vector<uint32_t>::const_iterator rob_it=robIdsForRetrieval.begin(); rob_it!=robIdsForRetrieval.end(); ++rob_it) {
- uint32_t id = (*rob_it);
-
- // check first if ROB is already in cache
- ONLINE_ROBMAP::iterator map_it = m_online_robmap.find(*rob_it) ;
- if(map_it != m_online_robmap.end()) {
- ATH_MSG_DEBUG(" ---> addROBDataToCache: Found ROB Id : 0x" << MSG::hex << (*map_it).second.source_id()
- << MSG::dec <<" in cache ");
- if ( p_robMonStruct ) {
-
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::CACHED;
- (p_robMonStruct->requested_ROBs)[id].rob_size = ((*map_it).second).fragment_size_word();
- if ( (*map_it).second.nstatus() != 0 ) {
- const uint32_t* it_status;
- (*map_it).second.status(it_status);
- for (uint32_t k=0; k < (*map_it).second.nstatus(); k++) {
- (p_robMonStruct->requested_ROBs)[id].rob_status_words.push_back( *(it_status+k) );
- }
- }
- }
+ // check if ROB is already in cache
+ ROBMAP::const_iterator map_it = cache->robmap.find(id);
+ if (map_it != cache->robmap.end()) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id 0x" << MSG::hex << id << MSG::dec
+ << " found for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
+ robFragments_inCache.push_back( &(map_it->second) );
continue;
- }
+ }
// check if ROB is actually enabled for readout
- // do not perform this check for MET ROBs
- if (m_enabledROBs.value().size() != 0) {
- if ( (eformat::helper::SourceIdentifier(*rob_it).subdetector_id() != eformat::TDAQ_LAR_MET) &&
- (eformat::helper::SourceIdentifier(*rob_it).subdetector_id() != eformat::TDAQ_TILE_MET) ){
- std::vector<uint32_t>::const_iterator rob_enabled_it =
- std::find(m_enabledROBs.value().begin(), m_enabledROBs.value().end(),(*rob_it));
- if(rob_enabled_it == m_enabledROBs.value().end()) {
- ATH_MSG_DEBUG(" ---> addROBDataToCache: ROB Id : 0x" << MSG::hex << (*rob_it) << MSG::dec
- << " will be not retrieved, since it is not on the list of enabled ROBs.");
- if ( p_robMonStruct ) {
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::DISABLED;
- }
- continue;
- }
+ if (m_enabledROBs.value().size() != 0) {
+ std::vector<uint32_t>::const_iterator rob_enabled_it =
+ std::find(m_enabledROBs.value().begin(), m_enabledROBs.value().end(),id);
+ if(rob_enabled_it == m_enabledROBs.value().end()) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id : 0x" << MSG::hex << id << MSG::dec
+ << " will be not added, since it is not on the list of enabled ROBs.");
+ continue;
}
}
-
- if (m_ignoreROB.value().size() != 0) {
- std::vector<uint32_t>::const_iterator rob_ignore_it =
- std::find(m_ignoreROB.value().begin(), m_ignoreROB.value().end(),id);
- if(rob_ignore_it != m_ignoreROB.value().end()) {
- ATH_MSG_DEBUG(" ---> addROBDataToCache: ROB Id : 0x" << MSG::hex << id << MSG::dec
- << " will be not retrieved, since it is on the veto list.");
- if ( p_robMonStruct ) {
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::IGNORED;
- }
- continue;
- }
- }
-
- // separate MET and detector ROBs if requested
- if ( (m_separateMETandDetROBRetrieval.value()) &&
- ( (eformat::helper::SourceIdentifier(*rob_it).subdetector_id() == eformat::TDAQ_LAR_MET) ||
- (eformat::helper::SourceIdentifier(*rob_it).subdetector_id() == eformat::TDAQ_TILE_MET) ) ) {
- vMETRobIds.push_back( *rob_it ) ;
- } else {
- vRobIds.push_back( *rob_it );
- }
- }
- typedef std::vector<hltinterface::DCM_ROBInfo> ROBInfoVec;
- ROBInfoVec vRobInfos ;
+ // the ROB is not in the cache and should be eventually added
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id : 0x" << MSG::hex << id << MSG::dec <<" is missing ");
+ robIds_missing.push_back( id ) ;
+ } // end loop over input ROB Ids to check
+}
- // Get ROB Fragments with DataCollector
- if ( m_doMonitoring || p_robMonStruct ) gettimeofday(&time_start, 0);
- if ( vRobIds.size() != 0 ) {
- vRobInfos.reserve( vRobIds.size() ) ;
- hltinterface::DataCollector::instance()->collect(vRobInfos, m_currentLvl1ID, vRobIds);
- }
+void HltROBDataProviderSvc::eventCache_addRobData(EventCache* cache, const std::vector<ROBF>& robFragments)
+{
+ ATH_MSG_VERBOSE("start of " << __FUNCTION__ << " number of ROB fragments to add = " << robFragments.size());
- // Do a separate data collect call for MET ROBs if required
- if ( (m_separateMETandDetROBRetrieval.value()) && (vMETRobIds.size() != 0) ) {
- ROBInfoVec vMETRobInfos;
- vMETRobInfos.reserve( vMETRobIds.size() ) ;
- // retrieve MET ROBs
- hltinterface::DataCollector::instance()->collect(vMETRobInfos, m_currentLvl1ID, vMETRobIds);
- // add MET ROBs to Det ROBs
- vRobInfos.insert( vRobInfos.end(), vMETRobInfos.begin(), vMETRobInfos.end() );
+ for (auto rob : robFragments) {
-
- }
+ // Source ID
+ uint32_t id = rob.source_id();
+ ATH_MSG_VERBOSE(__FUNCTION__ << " Id = 0x" << std::hex << id << std::dec );
- if(msgLvl(MSG::DEBUG) && ((vRobIds.size()!=0) || (vMETRobIds.size()!=0))) {
- std::ostringstream ost;
- unsigned int rob_counter = 1;
- for (const auto& rob : vRobInfos) {
- ost << " # = "<< std::setw(5) << rob_counter++ << " ROB id = 0x" << std::hex
- << rob.robFragment.source_id() << std::dec << "\n" ;
+ // mask off the module ID for L2 and EF result for Run 1 data
+ if ( (eformat::helper::SourceIdentifier(id).module_id() != 0) &&
+ (eformat::helper::SourceIdentifier(id).subdetector_id() == eformat::TDAQ_LVL2) ) {
+ id = eformat::helper::SourceIdentifier(eformat::helper::SourceIdentifier(id).subdetector_id(),0).code();
+ if (!m_maskL2EFModuleID) {
+ ATH_MSG_ERROR(__FUNCTION__ << " Inconsistent flag for masking L2/EF module IDs");
+ m_maskL2EFModuleID=true;
+ }
+ } else if ( (eformat::helper::SourceIdentifier(id).module_id() != 0) &&
+ (eformat::helper::SourceIdentifier(id).subdetector_id() == eformat::TDAQ_EVENT_FILTER) &&
+ (m_maskL2EFModuleID) ) {
+ id = eformat::helper::SourceIdentifier(eformat::helper::SourceIdentifier(id).subdetector_id(),0).code();
}
- ATH_MSG_DEBUG(" ---> addROBDataToCache: The following ROB Ids were received from DataCollector : \n"
- << " Lvl1 id = " << m_currentLvl1ID << "\n"
- << " Number of detector ROB Ids requested for retrieval = " << vRobIds.size() << "\n"
- << " Number of MET ROB Ids requested for retrieval = " << vMETRobIds.size() << "\n"
- << " Number of actually received ROB Ids = " << vRobInfos.size() << "\n"
- << ost.str());
- }
-
- if ( m_doMonitoring || p_robMonStruct ) {
- gettimeofday(&time_stop, 0);
- int secs = 0 ;
- if (time_stop.tv_sec >= time_start.tv_sec)
- secs = time_stop.tv_sec - time_start.tv_sec;
- int usecs = time_stop.tv_usec - time_start.tv_usec;
- float mtime = static_cast<float>(secs)*1000 + static_cast<float>(usecs)/1000;
-
- //* timing histogram
- if (m_hist_timeROBretrieval) {
- scoped_lock_histogram lock;
- m_hist_timeROBretrieval->Fill(mtime);
- m_hist_timeROBretrieval->LabelsDeflate("X");
+ // check if ROB is already in cache
+ ROBMAP::const_iterator it = cache->robmap.find(id);
+ if (it != cache->robmap.end()) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " Duplicate ROB Id 0x" << MSG::hex << id << MSG::dec
+ << " found for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
+ continue;
}
- //* detailed monitoring
- if ( p_robMonStruct ) {
- p_robMonStruct->start_time_of_ROB_request = time_start;
- p_robMonStruct->end_time_of_ROB_request = time_stop;
- }
- }
-
- //* histograms for number of requested/received ROBs
- if ( m_hist_requestedROBsPerCall ) {
- scoped_lock_histogram lock;
- m_hist_requestedROBsPerCall->Fill(robIdsForRetrieval.size());
- m_hist_requestedROBsPerCall->LabelsDeflate("X");
- }
- if ( m_hist_receivedROBsPerCall ) {
- scoped_lock_histogram lock;
- m_hist_receivedROBsPerCall->Fill(vRobInfos.size());
- m_hist_receivedROBsPerCall->LabelsDeflate("X");
- }
-
- // add ROBs to cache
- updateROBDataCache(vRobInfos,p_robMonStruct);
-
- return;
-} // end void addROBDataToCache(...)
-
-
-// helper function to put retrieved ROB fragments into the local cache and update the monitoring records
-void HltROBDataProviderSvc::updateROBDataCache(std::vector<hltinterface::DCM_ROBInfo>& vRobInfo,
- robmonitor::ROBDataMonitorStruct* p_robMonStruct) {
-
- ATH_MSG_DEBUG(" ---> updateROBDataCache: Number of ROB Info records for cache update : "
- << vRobInfo.size() << ", Lvl1 id = " << m_currentLvl1ID);
+ // check for ROBs with no data
+ if ((rob.rod_ndata() == 0) && (m_filterEmptyROB)) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " Empty ROB Id = 0x" << MSG::hex << id << MSG::dec
+ << " removed for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
+ continue;
+ }
- // return if no ROB Info records are available
- if (vRobInfo.size() == 0) return;
-
- // add ROBs to cache
- typedef std::vector<hltinterface::DCM_ROBInfo> ROBInfoVec;
- for(ROBInfoVec::const_iterator it=vRobInfo.begin(); it!=vRobInfo.end(); ++it) {
- uint32_t id = it->robFragment.source_id() ;
-
- // check first if ROB is already in cache (for full event requests)
- ONLINE_ROBMAP::iterator map_it = m_online_robmap.find(id) ;
- if(map_it != m_online_robmap.end()) continue;
-
- if ((it->robFragment.rod_ndata() == 0) && (m_removeEmptyROB)) {
- ATH_MSG_DEBUG(" ---> addROBDataToCache: Empty ROB Id = 0x" << MSG::hex << id << MSG::dec
- << " removed for L1 Id = " << m_currentLvl1ID);
- if ( p_robMonStruct ) {
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::IGNORED;
- }
- } else if ( ROBDataProviderSvc::filterRobWithStatus(&it->robFragment)) {
- if (msgLvl(MSG::DEBUG) && (it->robFragment.nstatus() > 0)) {
- const uint32_t* it_status;
- it->robFragment.status(it_status);
- eformat::helper::Status tmpstatus( (*it_status) ) ;
- ATH_MSG_DEBUG(" ---> addROBDataToCache: ROB Id = 0x" << MSG::hex << id
- << std::setfill( '0' )
- << " with Generic Status Code = 0x" << std::setw(4) << tmpstatus.generic()
- << " and Specific Status Code = 0x" << std::setw(4) << tmpstatus.specific()
- << MSG::dec
- << " removed for L1 Id = " << m_currentLvl1ID);
- }
- if ( p_robMonStruct ) {
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::IGNORED;
- }
- } else if ((m_ignoreROB.value().size() != 0) &&
- (std::find(m_ignoreROB.value().begin(), m_ignoreROB.value().end(),id) != m_ignoreROB.value().end())) {
- ATH_MSG_DEBUG(" ---> addROBDataToCache: ROB Id : 0x" << MSG::hex << id << MSG::dec
- << " removed for L1 Id = " << m_currentLvl1ID);
- if ( p_robMonStruct ) {
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::IGNORED;
- }
- } else {
- m_online_robmap[id]= (it->robFragment);
- //* detailed monitoring
- if ( p_robMonStruct ) {
- (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::RETRIEVED;
- (p_robMonStruct->requested_ROBs)[id].rob_size = it->robFragment.fragment_size_word();
- if ( it->robFragment.nstatus() != 0 ) {
- const uint32_t* it_status;
- it->robFragment.status(it_status);
- for (uint32_t k=0; k < it->robFragment.nstatus(); k++) {
- (p_robMonStruct->requested_ROBs)[id].rob_status_words.push_back( *(it_status+k) );
- }
- }
- } // end detailed monitoring
- }
-
- //* fill monitoring histogram for ROB generic status
- if ( ( m_hist_genericStatusForROB ) && ( it->robFragment.nstatus() != 0 ) ) {
- const uint32_t* it_status;
- it->robFragment.status(it_status);
- if ((*it_status) != 0) {
- scoped_lock_histogram lock;
- m_hist_genericStatusForROB->Fill(eformat::helper::SourceIdentifier(it->robFragment.source_id()).human_detector().c_str(),
- m_map_GenericStatus[eformat::helper::Status(*it_status).generic()].c_str(),1.);
+ // filter ROBs with external criteria
+ if (robmap_filterRobWithStatus(&rob)) {
+ if (rob.nstatus() > 0) {
+ const uint32_t* it_status;
+ rob.status(it_status);
+ eformat::helper::Status tmpstatus(*it_status);
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id = 0x" << MSG::hex << id << std::setfill('0')
+ << " with Generic Status Code = 0x" << std::setw(4) << tmpstatus.generic()
+ << " and Specific Status Code = 0x" << std::setw(4) << tmpstatus.specific() << MSG::dec
+ << " removed for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
}
+ continue;
}
- //* fill monitoring histogram for ROB specific status
- if ( ( m_hist_specificStatusForROB ) && ( it->robFragment.nstatus() != 0 ) ) {
- const uint32_t* it_status;
- it->robFragment.status(it_status);
- if ((*it_status) != 0) {
- scoped_lock_histogram lock;
- std::bitset<16> specificBits(eformat::helper::Status(*it_status).specific());
- for (unsigned int index=0; index < 16; ++index) {
- if (specificBits[index]) m_hist_specificStatusForROB->Fill(eformat::helper::SourceIdentifier(it->robFragment.source_id()).human_detector().c_str(),
- m_vec_SpecificStatus[index].c_str(),1.);
- }
- }
- }
- } // end loop over ROBInfo records
- return;
-} // end void updateROBDataCache(...)
+ // add ROB to map
+ cache->robmap[id] = rob;
+ }
+}
+
+HltROBDataProviderSvc::EventCache::~EventCache()
+{
+ // delete event;
+ robmap.clear();
+}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h
index a9e37fbdcfb8ed8494f87087583c0c2606c4ea53..56f09782d28546e3df66f5f4d51d8000309e547c 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h
@@ -1,251 +1,200 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-
#ifndef TRIGSERVICES_HLTROBDATAPROVIDERSVC_H
#define TRIGSERVICES_HLTROBDATAPROVIDERSVC_H
-
-/** ===============================================================
- * HltROBDataProviderSvc.h
- * ===============================================================
- * Description: ROBDataProvider class for accessing ROBData
- * To be used for Offline/Online
- *
- * Requirements: define a ROBData class in the scope
- * provide a method
- * void getROBData(const vector<uint>& ids, vector<ROBData*>& v)
- * Implementation: Use an interal map to store all ROBs
- * We can not assume any ROB/ROS relationship, no easy
- * way to search.
- *
- * Created: Sept 19, 2002
- * By: Hong Ma
- * Modified: Aug. 18 2003 (common class for Online/Offline)
- * By: Werner Wiedenmann
- * Modified: Apr 21 2005 (implementation for online)
- * By: Werner Wiedenmann
- * Modified: Jun. 02 2006 (added monitoring horograms)
- * By: Tomasz Bold
- * Modified: May 21 2007 (updates for release 13)
- * By: Werner Wiedenmann
- * Modified: Nov. 10 2008 (updates for L2/EF result node ID handling)
- * By: Werner Wiedenmann
- * Modified: Mar. 05, 2013 (adapted from L2 for merged HLT)
- * By: Ricardo Abreu
- * Modified: Nov. 04, 2013 (implement complete hltinterface definitions)
- * By: Werner Wiedenmann
- */
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/HistoProperty.h"
-#include "GaudiKernel/Property.h"
-#include "TrigROBDataProviderSvc/ITrigROBDataProviderSvc.h"
-#include "TrigROBDataProviderSvc/ITrigROBDataProviderSvcPrefetch.h"
-#include "ByteStreamCnvSvcBase/ROBDataProviderSvc.h"
+/**
+ * @file HltROBDataProviderSvc.h
+ * @brief Service to serve ROB data in online environment
+ * @author Werner Wiedenmann
+ */
+
+// Package includes
+#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "ByteStreamData/RawEvent.h"
-#include "TrigDataAccessMonitoring/ROBDataMonitor.h"
-#include "TrigSteeringEvent/RobRequestInfo.h"
-#include "eformat/Status.h"
-#include "hltinterface/DCM_ROBInfo.h"
-#include <vector>
-#include <map>
+#include "eformat/SourceIdentifier.h"
-// Forward declarations
-class StoreGateSvc;
-class IAlgContextSvc;
-class TH1F; /// for monitoring purposes
-class TH2F; /// for monitoring purposes
-
-class HltROBDataProviderSvc : public ROBDataProviderSvc,
- virtual public ITrigROBDataProviderSvc,
- virtual public ITrigROBDataProviderSvcPrefetch,
- virtual public IIncidentListener
-{
-public:
-
- typedef OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment ROBF ;
+// Framework includes
+#include "AthenaBaseComps/AthService.h"
+#include "AthenaKernel/SlotSpecificObj.h"
+#include "AthenaMonitoring/Monitored.h"
- HltROBDataProviderSvc(const std::string& name, ISvcLocator* svcloc);
-
- virtual ~HltROBDataProviderSvc(void);
-
- virtual StatusCode initialize();
+// STL includes
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
- virtual StatusCode finalize();
+// TBB includes
+#include "tbb/concurrent_unordered_map.h"
- virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
+/**
+ * @class HltROBDataProviderSvc
+ * @brief ROBDataProvider service for retrieving and serving ROB data in HLT online
+ **/
+class HltROBDataProviderSvc : public extends<AthService, IROBDataProviderSvc> {
+public:
+ /// ROB Fragment class
+ typedef OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment ROBF;
- /// --- Implementation of IROBDataProviderSvc interface ---
+ HltROBDataProviderSvc(const std::string& name, ISvcLocator* pSvcLocator);
+ virtual ~HltROBDataProviderSvc() override;
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
- /// Add ROBFragments to cache for given ROB ids, ROB fragments may be retrieved with DataCollector
- virtual void addROBData(const EventContext& /*ctx*/,
- const std::vector<uint32_t>& robIds,
- const std::string callerName="UNKNOWN")
- {
- addROBData(robIds, callerName);
- }
- virtual void addROBData(const std::vector<uint32_t>& robIds,
- const std::string callerName="UNKNOWN");
+ /// --- Implementation of IROBDataProviderSvc interface ---
+ /// --- Legacy interface (deprecated) ---
- /// Add a given LVL1/HLT ROBFragment to cache
- virtual void setNextEvent(const EventContext& /*ctx*/,
- const std::vector<ROBF>& result)
- { setNextEvent (result); }
- virtual void setNextEvent(const std::vector<ROBF>& result);
+ /// Signal ROB fragments which should be considered for prefetching in online running
+ virtual void addROBData(const std::vector<uint32_t>& /*robIds*/,
+ const std::string_view callerName="UNKNOWN") override;
- /// Add all ROBFragments of a RawEvent to cache
- virtual void setNextEvent(const EventContext& /*ctx*/, const RawEvent* re)
- { setNextEvent(re); }
- virtual void setNextEvent(const RawEvent* re);
+ /// Start a new event with a set of ROB fragments, e.g. from LVL1 result, in online and add the fragments to the ROB cache
+ virtual void setNextEvent(const std::vector<ROBF>& /*result*/) override;
- /// Retrieve ROBFragments for given ROB ids from cache
- virtual void getROBData(const EventContext& /*ctx*/,
- const std::vector<uint32_t>& robIds,
- std::vector<const ROBF*>& robFragments,
- const std::string callerName="UNKNOWN")
- {
- getROBData (robIds, robFragments, callerName);
- }
- virtual void getROBData(const std::vector<uint32_t>& robIds,
- std::vector<const ROBF*>& robFragments,
- const std::string callerName="UNKNOWN");
-
- /// Retrieve the whole event.
- virtual const RawEvent* getEvent(const EventContext& /*ctx*/)
- { return getEvent(); }
- virtual const RawEvent* getEvent();
+ /// Start a new event with a full event fragment and add all ROB fragments in to the ROB cache
+ virtual void setNextEvent(const RawEvent* /*re*/) override;
- /// --- Implementation of ITrigROBDataProviderSvc interface ---
+ /// Retrieve ROB fragments for given ROB ids from the ROB cache
+ virtual void getROBData(const std::vector<uint32_t>& /*robIds*/, std::vector<const ROBF*>& /*robFragments*/,
+ const std::string_view callerName="UNKNOWN") override;
- /// Return vector with all ROBFragments stored in the cache
- virtual void getAllROBData(std::vector<const ROBF*>& robFragments) ;
+ /// Retrieve the full event fragment
+ virtual const RawEvent* getEvent() override;
- // Dump ROB cache
- virtual std::string dumpROBcache() const ;
+ /// Store the status for the event.
+ virtual void setEventStatus(uint32_t /*status*/) override;
- /// Return size of ROBFragments cache
- virtual int sizeROBCache() { return m_online_robmap.size(); }
+ /// Retrieve the status for the event.
+ virtual uint32_t getEventStatus() override;
- /// iterators over cache entries
- virtual std::map<uint32_t, ROBF>::iterator beginROBCache() { return m_online_robmap.begin(); }
- virtual std::map<uint32_t, ROBF>::iterator endROBCache() { return m_online_robmap.end(); }
+ /// --- Implementation of IROBDataProviderSvc interface ---
+ /// --- Context aware interface for MT ---
- /// Flag to check if complete event data are already in cache
- virtual bool isEventComplete(const EventContext& /*ctx*/) const { return m_isEventComplete; }
- virtual bool isEventComplete() { return m_isEventComplete; }
+ /// Signal ROB fragments which should be considered for prefetching in online running
+ virtual void addROBData(const EventContext& /*context*/, const std::vector<uint32_t>& /*robIds*/,
+ const std::string_view callerName="UNKNOWN") override;
- /// Collect all data for an event from the ROS and put them into the cache
- /// Return value: number of ROBs which were retrieved to complete the event
- /// Optinonally the name of the caller of this method can be specified for cost monitoring
- virtual int collectCompleteEventData(const EventContext& /*ctx*/,
- const std::string callerName="UNKNOWN")
- {
- return collectCompleteEventData(callerName);
- }
- virtual int collectCompleteEventData(const std::string callerName="UNKNOWN");
+ /// Start a new event with a set of ROB fragments, e.g. from LVL1 result, in online and add the fragments to the ROB cache
+ virtual void setNextEvent(const EventContext& /*context*/, const std::vector<ROBF>& /*result*/) override;
- /// set the name of the program which uses the ROBDataProviderSvc
- virtual void setCallerName(const std::string);
+ /// Start a new event with a full event fragment and add all ROB fragments in to the ROB cache
+ virtual void setNextEvent(const EventContext& /*context*/, const RawEvent* /*re*/) override;
- /// get the name of the program which is presently registered in the ROBDataProviderSvc
- virtual std::string getCallerName() { return m_callerName; };
+ /// Retrieve ROB fragments for given ROB ids from the ROB cache
+ virtual void getROBData(const EventContext& /*context*/,
+ const std::vector<uint32_t>& /*robIds*/, std::vector<const ROBF*>& /*robFragments*/,
+ const std::string_view callerName="UNKNOWN") override;
- /// --- Implementation of ITrigROBDataProviderSvcPrefetch interface ---
+ /// Retrieve the full event fragment
+ virtual const RawEvent* getEvent(const EventContext& /*context*/) override;
- /// Set access to ROB prefetching information from steering
- virtual void setRobRequestInfo(HLT::RobRequestInfo* robInfo) { m_RobRequestInfo = robInfo; } ;
+ /// Store the status for the event.
+ virtual void setEventStatus(const EventContext& /*context*/, uint32_t /*status*/) override;
- /// Get access to ROB prefetching information from steering
- virtual HLT::RobRequestInfo* robRequestInfo() const { return m_RobRequestInfo; };
+ /// Retrieve the status for the event.
+ virtual uint32_t getEventStatus(const EventContext& /*context*/) override;
- /// --- Implementation of IIncidentListener interface ---
+ /// Apply a function to all ROBs in the cache
+ virtual void processCachedROBs(const EventContext& /*context*/, const std::function< void(const ROBF* )>& /*fn*/) const override;
- // handler for BeginRun actions
- void handle(const Incident& incident);
+ /// Flag to check if all event data have been retrieved
+ virtual bool isEventComplete(const EventContext& /*context*/) const override;
+ /// retrieve in online running all ROBs for the event from the readout system. Only those ROBs are retrieved which are not already in the cache
+ virtual int collectCompleteEventData(const EventContext& /*context*/,
+ const std::string_view callerName="UNKNOWN") override;
private:
- typedef ServiceHandle<StoreGateSvc> StoreGateSvc_t;
- /// Reference to StoreGateSvc;
- StoreGateSvc_t m_storeGateSvc;
-
- /// Pointer to AlgContextSvc
- IAlgContextSvc* m_algContextSvc;
-
- typedef SimpleProperty< std::vector<uint32_t> > Uint32ArrayProperty;
- typedef SimpleProperty< std::map<int,int> > IntegerMapProperty;
-
- // flag indicates if running in online/offline
- bool m_onlineRunning ;
-
- // read enabled ROBs from OKS when possible
- BooleanProperty m_readROBfromOKS;
-
- // list of all enabled ROBs which can be retrieved
- Uint32ArrayProperty m_enabledROBs;
-
- // list of ROBs which should be ignored for retrieval
- Uint32ArrayProperty m_ignoreROB;
-
- // list of all LAr MET ROBs which can be retrieved
- Uint32ArrayProperty m_enabledLArMetROBs ;
- UnsignedIntegerProperty m_genericLArMetModuleID ;
-
- // list of all Tile MET ROBs which can be retrieved
- Uint32ArrayProperty m_enabledTileMetROBs;
- UnsignedIntegerProperty m_genericTileMetModuleID ;
-
- // Separate data collector calls to ROS for normal ROBs and MET ROBs
- BooleanProperty m_separateMETandDetROBRetrieval ;
-
- // Filter out empty ROB fragments which are send by the ROS
- bool m_removeEmptyROB;
-
- // map for all the ROB fragments (cache for ROB data so that they are
- // not deleted when local containers go out of scope)
- typedef std::map<uint32_t, ROBF> ONLINE_ROBMAP;
- ONLINE_ROBMAP m_online_robmap;
-
- // helper function to retrieve ROB fragments over the network and to add them to the cache
- void addROBDataToCache(std::vector<uint32_t>& robIdsForRetrieval, // vector of ROBs to retrieve
- robmonitor::ROBDataMonitorStruct* p_robMonStruct); // pointer to ROB monitoring structure for retrieval
-
- // helper function to put retrieved ROB fragments into the local cache and update the monitoring records
- void updateROBDataCache(std::vector<hltinterface::DCM_ROBInfo>& vRobInfo, // vector of ROB Info records with retrieved fragments
- robmonitor::ROBDataMonitorStruct* p_robMonStruct); // pointer to ROB monitoring structure
-
- // Flag to indicate if all event data are already in the cache
- bool m_isEventComplete;
-
- // name of the program which presently uses the ROBDataProviderSvc
- std::string m_callerName;
-
- // ROB prefetching info
- HLT::RobRequestInfo* m_RobRequestInfo;
-
- // monitoring
- std::map<eformat::GenericStatus, std::string> m_map_GenericStatus;
- std::vector<std::string> m_vec_SpecificStatus;
-
- BooleanProperty m_doMonitoring;
- BooleanProperty m_doDetailedROBMonitoring;
- StringProperty m_ROBDataMonitorCollection_SG_Name;
-
- Histo1DProperty m_histProp_requestedROBsPerCall;
- Histo1DProperty m_histProp_receivedROBsPerCall;
- Histo1DProperty m_histProp_timeROBretrieval;
-
- TH1F* m_hist_requestedROBsPerCall;
- TH1F* m_hist_receivedROBsPerCall;
- TH1F* m_hist_timeROBretrieval;
- TH2F* m_hist_genericStatusForROB;
- TH2F* m_hist_specificStatusForROB;
-
- // Temporary hack to make this version compile in master
- uint32_t m_currentLvl1ID;
+ /*--------------+
+ * Event cache |
+ *--------------+
+ */
+ /// map for all the ROB fragments
+ typedef tbb::concurrent_unordered_map<uint32_t, ROBF> ROBMAP;
+
+ /// struct which provides the event cache for each slot
+ struct EventCache {
+ ~EventCache();
+ const RawEvent* event = 0;
+ uint32_t currentLvl1ID = 0;
+ uint64_t globalEventNumber = 0;
+ uint32_t eventStatus = 0;
+ bool isEventComplete = false;
+ ROBMAP robmap;
+ };
+
+ /// An event cache for each slot
+ SG::SlotSpecificObj<EventCache> m_eventsCache;
+
+ /*------------------------------+
+ * Attributes for configuration |
+ *------------------------------+
+ */
+ /// vector of Source ids and status words to be ignored for the ROB map
+ typedef std::vector< std::pair<int, int> > ArrayPairIntType;
+ Gaudi::Property< ArrayPairIntType > m_filterRobWithStatus{
+ this, "filterRobWithStatus", {} , "List of ROBs with status code to remove"};
+ Gaudi::Property< ArrayPairIntType > m_filterSubDetWithStatus{
+ this, "filterSubDetWithStatus", {} , "List of SubDets with status code to remove"};
+
+ /// map of full ROB Source ids and status words to be ignored for the ROB map
+ typedef std::map<uint32_t, std::vector<uint32_t> > FilterRobMap;
+ FilterRobMap m_filterRobMap;
+ /// map of Sub Det Source ids and status words to be ignored for the ROB map
+ typedef std::map<eformat::SubDetector, std::vector<uint32_t> > FilterSubDetMap;
+ FilterSubDetMap m_filterSubDetMap;
+
+ /// Filter out empty ROB fragments which are send by the ROS
+ Gaudi::Property<bool> m_filterEmptyROB{
+ this, "filterEmptyROB", false , "Filter out empty ROB fragments"};
+
+ /// For Run 1 the module ID for the Lvl2/EF result contained the machine ID and nedded to
+ /// be filtered out to access these result records transparently
+ bool m_maskL2EFModuleID = false;
+
+ // read enabled ROBs from OKS when possible
+ Gaudi::Property<bool> m_readROBfromOKS{
+ this, "readROBfromOKS", true , "Read enabled ROBs from OKS"};
+
+ // list of all enabled ROBs which can be retrieved
+ Gaudi::Property< std::vector<uint32_t> > m_enabledROBs{
+ this, "enabledROBs", {} , "Enabled ROBs for retrieval"};
+
+ /*------------------------+
+ * Methods acting on ROBs |
+ *------------------------+
+ */
+ /// method to filter ROBs with given Status code
+ bool robmap_filterRobWithStatus(const ROBF*);
+
+ /*------------------------------+
+ * Methods acting on EventCache |
+ *------------------------------+
+ */
+ /// method to clear an event cache in a slot
+ /// input:
+ /// pointer to cache
+ void eventCache_clear(EventCache*);
+
+ /// method to compare a list of ROB Ids to the ones in an event cache in a slot
+ /// input:
+ /// pointer to cache
+ /// vector of ROB Ids to compare to existing ones in cache
+ /// output:
+ /// vector of ROB fragments available already in cache
+ /// vector of ROB Ids missing in cache
+ void eventCache_checkRobListToCache(EventCache*, const std::vector<uint32_t>&,
+ std::vector<const ROBF*>&, std::vector<uint32_t>& );
+
+ /// method to add ROB fragments to an event cache in a slot
+ /// input:
+ /// pointer to cache
+ /// vector of ROB fragments to add to the cache
+ void eventCache_addRobData(EventCache*, const std::vector<ROBF>&) ;
+
+ /// Monitoring tool
+ ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", "", "Monitoring tool"};
};
-#endif
+#endif // TRIGSERVICES_HLTROBDATAPROVIDERSVC_H
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
index bdd0ef2c8497342d9ede62875f5e1d63a102f025..69ba8b91c1e5006e410c4165af1261f722cdd491 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
@@ -1,15 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetBeamSpotReader.h"
-
#include "VxVertex/VxCandidate.h"
-//#include "TrkEventPrimitives/VertexType.h"
-
-#include "EventInfo/EventID.h"
-
-
InDet::InDetBeamSpotReader::InDetBeamSpotReader(const std::string& name, ISvcLocator* pSvcLocator):
AthReentrantAlgorithm(name, pSvcLocator)
@@ -32,9 +26,8 @@ StatusCode InDet::InDetBeamSpotReader::execute(const EventContext& ctx) const {
//get the set of
SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey, ctx };
- SG::ReadHandle<EventInfo> eventInfo(m_eventInfo, ctx);
- EventID* eventID = eventInfo->event_ID();
- ATH_MSG_INFO( "In event " << (*eventID) );
+ SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfo, ctx);
+ ATH_MSG_INFO( "In event " << (*eventInfo) );
ATH_MSG_INFO("BeamSpot Position: \n "
<< beamSpotHandle->beamPos() );
ATH_MSG_INFO("BeamSpot Sigma\n\t"
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
index 8533e0c824744c74b09df77476c8d93de6858144..ee83cf1be1d4c30f1f0ff206e867ef536d7f7c08 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef INDET_INDETBEAMSPOTREADER_H
@@ -13,7 +13,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "StoreGate/ReadHandleKey.h"
#include "VxVertex/VxContainer.h"
-#include "EventInfo/EventInfo.h"
+#include "xAODEventInfo/EventInfo.h"
#include "BeamSpotConditionsData/BeamSpotData.h"
namespace InDet {
@@ -34,7 +34,7 @@ namespace InDet {
private:
SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" };
- SG::ReadHandleKey<EventInfo> m_eventInfo
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo
{this, "EvtInfo", "EventInfo", "EventInfo name"};
SG::ReadHandleKey<VxContainer> m_vxContainer
{this, "VxContainer", "VxPrimaryCandidate", "Vertex container name"};
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotRooFit.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotRooFit.cxx
index dc21a4702438f92b20e5b1948e170691e7b764bc..f658c6308e7f95113f636078d516c4bea09c3f29 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotRooFit.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotRooFit.cxx
@@ -1,11 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetBeamSpotRooFit.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
#include "VxVertex/VxCandidate.h"
#include "VxVertex/VxContainer.h"
#include <RooRealVar.h>
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx
index ac58270dba17951ecbf7abc4009320c4d49322a9..bfcd4dc9eaed141e535d307270802df9ca14a5fa 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx
@@ -1,13 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetBeamSpotVertex.h"
-
-
#include "GaudiKernel/ITHistSvc.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
#include "VxVertex/VxCandidate.h"
#include "VxVertex/VxContainer.h"
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibEvtInfo.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibEvtInfo.h
index 301351eb89c467dbf7523dab32657e4fe6387c3f..a3b3cca59e9214dfb51713e98c3e27702bced568 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibEvtInfo.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibEvtInfo.h
@@ -33,31 +33,30 @@ class ISCT_CalibEvtInfo: virtual public IAlgTool{
/// interfaceID re-implemented from IInterface
static const InterfaceID& interfaceID();
/// specific methods for this class
- virtual void setTimeStamp(const std::string& begin, const std::string& end)=0;
virtual void setTimeStamp(const int begin, const int end)=0;
+ virtual void setTimeStamp(const std::string& begin, const std::string& end)=0;
virtual void setTimeStamp(const int ts)=0;
+ virtual void getTimeStamps(int& begin, int& end) const =0;
+ virtual void getTimeStamps(std::string& begin, std::string& end) const =0;
+ virtual int timeStamp() const =0;
+ virtual int duration() const =0;
virtual void setSource(const std::string source)=0;
- virtual void getLumiBlock(int& begin, int& end) const=0;
virtual void setLumiBlock(const int begin, const int end)=0;
virtual void setLumiBlock(const int lb)=0;
+ virtual void getLumiBlock(int& begin, int& end) const =0;
+ virtual int lumiBlock() const =0;
+ virtual int numLumiBlocks() const =0;
virtual void setRunNumber(const int rn)=0;
- virtual void setBunchCrossing(const int bc)=0;
+ virtual int runNumber() const =0;
+
virtual void setCounter(const int counterVal)=0;
virtual void incrementCounter()=0;
-
- virtual void getTimeStamps(int& begin, int& end) const=0;
- virtual void getTimeStamps(std::string& begin, std::string& end) const=0;
-
- virtual int timeStamp()const=0;
- virtual int lumiBlock() const=0;
- virtual int runNumber() const=0;
virtual int counter() const =0;
- virtual int duration() const=0;
- virtual int numLumiBlocks() const=0;
+ virtual void setBunchCrossing(const int bc)=0;
};
inline const InterfaceID& ISCT_CalibEvtInfo::interfaceID() {
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h
index 7e8ead5eaf674a1131cfc18f19c5124904c21a60..bd16f81542b940aeefcc988e293d3294d935a2e9 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h
@@ -52,11 +52,11 @@ class ISCT_CalibHistoTool: virtual public IAlgTool {
/// set number of lumiblocks
void setNumberOfLb(const int nLb);
/// get number of lumiblocks
- int numberOfLb();
+ int numberOfLb() const;
/// set number of lumiblocks
void setLbToMerge(const int nLbMerge);
/// get number of lumiblocks
- int LbToMerge();
+ int LbToMerge() const;
protected:
std::vector<TH1F*> m_phistoVector;
std::vector<TH2F*> m_phistoVector2D;
@@ -68,13 +68,12 @@ class ISCT_CalibHistoTool: virtual public IAlgTool {
//
bool init();
template<class T>
- std::pair<std::string, bool> retrievedTool(T& tool) {
+ std::pair<std::string, bool> retrievedTool(T& tool) const {
if (tool.retrieve().isFailure() ) return std::make_pair(std::string{"Unable to retrieve "}+tool.name(), false);
return std::make_pair("", true);
}
};
-
inline const InterfaceID& ISCT_CalibHistoTool::interfaceID() {
static const InterfaceID IID{"ISCT_CalibHistoTool", 1, 0};
return IID;
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibModuleListTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibModuleListTool.h
index ba75b263d92ccb4843ac4688e2c71295411a658c..e8c0d1d733de747020d5b77f81d874ac8fd7df64 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibModuleListTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibModuleListTool.h
@@ -32,11 +32,11 @@ class ISCT_CalibModuleListTool : virtual public IAlgTool {
virtual ~ISCT_CalibModuleListTool() = default;
static const InterfaceID& interfaceID();
//@}
- virtual StatusCode readModuleList(std::map<Identifier, std::set<Identifier>>& moduleList)=0;
+ virtual StatusCode readModuleList(std::map<Identifier, std::set<Identifier>>& moduleList) const =0;
protected:
template<class T>
- std::pair<std::string, bool> retrievedTool(T& tool) {
+ std::pair<std::string, bool> retrievedTool(T& tool) const {
if (tool.retrieve().isFailure()) return std::make_pair(std::string{"Unable to retrieve "}+tool.name(), false);
return std::make_pair("", true);
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
index 6d534817e03d513e5591d310fa5893bd9c255223..961ecac85a5dcbea42c779bfd3e03f40f45853be 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
@@ -111,8 +111,8 @@ class SCTCalib : public AthAlgorithm {
// For ntuple sorting
// For HV trips
- std::vector< std::vector< std::pair<int, int> > > m_summarytrips;
- std::vector< std::vector< std::pair<int, int> > > m_summarytripslb;
+ std::vector<std::vector<std::pair<int, int>>> m_summarytrips;
+ std::vector<std::vector<std::pair<int, int>>> m_summarytripslb;
std::ofstream m_gofile;
@@ -230,7 +230,7 @@ class SCTCalib : public AthAlgorithm {
StringProperty m_LorentzAngleSummaryFile{this, "LorentzAngleSummaryFile", "LorentzAngleSummaryFile.xml", "Output XML for summary of lorentz angle"};
// Event related
- int m_numOfLBsProcessed;
+ int m_numOfLBsProcessed;
unsigned long long m_numberOfEvents;
unsigned long long m_numberOfEventsHist; // For number of events from HIST
std::string m_utcBegin;
@@ -266,60 +266,60 @@ class SCTCalib : public AthAlgorithm {
StatusCode getLorentzAngle();
// To handle XML file for DB
- StatusCode openXML4DB( std::ofstream&, const char*, const char*, IOVTime, IOVTime ) const;
- StatusCode closeXML4DB( std::ofstream& ) const;
- StatusCode addToXML4DB( std::ofstream&, const Identifier&, const char*, float, const char* ) const;
+ StatusCode openXML4DB(std::ofstream&, const char*, const char*, IOVTime, IOVTime) const;
+ StatusCode closeXML4DB(std::ofstream&) const;
+ StatusCode addToXML4DB(std::ofstream&, const Identifier&, const char*, float, const char*) const;
// To handle XML file for Summary
- StatusCode openXML4MonSummary( std::ofstream&, const char* ) const;
- StatusCode openXML4DeadSummary( std::ofstream& file, const char* type, int n_Module=0, int n_Link=0, int n_Chip=0, int n_Strip=0 ) const;
- StatusCode wrapUpXML4Summary( std::ofstream&, const char*, std::ostringstream& ) const;
- StatusCode addToSummaryStr( std::ostringstream&, const Identifier&, const char*, const char*, const char* ) const;
+ StatusCode openXML4MonSummary(std::ofstream&, const char*) const;
+ StatusCode openXML4DeadSummary(std::ofstream& file, const char* type, int n_Module=0, int n_Link=0, int n_Chip=0, int n_Strip=0) const;
+ StatusCode wrapUpXML4Summary(std::ofstream&, const char*, std::ostringstream&) const;
+ StatusCode addToSummaryStr(std::ostringstream&, const Identifier&, const char*, const char*, const char*) const;
template<class S>
- bool retrievedService(S& service) {
- if (service.retrieve().isFailure() ) {
+ bool retrievedService(S& service) const {
+ if (service.retrieve().isFailure()) {
ATH_MSG_ERROR("Unable to retrieve "<<service.name());
return false;
}
return true;
}
std::string
- xmlChannelNoiseOccDataString(const Identifier& waferId, const float occupancy, const SCT_SerialNumber& serial) const;
+ xmlChannelNoiseOccDataString(const Identifier& waferId, const float occupancy, const SCT_SerialNumber& serial) const;
std::string
- xmlChannelEfficiencyDataString(const Identifier& waferId, const float efficiency, const SCT_SerialNumber& serial) const;
+ xmlChannelEfficiencyDataString(const Identifier& waferId, const float efficiency, const SCT_SerialNumber& serial) const;
std::pair<int, bool>
- getNumNoisyStrips( const Identifier& waferId ) const;
+ getNumNoisyStrips(const Identifier& waferId) const;
StatusCode
- addStripsToList( Identifier& waferId, std::set<Identifier>& stripIdList, bool isNoisy, bool isNew );
+ addStripsToList(Identifier& waferId, std::set<Identifier>& stripIdList, bool isNoisy, bool isNew) const;
StatusCode
- writeModuleListToCool( const std::map< Identifier, std::set<Identifier> >& moduleListAll,
- const std::map< Identifier, std::set<Identifier> >& moduleListNew,
- const std::map< Identifier, std::set<Identifier> >& moduleListRef );
+ writeModuleListToCool(const std::map<Identifier, std::set<Identifier>>& moduleListAll,
+ const std::map<Identifier, std::set<Identifier>>& moduleListNew,
+ const std::map<Identifier, std::set<Identifier>>& moduleListRef) const;
std::string
- getStripList( const std::set<Identifier>& stripIdList ) const;
+ getStripList(const std::set<Identifier>& stripIdList) const;
StatusCode
- noisyStripsToXml( const std::map< Identifier, std::set<Identifier> >& moduleList, const std::string& badStripsFile ) const;
+ noisyStripsToXml(const std::map< Identifier, std::set<Identifier> >& moduleList, const std::string& badStripsFile) const;
StatusCode
- noisyStripsToSummaryXml( const std::map< Identifier, std::set<Identifier> >& moduleListAll,
- const std::map< Identifier, std::set<Identifier> >& moduleListNew,
- const std::map< Identifier, std::set<Identifier> >& moduleListRef,
- const std::string& badStripsFile) const;
+ noisyStripsToSummaryXml(const std::map<Identifier, std::set<Identifier>>& moduleListAll,
+ const std::map<Identifier, std::set<Identifier>>& moduleListNew,
+ const std::map<Identifier, std::set<Identifier>>& moduleListRef,
+ const std::string& badStripsFile) const;
std::set<int>
- getNoisyChips( const std::set<Identifier>& stripIdList ) const;
+ getNoisyChips(const std::set<Identifier>& stripIdList) const;
- std::pair< std::string, float >
- getNoisyLB( const Identifier& moduleId, int& chipId ) const;
+ std::pair<std::string, float>
+ getNoisyLB(const Identifier& moduleId, int& chipId) const;
std::string
- getLBList( const std::set<int>& LBList ) const;
+ getLBList(const std::set<int>& LBList) const;
}; // end of class
#endif // SCTCalib_H
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h
index aba4ca429da160c87ca501598444712235d297db..4906150408653ea4ee297fa8f506f32b4e453e61 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h
@@ -64,14 +64,6 @@ public:
static const InterfaceID& interfaceID();
virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvIF);
- ///Manually get the data in the structure before proceding
- virtual StatusCode fillData();
-
- //I'm going to fill this from job options, so the callback version of fillData is not needed.
- virtual StatusCode fillData(int& /*i */, std::list<std::string>& /*l*/) { //comment out unused parameters to prevent compiler warning
- return StatusCode::FAILURE;
- }
-
std::string
addDefect(const std::string& defectlist,const int defectBeginChannel,const int defectEndChannel) const;
@@ -82,36 +74,36 @@ public:
createDefectString(const int defectBeginChannel,const int defectEndChannel) const;
StatusCode
- createCondObjects( const Identifier& wafer_id,const SCT_ID* m_sctId,const int samplesize,const std::string& defectType,const float threshold,const std::string& defectList ) const;
-
- StatusCode createListStrip( const Identifier& wafer_id,
- const SCT_ID* m_sctId,
- const int samplesize,
- const std::string& defectType,
- const float threshold,
- const std::string& defectList ) const;
+ createCondObjects(const Identifier& wafer_id, const SCT_ID* m_sctId, const int samplesize, const std::string& defectType, const float threshold, const std::string& defectList) const;
- StatusCode createListChip( const Identifier& wafer_id,
+ StatusCode createListStrip(const Identifier& wafer_id,
const SCT_ID* m_sctId,
const int samplesize,
const std::string& defectType,
const float threshold,
- const std::string& defectList ) const;
+ const std::string& defectList) const;
- StatusCode createListEff( const Identifier& wafer_id,
+ StatusCode createListChip(const Identifier& wafer_id,
const SCT_ID* m_sctId,
const int samplesize,
- const float eff ) const;
+ const std::string& defectType,
+ const float threshold,
+ const std::string& defectList) const;
- StatusCode createListNO( const Identifier& wafer_id,
+ StatusCode createListEff(const Identifier& wafer_id,
const SCT_ID* m_sctId,
const int samplesize,
- const float noise_occ ) const;
+ const float eff) const;
+
+ StatusCode createListNO(const Identifier& wafer_id,
+ const SCT_ID* m_sctId,
+ const int samplesize,
+ const float noise_occ) const;
- StatusCode createListRawOccu( const Identifier& wafer_id,
- const SCT_ID* m_sctId,
- const int samplesize,
- const float raw_occu ) const;
+ StatusCode createListRawOccu(const Identifier& wafer_id,
+ const SCT_ID* m_sctId,
+ const int samplesize,
+ const float raw_occu) const;
StatusCode createListBSErr(const Identifier& wafer_id,
const SCT_ID* m_sctId,
@@ -133,7 +125,7 @@ public:
const float fitParam_sigma,
const float err_sigma,
const float MCW,
- const float err_MCW ) const;
+ const float err_MCW) const;
StatusCode wrapUpNoisyChannel();
StatusCode wrapUpDeadStrips();
@@ -147,15 +139,14 @@ public:
private:
SG::ReadHandleKey<EventInfo> m_eventInfoKey;
- StatusCode registerIOV(const CLID& clid);
int stringToInt(const std::string& s) const;
StatusCode streamOutCondObjects(const std::string& foldername);
StatusCode streamOutCondObjectsWithErrMsg(const std::string& foldername);
- StatusCode registerCondObjects(const std::string& foldername,const std::string& tagname);
+ StatusCode registerCondObjects(const std::string& foldername,const std::string& tagname) const;
StatusCode recordAndStream(const CondAttrListCollection* pCollection,const std::string& foldername, bool& flag);
- StatusCode registerCondObjectsWithErrMsg(const std::string& foldername,const std::string& tagname);
+ StatusCode registerCondObjectsWithErrMsg(const std::string& foldername,const std::string& tagname) const;
coral::AttributeListSpecification* createBasicDbSpec(const bool capsFormat) const;
void setBasicValues(coral::AttributeList& attrList, const Identifier& wafer_id, const int samplesize,const SCT_ID* m_sctId, const bool capsFormat) const;
@@ -208,7 +199,6 @@ private:
IIOVRegistrationSvc* m_regSvc;
IAthenaOutputStreamTool* m_streamer;
- std::set<Identifier> m_badIds;
bool m_defectRecorded;
bool m_deadStripRecorded;
bool m_deadChipRecorded;
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx
index 69f51c1c9f8fddf9eb40bde64e886a236d0ddfdd..9670b6aabe97f84337b97c54ff345361502f41d5 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx
@@ -79,7 +79,7 @@ ISCT_CalibHistoTool::setNumberOfLb(const int nLb) {
}
int
-ISCT_CalibHistoTool::numberOfLb() {
+ISCT_CalibHistoTool::numberOfLb() const {
return m_nLb;
}
@@ -89,6 +89,6 @@ ISCT_CalibHistoTool::setLbToMerge(const int nLbMerge) {
}
int
-ISCT_CalibHistoTool::LbToMerge() {
+ISCT_CalibHistoTool::LbToMerge() const {
return m_nLbMerge;
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
index 87bdd23a73475a8d3de27abda851e098bd8efed2..c8b5ddfbe8eaeabe3a040526fbeac5bbac32c5d7 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
@@ -20,13 +20,8 @@
#include "SCT_CalibAlgs/SCTCalib.h"
#include "SCT_CalibAlgs/SCT_LorentzAngleFunc.h"
-#include "SCT_CalibUtilities.h"
-#include "SCT_CalibBsErrorTool.h"
-#include "SCT_CalibLbTool.h"
-#include "SCT_CalibModuleListTool.h"
-#include "SCT_CalibEventInfo.h"
-#include "SCT_CalibHitmapTool.h"
+#include "SCT_CalibUtilities.h"
#include "XmlHeader.h"
#include "XmlStreamer.h"
@@ -59,11 +54,11 @@ using namespace std;
namespace {
enum Bec {ENDCAP_C = -2, BARREL = 0, ENDCAP_A = 2};
// String names for the detector parts
- const std::string detectorNames[]{"negativeEndcap", "Barrel", "positiveEndcap"};
+ const std::string detectorNames[] = {"negativeEndcap", "Barrel", "positiveEndcap"};
// String names for the detector parts
- const std::string shortNames[]{"EndCapC", "Barrel", "EndCapA"};
+ const std::string shortNames[] = {"EndCapC", "Barrel", "EndCapA"};
// Path names to become part of the histogram paths
- const std::string detectorPaths[]{"SCTEC", "SCTB", "SCTEA"};
+ const std::string detectorPaths[] = {"SCTEC", "SCTB", "SCTEA"};
bool areConsecutiveIntervals(const std::pair<int, int>& i1, const std::pair<int, int>& i2, const int withinLimits) {
return i1.second <= (i2.first + withinLimits);
@@ -658,7 +653,7 @@ StatusCode SCTCalib::getDeadStrip() {
//std::set<Identifier>::const_iterator stripItr(badStripsExclusive.begin());
std::set<Identifier>::const_iterator stripEnd(badStripsExclusive.end());
//To get #(Enabled Modules)
- int numEnabledModules_B[n_barrels]{n_phiBinsB0*n_etaInBarrel, n_phiBinsB1*n_etaInBarrel, n_phiBinsB2*n_etaInBarrel, n_phiBinsB3*n_etaInBarrel};
+ int numEnabledModules_B[n_barrels] = {n_phiBinsB0*n_etaInBarrel, n_phiBinsB1*n_etaInBarrel, n_phiBinsB2*n_etaInBarrel, n_phiBinsB3*n_etaInBarrel};
int numEnabledModules_EC[n_disks][n_etaBinsEC] = {{0}, {0}};
for (int i{0}; i<n_disks; i++) {
for (int j{0}; j<n_etaBinsEC; j++) {
@@ -1165,16 +1160,16 @@ StatusCode SCTCalib::getNoiseOccupancy()
ATH_MSG_INFO("----- in getNoiseOccupancy() -----");
//--- Initialization
- int n_phiBinsBarrel[n_barrels]{n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
- int n_phiBinsEndcap[n_disks][n_etaBinsEC]{{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, 0, 0}
+ int n_phiBinsBarrel[n_barrels] = {n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
+ int n_phiBinsEndcap[n_disks][n_etaBinsEC] = {{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, 0, 0}
};
double meanNO_Barrel[n_barrels] = {0};
@@ -1382,16 +1377,16 @@ StatusCode SCTCalib::getRawOccupancy()
ATH_MSG_INFO("----- in getRawOccupancy() -----");
//--- Initialization
- int n_phiBinsBarrel[n_barrels]{n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
- int n_phiBinsEndcap[n_disks][n_etaBinsEC]{{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, 0, 0}
+ int n_phiBinsBarrel[n_barrels] = {n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
+ int n_phiBinsEndcap[n_disks][n_etaBinsEC] = {{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, 0, 0}
};
double meanRO_Barrel[n_barrels] = {0};
@@ -1533,16 +1528,16 @@ StatusCode SCTCalib::getEfficiency() {
ATH_MSG_INFO("----- in getEfficiency() -----");
//--- Initialization
- int n_phiBinsBarrel[n_barrels]{n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
- int n_phiBinsEndcap[n_disks][n_etaBinsEC]{{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, 0, 0}
+ int n_phiBinsBarrel[n_barrels] = {n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
+ int n_phiBinsEndcap[n_disks][n_etaBinsEC] = {{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, 0, 0}
};
double meanEff_Barrel[n_barrels] = {0};
@@ -1713,16 +1708,16 @@ StatusCode SCTCalib::getBSErrors() {
ATH_MSG_INFO("----- in getBSErrors() -----");
//--- Initialization
- int n_phiBinsBarrel[n_barrels]{n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
- int n_phiBinsEndcap[n_disks][n_etaBinsEC]{{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
- {n_phiBinsECOuter, 0, 0}
+ int n_phiBinsBarrel[n_barrels] = {n_phiBinsB0, n_phiBinsB1, n_phiBinsB2, n_phiBinsB3};
+ int n_phiBinsEndcap[n_disks][n_etaBinsEC] = {{n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, n_phiBinsECShort},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, n_phiBinsECMiddle, 0},
+ {n_phiBinsECOuter, 0, 0}
};
unsigned long long nErrLink_Barrel[n_barrels] = {0};
@@ -2077,8 +2072,8 @@ StatusCode SCTCalib::getLorentzAngle() {
float Chisq_BarrelSide[n_barrels][2][2] = {{{0}, {0}}, {{0}, {0}}};
string DBUploadFlag{"G"}; // fit status flag
- string module[2]{"100", "111"};
- int moduleint[2]{100, 111};
+ string module[2] = {"100", "111"};
+ int moduleint[2] = {100, 111};
int FitFlag[n_barrels][2][2] = {{{0}, {0}}, {{0}, {0}}}; // fit status flag
@@ -2283,7 +2278,6 @@ StatusCode SCTCalib::getLorentzAngle() {
//--- DB output
if (m_writeToCool) {
- // if (m_pCalibWriteTool->createListLA(waferId, m_pSCTHelper, 10000, moduleint[iModule], LA_BarrelSide[iLayer][iSide][iModule], MCW_BarrelSide[iLayer][iSide][iModule]).isFailure()) {
if (m_pCalibWriteTool->createListLA(waferId, m_pSCTHelper, 10000, moduleint[iModule], LA_BarrelSide[iLayer][iSide][iModule], Err_LA_BarrelSide[iLayer][iSide][iModule], Chisq_BarrelSide[iLayer][iSide][iModule], A_BarrelSide[iLayer][iSide][iModule], Err_A_BarrelSide[iLayer][iSide][iModule], B_BarrelSide[iLayer][iSide][iModule], Err_B_BarrelSide[iLayer][iSide][iModule], Sigma_BarrelSide[iLayer][iSide][iModule], Err_Sigma_BarrelSide[iLayer][iSide][iModule], MCW_BarrelSide[iLayer][iSide][iModule], Err_MCW_BarrelSide[iLayer][iSide][iModule]).isFailure()) {
ATH_MSG_ERROR("Unable to run createListLA");
return StatusCode::FAILURE;
@@ -2624,7 +2618,7 @@ SCTCalib::getNumNoisyStrips(const Identifier& waferId) const {
}
StatusCode
-SCTCalib::addStripsToList(Identifier& waferId, std::set<Identifier>& stripIdList, bool isNoisy, bool isNew) {
+SCTCalib::addStripsToList(Identifier& waferId, std::set<Identifier>& stripIdList, bool isNoisy, bool isNew) const {
IdentifierHash waferHash{m_pSCTHelper->wafer_hash(waferId)};
float noisyStripThr{m_noisyStripThrDef ? (m_noisyStripThrOffline):(m_noisyStripThrOnline)};
for (int iStrip{0}; iStrip != nbins; ++iStrip) {
@@ -2654,7 +2648,7 @@ SCTCalib::addStripsToList(Identifier& waferId, std::set<Identifier>& stripIdList
StatusCode
SCTCalib::writeModuleListToCool(const std::map<Identifier, std::set<Identifier>>& moduleListAll,
const std::map<Identifier, std::set<Identifier>>& moduleListNew,
- const std::map<Identifier, std::set<Identifier>>& moduleListRef) {
+ const std::map<Identifier, std::set<Identifier>>& moduleListRef) const {
//--- Write out strips
float noisyStripThr{m_noisyStripThrDef?(m_noisyStripThrOffline):(m_noisyStripThrOnline)};
int nDefects{0};
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx
index 666bdb99b6984b5e34c1a6739024cd563809844b..9bc1e38ff96c802267640d366b421f09b0a3f9ac 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx
@@ -59,30 +59,17 @@ SCTCalibWriteTool::SCTCalibWriteTool(const std::string& type, const std::string&
AthAlgTool(type, name, parent),
m_eventInfoKey{"ByteStreamEventInfo"},
m_mutex{},
- m_attrListColl{0},
- m_attrListColl_deadStrip{0},
- m_attrListColl_deadChip{0},
- m_attrListColl_eff{0},
- m_attrListColl_no{0},
- m_attrListColl_RawOccu{0},
- m_attrListColl_BSErr{0},
- m_attrListColl_LA{0},
- //boolean properties
- m_writeCondObjs{true},
- m_regIOV{true},
- m_readWriteCool{true},
- m_twoStepWriteReg{false},
- m_manualiov{true},
-
+ m_attrListColl{nullptr},
+ m_attrListColl_deadStrip{nullptr},
+ m_attrListColl_deadChip{nullptr},
+ m_attrListColl_eff{nullptr},
+ m_attrListColl_no{nullptr},
+ m_attrListColl_RawOccu{nullptr},
+ m_attrListColl_BSErr{nullptr},
+ m_attrListColl_LA{nullptr},
m_version{0},
- m_beginRun{IOVTime::MINRUN},
- m_endRun{IOVTime::MAXRUN},
- m_streamName{"CondStreamTest"},
-
- m_regSvc{0},
- m_streamer{0},
- m_badIds{},
-
+ m_regSvc{nullptr},
+ m_streamer{nullptr},
m_defectRecorded{false},
m_deadStripRecorded{false},
m_deadChipRecorded{false},
@@ -91,18 +78,18 @@ SCTCalibWriteTool::SCTCalibWriteTool(const std::string& type, const std::string&
m_RawOccuRecorded{false},
m_BSErrRecorded{false},
m_LARecorded{false},
- m_pHelper{0}
+ m_pHelper{nullptr}
{
- declareProperty("WriteCondObjs", m_writeCondObjs);
- declareProperty("RegisterIOV", m_regIOV);
- declareProperty("ReadWriteCool", m_readWriteCool);
- declareProperty("TwoStepWriteReg", m_twoStepWriteReg);
- declareProperty("ManualIOV", m_manualiov);
-
- declareProperty("BeginRun", m_beginRun);
- declareProperty("EndRun", m_endRun);
+ declareProperty("WriteCondObjs", m_writeCondObjs=true);
+ declareProperty("RegisterIOV", m_regIOV=true);
+ declareProperty("ReadWriteCool", m_readWriteCool=true);
+ declareProperty("TwoStepWriteReg", m_twoStepWriteReg=false);
+ declareProperty("ManualIOV", m_manualiov=true);
+
+ declareProperty("BeginRun", m_beginRun=IOVTime::MINRUN);
+ declareProperty("EndRun", m_endRun=IOVTime::MAXRUN);
//string properties:
- declareProperty("StreamName", m_streamName);
+ declareProperty("StreamName", m_streamName="CondStreamTest");
declareProperty("TagID4NoisyStrips", m_tagID4NoisyStrips);
declareProperty("TagID4DeadStrips", m_tagID4DeadStrips);
declareProperty("TagID4DeadChips", m_tagID4DeadChips);
@@ -185,12 +172,6 @@ SCTCalibWriteTool::computeIstrip4moncond(const Identifier& elementId) const {
return 768*iiside + iistrip;
}
-StatusCode
-SCTCalibWriteTool::fillData() {
- // this is a dummy function
- return StatusCode::SUCCESS;
-}
-
//////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////
@@ -586,7 +567,7 @@ SCTCalibWriteTool::wrapUpNoiseOccupancy() {
StatusCode
SCTCalibWriteTool::wrapUpRawOccupancy() {
if (recordAndStream(m_attrListColl_RawOccu, s_RawOccuFolderName, m_RawOccuRecorded).isFailure()) return StatusCode::FAILURE;
- if( registerCondObjectsWithErrMsg(s_RawOccuFolderName, m_tagID4RawOccupancy).isFailure()) return StatusCode::FAILURE;
+ if (registerCondObjectsWithErrMsg(s_RawOccuFolderName, m_tagID4RawOccupancy).isFailure()) return StatusCode::FAILURE;
return StatusCode::SUCCESS;
}
@@ -649,7 +630,7 @@ SCTCalibWriteTool::streamOutCondObjectsWithErrMsg(const std::string& foldername)
///////////////////////////////////////////////////////////////////////////////////////
StatusCode
-SCTCalibWriteTool::registerCondObjects(const std::string& foldername,const std::string& tagname) {
+SCTCalibWriteTool::registerCondObjects(const std::string& foldername,const std::string& tagname) const {
// Register the IOV DB with the conditions data written out
if (m_readWriteCool) {
// Can only write out AttrList's if this is NOT write and reg in two steps
@@ -696,7 +677,7 @@ SCTCalibWriteTool::registerCondObjects(const std::string& foldername,const std::
///////////////////////////////////////////////////////////////////////////////////////
StatusCode
-SCTCalibWriteTool::registerCondObjectsWithErrMsg(const std::string& foldername,const std::string& tagname) {
+SCTCalibWriteTool::registerCondObjectsWithErrMsg(const std::string& foldername,const std::string& tagname) const {
if (m_regIOV) {
if (registerCondObjects(foldername,tagname).isFailure()) {
ATH_MSG_ERROR("Could not register " << foldername);
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx
index 6c44f98d6bd96b08da0ffc24034a148e5ffd7b2a..f8bf22718557c4e0ba0123ea1d9782bb06662360 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.cxx
@@ -37,9 +37,7 @@ static const int lastBSErrorType{14};
SCT_CalibBsErrorTool::SCT_CalibBsErrorTool(const std::string& type, const std::string& name, const IInterface* parent) :
base_class(type, name, parent),
- m_detStore{"DetectorStore", name},
- m_evtStore{"StoreGateSvc", name},
- m_pSCTHelper{0},
+ m_pSCTHelper{nullptr},
m_scterr_bec{0},
m_scterr_layer{0},
m_scterr_eta{0},
@@ -53,7 +51,7 @@ SCT_CalibBsErrorTool::SCT_CalibBsErrorTool(const std::string& type, const std::s
StatusCode
SCT_CalibBsErrorTool::initialize() {
ATH_CHECK(service("THistSvc", m_thistSvc));
- ATH_CHECK(m_detStore->retrieve(m_pSCTHelper, "SCT_ID"));
+ ATH_CHECK(detStore()->retrieve(m_pSCTHelper, "SCT_ID"));
ATH_CHECK(m_bytestreamErrorsTool.retrieve());
m_maxHash = m_pSCTHelper->wafer_hash_max();
@@ -85,13 +83,15 @@ SCT_CalibBsErrorTool::book() {
SCT_ID::const_id_iterator waferItrE{m_waferItrEnd};
for (; waferItr not_eq waferItrE; ++waferItr) {
Identifier waferId{*waferItr};
- const int bec{m_pSCTHelper->barrel_ec( waferId )};
+ const int bec{m_pSCTHelper->barrel_ec(waferId)};
const string formattedPosition{formatPosition(waferId, m_pSCTHelper)};
std::string histotitle{string{"SCT "} + detectorNames[bec2Index(bec)] + string{" BSErrors : plane "} + formattedPosition};
const std::string name{pathRoot+detectorPaths[bec2Index(m_pSCTHelper->barrel_ec(waferId))] + formattedPosition};
TH1F* hitmapHisto_tmp{new TH1F{TString{formattedPosition}, TString{histotitle}, n_BSErrorType, firstBSErrorType-0.5, lastBSErrorType+0.5}};
- if (m_thistSvc->regHist( name.c_str(), hitmapHisto_tmp ).isFailure()) ATH_MSG_ERROR("Error in booking BSErrors histogram");
- m_phistoVector.push_back( hitmapHisto_tmp );
+ if (m_thistSvc->regHist(name.c_str(), hitmapHisto_tmp).isFailure()) {
+ ATH_MSG_ERROR("Error in booking BSErrors histogram");
+ }
+ m_phistoVector.push_back(hitmapHisto_tmp);
}
return result;
}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h
index 6f0d0fadab74c549eb762cde781bae675898d136..183b25c52f0dd7c635ef91df5396ce57896a4479 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibBsErrorTool.h
@@ -13,7 +13,6 @@
//Athena includes
#include "AthenaBaseComps/AthAlgTool.h"
-#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "InDetIdentifier/SCT_ID.h"
@@ -43,14 +42,12 @@ class SCT_CalibBsErrorTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
//@name ISCT_CalibHistoSvc methods, reimplemented
//@{
virtual bool book();
- virtual bool read(const std::string & fileName);
+ virtual bool read(const std::string& fileName);
virtual bool fill(const bool fromData=false);
virtual bool fillFromData();
//@}
private:
- ServiceHandle<StoreGateSvc> m_detStore;
- ServiceHandle<StoreGateSvc> m_evtStore;
ToolHandle<ISCT_ByteStreamErrorsTool> m_bytestreamErrorsTool{this, "SCT_ByteStreamErrorsTool", "SCT_ByteStreamErrorsTool", "Tool to retrieve SCT ByteStream Errors"};
const SCT_ID* m_pSCTHelper;
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx
index cd4ff4d48331c237c12c8c293f60137875bb6c8d..6a7bf37050e353fb15374e3ac77d5c6537db5949 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx
@@ -54,10 +54,6 @@ SCT_CalibEventInfo::finalize() {
return StatusCode::SUCCESS;
}
-int SCT_CalibEventInfo::lumiBlock() const {
- return m_lumiBlock;
-}
-
void
SCT_CalibEventInfo::setTimeStamp(const int begin, const int end) {
m_timeStampBegin = begin;
@@ -67,15 +63,11 @@ SCT_CalibEventInfo::setTimeStamp(const int begin, const int end) {
m_tsEndString = toUtc(end);
}
-int SCT_CalibEventInfo::duration() const {
- return m_duration;
-}
-
void
SCT_CalibEventInfo::setTimeStamp(const std::string& begin, const std::string& end) {
int ibegin{std::stoi(begin)};
int iend{std::stoi(end)};
- setTimeStamp(ibegin,iend);
+ setTimeStamp(ibegin, iend);
}
void
@@ -84,21 +76,24 @@ SCT_CalibEventInfo::setTimeStamp(const int ts) {
}
void
-SCT_CalibEventInfo::getLumiBlock(int& begin, int& end) const {
- begin = m_LBBegin;
- end = m_LBEnd;
+SCT_CalibEventInfo::getTimeStamps(int& begin, int& end) const {
+ begin = m_timeStampBegin;
+ end = m_timeStampEnd;
}
void
-SCT_CalibEventInfo::setLumiBlock(const int begin, const int end) {
- m_LBBegin = begin;
- m_LBEnd = end;
- m_numLB = end-begin+1;
+SCT_CalibEventInfo::getTimeStamps(std::string& begin, std::string& end) const {
+ begin = m_tsBeginString;
+ end = m_tsEndString;
}
-void
-SCT_CalibEventInfo::setLumiBlock(const int lb) {
- m_lumiBlock = lb;
+int
+SCT_CalibEventInfo::timeStamp() const {
+ return m_timeStamp;
+}
+
+int SCT_CalibEventInfo::duration() const {
+ return m_duration;
}
void
@@ -107,30 +102,35 @@ SCT_CalibEventInfo::setSource(const std::string source) {
}
void
-SCT_CalibEventInfo::setRunNumber(const int rn) {
- m_runNumber = rn;
+SCT_CalibEventInfo::setLumiBlock(const int begin, const int end) {
+ m_LBBegin = begin;
+ m_LBEnd = end;
+ m_numLB = end-begin+1;
}
void
-SCT_CalibEventInfo::setBunchCrossing(const int bc) {
- m_bunchCrossing = bc;
+SCT_CalibEventInfo::setLumiBlock(const int lb) {
+ m_lumiBlock = lb;
}
void
-SCT_CalibEventInfo::getTimeStamps(std::string& begin, std::string& end) const {
- begin = m_tsBeginString;
- end = m_tsEndString;
+SCT_CalibEventInfo::getLumiBlock(int& begin, int& end) const {
+ begin = m_LBBegin;
+ end = m_LBEnd;
}
-void
-SCT_CalibEventInfo::getTimeStamps(int& begin, int& end) const {
- begin = m_timeStampBegin;
- end = m_timeStampEnd;
+int SCT_CalibEventInfo::lumiBlock() const {
+ return m_lumiBlock;
}
int
-SCT_CalibEventInfo::timeStamp() const {
- return m_timeStamp;
+SCT_CalibEventInfo::numLumiBlocks() const {
+ return m_numLB;
+}
+
+void
+SCT_CalibEventInfo::setRunNumber(const int rn) {
+ m_runNumber = rn;
}
int
@@ -138,9 +138,9 @@ SCT_CalibEventInfo::runNumber() const {
return m_runNumber;
}
-int
-SCT_CalibEventInfo::counter() const {
- return m_counter;
+void
+SCT_CalibEventInfo::setCounter(const int counterVal) {
+ m_counter = counterVal;
}
void
@@ -148,14 +148,14 @@ SCT_CalibEventInfo::incrementCounter() {
++m_counter;
}
-void
-SCT_CalibEventInfo::setCounter(const int counterVal) {
- m_counter = counterVal;
+int
+SCT_CalibEventInfo::counter() const {
+ return m_counter;
}
-int
-SCT_CalibEventInfo::numLumiBlocks() const {
- return m_numLB;
+void
+SCT_CalibEventInfo::setBunchCrossing(const int bc) {
+ m_bunchCrossing = bc;
}
std::string
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h
index d0318ed3be6428b28a2d8c7f91e61c0cbc6d8f7e..c245513fa077e3895ac1c673994983e521b8141c 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h
@@ -37,28 +37,29 @@ class SCT_CalibEventInfo: public extends<AthAlgTool, ISCT_CalibEvtInfo>
//@name ISCT_CalibEvtinfo interface methods, implemented
//@{
virtual void setTimeStamp(const int begin, const int end);
- virtual void setTimeStamp(const std::string & begin, const std::string & end);
+ virtual void setTimeStamp(const std::string& begin, const std::string& end);
virtual void setTimeStamp(const int ts);
+ virtual void getTimeStamps(int& begin, int& end) const;
+ virtual void getTimeStamps(std::string& begin, std::string& end) const;
+ virtual int timeStamp() const;
+ virtual int duration() const;
+
+ virtual void setSource(const std::string source);
- virtual void getLumiBlock(int & begin, int & end) const;
virtual void setLumiBlock(const int begin, const int end);
virtual void setLumiBlock(const int lb);
-
- virtual void setSource(const std::string source);
+ virtual void getLumiBlock(int& begin, int& end) const;
+ virtual int lumiBlock() const;
+ virtual int numLumiBlocks() const;
virtual void setRunNumber(const int rn);
- virtual void setBunchCrossing(const int bc);
+ virtual int runNumber() const;
+
virtual void setCounter(const int counterVal);
virtual void incrementCounter();
-
- virtual void getTimeStamps(int & begin, int & end) const;
- virtual void getTimeStamps(std::string & begin, std::string & end) const;
- virtual int timeStamp() const;
- virtual int duration() const;
- virtual int lumiBlock() const;
- virtual int runNumber() const;
virtual int counter() const;
- virtual int numLumiBlocks() const;
+
+ virtual void setBunchCrossing(const int bc);
//@}
private:
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
index 8e36090a7ac273c7645eac27868d4eef5a7ec56e..d3ee38ea9e5a566f2c2b2193071a1823904bc5ba 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
@@ -36,8 +36,6 @@ const static string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
SCT_CalibHitmapTool::SCT_CalibHitmapTool(const std::string& type, const std::string& name, const IInterface* parent):
base_class(type, name, parent),
- m_detStore{"DetectorStore", name},
- m_evtStore{"StoreGateSvc", name},
m_pSCTHelper{nullptr},
m_sct_waferHash{0},
m_sct_firstStrip{0},
@@ -48,7 +46,7 @@ SCT_CalibHitmapTool::SCT_CalibHitmapTool(const std::string& type, const std::str
StatusCode
SCT_CalibHitmapTool::initialize() {
- ATH_CHECK(m_detStore->retrieve(m_pSCTHelper, "SCT_ID"));
+ ATH_CHECK(detStore()->retrieve(m_pSCTHelper, "SCT_ID"));
//
m_waferItrBegin = m_pSCTHelper->wafer_begin();
m_waferItrEnd = m_pSCTHelper->wafer_end();
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h
index 0fa66d6ff69addaf5565422fea410fc4f33a5c65..46117f6d4c851c2b81c97be862cda7b282dd14c0 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.h
@@ -53,9 +53,6 @@ class SCT_CalibHitmapTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
//@}
private:
- ServiceHandle<StoreGateSvc> m_detStore;
- ServiceHandle<StoreGateSvc> m_evtStore;
-
const SCT_ID* m_pSCTHelper;
SCT_ID::const_id_iterator m_waferItrBegin;
SCT_ID::const_id_iterator m_waferItrEnd;
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
index 3828d7cacb4f44bbe1878d7621517dba0f81e43c..1239b093f586a28eaa4b8f5e71d8b73ce7b078df 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
@@ -30,8 +30,6 @@ namespace {
SCT_CalibHvTool::SCT_CalibHvTool(const std::string& type, const std::string& name, const IInterface* parent) :
base_class(type, name, parent),
- m_detStore{"DetectorStore", name},
- m_evtStore{"StoreGateSvc", name},
m_pSCTHelper{nullptr},
m_sct_waferHash{0},
m_sct_numHitsInWafer{0},
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h
index 15a4341ebbbf71bc6ef9d5332ef9bbf1967aac13..60cd5ff9b15c41e5a50a83b87a1b7e3f2fe71527 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.h
@@ -13,7 +13,6 @@
//Athena includes
#include "AthenaBaseComps/AthAlgTool.h"
-#include "StoreGate/StoreGateSvc.h"
//Inner detector includes
#include "InDetIdentifier/SCT_ID.h"
@@ -24,7 +23,6 @@
// Gaudi includes
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
//STL includes
#include <string>
@@ -63,8 +61,6 @@ class SCT_CalibHvTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
n_BSErrorType = 15, firstBSErrorType = 0, lastBSErrorType = 14
};
- ServiceHandle<StoreGateSvc> m_detStore;
- ServiceHandle<StoreGateSvc> m_evtStore;
ToolHandle<ISCT_DCSConditionsTool> m_DCSConditionsTool{this, "SCT_DCSConditionsTool", "SCT_DCSConditionsTool", "Tool to retrieve SCT DCS information"};
const SCT_ID* m_pSCTHelper;
@@ -97,7 +93,7 @@ class SCT_CalibHvTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
int m_lowHitCut;
///retrieve a tool and report if it failed
template<class T>
- bool retrievedTool(T & tool, const std::string & toolName) {
+ bool retrievedTool(T& tool, const std::string& toolName) const {
if (tool.retrieve().isFailure()) {
ATH_MSG_ERROR("Unable to retrieve " << toolName);
return false;
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx
index 32cd4b7d0db4528e968521dc449a9392f7021159..17a1b8670184b5a24d52a1a78be0a67cb62661b3 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx
@@ -46,9 +46,6 @@ static const string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
SCT_CalibLbTool::SCT_CalibLbTool(const std::string& type, const std::string& name, const IInterface* parent):
base_class(type, name, parent),
- m_detStore{"DetectorStore", name},
- m_evtStore{"StoreGateSvc", name},
- m_evtInfo{"SCT_CalibEventInfo", name},
m_pSCTHelper{nullptr},
m_pManager{nullptr},
m_sct_waferHash{0},
@@ -66,8 +63,8 @@ StatusCode
SCT_CalibLbTool::initialize() {
ATH_MSG_INFO("Initialize of " << PACKAGE_VERSION);
ATH_CHECK(service("THistSvc", m_thistSvc));
- ATH_CHECK(m_detStore->retrieve(m_pSCTHelper, "SCT_ID"));
- ATH_CHECK(m_detStore->retrieve(m_pManager, "SCT"));
+ ATH_CHECK(detStore()->retrieve(m_pSCTHelper, "SCT_ID"));
+ ATH_CHECK(detStore()->retrieve(m_pManager, "SCT"));
std::pair<std::string, bool> msgCode{retrievedTool(m_evtInfo)};
if (not msgCode.second) {
ATH_MSG_ERROR(msgCode.first);
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h
index 8ca36c824daf666d4dcd6a59883323a35dec4642..0ec1456490ac5f61f37607e5259aacb366f9bb30 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h
@@ -13,9 +13,7 @@
//Athena includes
#include "AthenaBaseComps/AthAlgTool.h"
-#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/ReadHandleKey.h"
-#include "GaudiKernel/ToolHandle.h"
#include "SCT_CalibAlgs/ISCT_CalibEvtInfo.h"
#include "InDetRawData/SCT_RDO_Container.h"
@@ -25,6 +23,9 @@
//local includes
#include "SCT_CalibAlgs/ISCT_CalibHistoTool.h"
+//Gaudi includes
+#include "GaudiKernel/ToolHandle.h"
+
//STL includes
#include <atomic>
#include <string>
@@ -58,9 +59,7 @@ class SCT_CalibLbTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
//@}
private:
- ServiceHandle<StoreGateSvc> m_detStore;
- ServiceHandle<StoreGateSvc> m_evtStore;
- ServiceHandle<ISCT_CalibEvtInfo> m_evtInfo;
+ ToolHandle<ISCT_CalibEvtInfo> m_evtInfo{this, "SCT_CalibEvtInfo", "SCT_CalibEvtInfo"};
const SCT_ID* m_pSCTHelper;
const InDetDD::SCT_DetectorManager* m_pManager;
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx
index 0cbbed15031456f263eddf71519a4a59fc06bf1c..bb5c39831d17afd72e77c397beebef4222410c5f 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.cxx
@@ -7,7 +7,6 @@
SCT_CalibModuleListTool::SCT_CalibModuleListTool(const std::string& type, const std::string& name, const IInterface* parent):
base_class(type, name, parent),
m_pSCTHelper{nullptr},
- m_detStore{"DetectorStore", name},
m_IOVDbSvc{"IOVDbSvc", name}
{
}
@@ -15,7 +14,7 @@ SCT_CalibModuleListTool::SCT_CalibModuleListTool(const std::string& type, const
StatusCode SCT_CalibModuleListTool::initialize() {
ATH_MSG_DEBUG("Initializing SCT_CalibModuleListTool");
- ATH_CHECK(m_detStore->retrieve(m_pSCTHelper, "SCT_ID"));
+ ATH_CHECK(detStore()->retrieve(m_pSCTHelper, "SCT_ID"));
ATH_CHECK(m_MonitorConditionsTool.retrieve());
ATH_CHECK(m_IOVDbSvc.retrieve());
@@ -26,7 +25,7 @@ StatusCode SCT_CalibModuleListTool::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode SCT_CalibModuleListTool::readModuleList(std::map<Identifier, std::set<Identifier>>& moduleList) {
+StatusCode SCT_CalibModuleListTool::readModuleList(std::map<Identifier, std::set<Identifier>>& moduleList) const {
//--- Read strips using SCT_MonitorConditionsSvc
SCT_ID::const_id_iterator waferIdItr{m_pSCTHelper->wafer_begin()};
SCT_ID::const_id_iterator waferIdItrE{m_pSCTHelper->wafer_end()};
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h
index 2de3a743f576ee6764073b7fb6c264ca0dd136dc..e0ade40160f2e64a6951dff2eee1941474434ed3 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibModuleListTool.h
@@ -43,11 +43,10 @@ class SCT_CalibModuleListTool : public extends<AthAlgTool, ISCT_CalibModuleListT
virtual StatusCode initialize();
virtual StatusCode finalize();
//@}
- virtual StatusCode readModuleList(std::map<Identifier, std::set<Identifier>>& moduleList);
+ virtual StatusCode readModuleList(std::map<Identifier, std::set<Identifier>>& moduleList) const;
private:
const SCT_ID* m_pSCTHelper;
- ServiceHandle<StoreGateSvc> m_detStore;
ToolHandle<ISCT_MonitorConditionsTool> m_MonitorConditionsTool{this, "SCT_MonitorConditionsTool", "SCT_MonitorConditionsTool/InDetSCT_MonitorConditionsTool", "Tool to retrieve noisy strip information"};
ServiceHandle<IIOVDbSvc> m_IOVDbSvc;
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.cxx b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.cxx
index 309644374436d0b2fc339b63b01fd54207c7a967..a896010a4d8dc358cf1f91b143a1e52cb1fe682b 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.cxx
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.cxx
@@ -20,7 +20,7 @@ SCT_ByteStreamFractionContainerCnv::createPersistent(SCT_ByteStreamFractionConta
SCT_ByteStreamFractionContainer*
SCT_ByteStreamFractionContainerCnv::createTransient() {
MsgStream log(msgSvc(), "SCT_ByteStreamFractionContainerCnv" );
- static pool::Guid p1_guid("EB75984C-F651-4F40-BA1C-9C2A0A558A55");
+ const pool::Guid p1_guid("EB75984C-F651-4F40-BA1C-9C2A0A558A55");
if( compareClassGuid(p1_guid) ) {
/** using auto_ptr ensures deletion of the persistent object */
std::auto_ptr< SCT_ByteStreamFractionContainer_p1 > col_vect( poolReadObject< SCT_ByteStreamFractionContainer_p1 >() );
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx
index 41879063b3fad1ba28a550e2fa4fb191228ca113..cd8b13726c5da7da95f7396f8ceee4eeb56f8143 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx
@@ -8,15 +8,17 @@
#include <memory>
-template <class T>
-static std::vector<T>
-string2Vector(const std::string& s) {
- std::vector<T> v;
- std::istringstream inputStream{s};
- std::istream_iterator<T> vecRead{inputStream};
- std::istream_iterator<T> endOfString; //relies on default constructor to produce eof
- std::copy(vecRead,endOfString, std::back_inserter(v)); // DOESN'T ALLOW NON-WHITESPACE DELIMITER !
- return v;
+namespace {
+ template <class T>
+ std::vector<T>
+ string2Vector(const std::string& s) {
+ std::vector<T> v;
+ std::istringstream inputStream{s};
+ std::istream_iterator<T> vecRead{inputStream};
+ std::istream_iterator<T> endOfString; //relies on default constructor to produce eof
+ std::copy(vecRead,endOfString, std::back_inserter(v)); // DOESN'T ALLOW NON-WHITESPACE DELIMITER !
+ return v;
+ }
}
SCT_ModuleVetoCondAlg::SCT_ModuleVetoCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
index 8ceee2302dbb3da89c754d51338399b71668e835..f1e516fd71ae96a6230b379502b90179264cb6eb 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
@@ -5,7 +5,6 @@
#include "SCT_TdaqEnabledCondAlg.h"
#include "Identifier/IdentifierHash.h"
-#include "SCT_Cabling/SCT_OnlineId.h"
#include "GaudiKernel/EventIDRange.h"
@@ -14,6 +13,7 @@
SCT_TdaqEnabledCondAlg::SCT_TdaqEnabledCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
: ::AthReentrantAlgorithm(name, pSvcLocator)
, m_condSvc{"CondSvc", name}
+ , m_onlineId{}
{
}
@@ -94,7 +94,7 @@ StatusCode SCT_TdaqEnabledCondAlg::execute(const EventContext& ctx) const
unsigned int rodNumber{parseChannelName(chanName)};
// range check on the rod channel number has been removed, since it refers both to existing channel names
// which can be rods in slots 1-128 but also historical names which have since been removed
- if (SCT_OnlineId::rodIdInRange(rodNumber)) {
+ if (m_onlineId.rodIdInRange(rodNumber)) {
if ((not enabled.empty()) and (not writeCdo->setGoodRod(rodNumber))) {
ATH_MSG_WARNING("Set insertion failed for rod "<<rodNumber);
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h
index 6822548b0f23ee8d1e63c07e801334da40405050..d2836a3009967deb06e5261dbcae542f86e6a2e4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h
@@ -9,6 +9,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "SCT_Cabling/ISCT_CablingTool.h"
+#include "SCT_Cabling/SCT_OnlineId.h"
#include "SCT_ConditionsData/SCT_TdaqEnabledCondData.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/WriteCondHandleKey.h"
@@ -35,6 +36,8 @@ class SCT_TdaqEnabledCondAlg : public AthReentrantAlgorithm
ServiceHandle<ICondSvc> m_condSvc;
ToolHandle<ISCT_CablingTool> m_cablingTool{this, "SCT_CablingTool", "SCT_CablingTool", "Tool to retrieve SCT Cabling"};
+ SCT_OnlineId m_onlineId;
+
static const unsigned int s_NRODS;
static const unsigned int s_modulesPerRod;
static const unsigned int s_earliestRunForFolder;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
index 73dc39b601c963585d397b743cc6cfa875622c9c..6f3c6525d757d1c3c5a57d2406b0b6de8bdf84cc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaBaseComps
Control/StoreGate
- Event/EventInfo
Event/xAOD/xAODEventInfo
Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
@@ -37,14 +36,14 @@ find_package( GMock )
atlas_add_component ( SCT_ConditionsTools
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel Identifier GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests EventInfo xAODEventInfo SCT_ConditionsData InDetByteStreamErrors InDetIdentifier InDetReadoutGeometry SCT_CablingLib SiPropertiesToolLib SCT_ConditionsToolsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel Identifier GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests xAODEventInfo SCT_ConditionsData InDetByteStreamErrors InDetIdentifier InDetReadoutGeometry SCT_CablingLib SiPropertiesToolLib SCT_ConditionsToolsLib )
atlas_add_library( SCT_ConditionsToolsLib
src/*.cxx
PUBLIC_HEADERS SCT_ConditionsTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel Identifier GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests EventInfo xAODEventInfo SCT_ConditionsData SiPropertiesToolLib InDetByteStreamErrors InDetIdentifier InDetReadoutGeometry SCT_CablingLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel Identifier GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests xAODEventInfo SCT_ConditionsData SiPropertiesToolLib InDetByteStreamErrors InDetIdentifier InDetReadoutGeometry SCT_CablingLib )
# Add unit tests
atlas_add_test( SCT_RODVetoTool_test
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
index 5e629ca4b09e44f6d435dd755ad8fefcca0af63d..2c971cbeffc2a6593fe26697f5dc22234d282bbf 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
@@ -30,7 +30,6 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelUtilities
DetectorDescription/Identifier
- Event/EventInfo
Event/xAOD/xAODEventInfo
InnerDetector/InDetConditions/InDetCoolCoralClientUtils
InnerDetector/InDetDetDescr/InDetIdentifier
@@ -50,7 +49,7 @@ atlas_add_library( TRT_ConditionsServicesLib
PUBLIC_HEADERS TRT_ConditionsServices
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaBaseComps AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo EventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry PathResolver )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaBaseComps AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry PathResolver )
atlas_add_component( TRT_ConditionsServices
src/components/*.cxx
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx
index 285e51981ec2000e45f70efa9bfd1ae3d48158f9..be20e1a694704359470adc64608055d0156e2a2a 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*----------------------------------------------------
@@ -9,9 +9,6 @@
// Header Includes
#include "GaudiKernel/IIncidentSvc.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
#include "TRT_DAQ_ConditionsSvc.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -28,13 +25,11 @@ TRT_DAQ_ConditionsSvc::TRT_DAQ_ConditionsSvc( const std::string& name, ISvcLocat
AthService( name, pSvcLocator ),
m_evtStore("StoreGateSvc",name),
m_detStore("DetectorStore",name),
- m_EventInfoKey("ByteStreamEventInfo"),
m_FolderName(run1FolderName),
m_TRT_ID_Helper(0),
m_EnabledRods(0)
{
// Get properties from job options
- declareProperty( "EventInfoKey", m_EventInfoKey );
declareProperty( "FolderName", m_FolderName );
declareProperty( "EventStore", m_evtStore );
declareProperty( "DetectorStore", m_detStore );
@@ -223,51 +218,10 @@ void TRT_DAQ_ConditionsSvc::handle( const Incident& inc ) {
// BeginEvent handler
if ( inc.type() == "BeginEvent" ) {
-
// Retrieve COOL Folder at beginning of event to cut down on StoreGate accesses.
// Contents won't change during event.
sc= m_detStore->retrieve( m_EnabledRods, m_FolderName );
if (sc.isFailure()) ATH_MSG_ERROR("The folder "<<m_FolderName<<" could not be retrieved");
-
-
- /* FOR TESTING THE CALLBACK
- // Get the run number
- const EventInfo* evtInfo;
- sc = m_evtStore->retrieve(evtInfo,m_EventInfoKey);
- if ( sc.isFailure() || !evtInfo ) {
- ATH_MSG_WARNING( "Couldn't get " << m_EventInfoKey << " from StoreGate." );
- return;
- }
- if ( !evtInfo->event_ID() ) {
- ATH_MSG_WARNING( m_EventInfoKey << " object has no EventID object." );
- return;
- }
- int runNum = evtInfo->event_ID()->run_number();
- int lumiBlock = evtInfo->event_ID()->lumi_block();
-
- ATH_MSG_INFO( "Run " << runNum << ", lumiblock " << lumiBlock );
- */
-
- /* FOR TESTING FOLDER ACCESS
- CondAttrListCollection::name_const_iterator chanNameMapItr;
- if ( m_EnabledRods->name_size() == 0 ) {
- ATH_MSG_FATAL( "This CondAttrListCollection has no entries in it's ChanNameMap." );
- return;
- }
- for ( chanNameMapItr = m_EnabledRods->name_begin();
- chanNameMapItr != m_EnabledRods->name_end(); ++chanNameMapItr ) {
- int chanNum = (*chanNameMapItr).first;
- std::string chanName = (*chanNameMapItr).second;
- CondAttrListCollection::iov_const_iterator chanIOVPair;
- chanIOVPair = m_EnabledRods->chanIOVPair( chanNum );
- if ( chanIOVPair == m_EnabledRods->iov_end() ) {
- ATH_MSG_INFO( "Channel " << chanNum << " (" << chanName << ") not found." );
- return;
- }
- ATH_MSG_INFO( "Channel " << chanNum << " (" << chanName << ") enabled in this event." );
- }
- */
-
}
return;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.h
index 096cf161981a4e1ea04647012f8f30f1cd1d585b..0e1d29c39e9e9b7a2a1bd94ff048de64074f393a 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_DAQ_ConditionsSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_DAQ_CONDITIONSSVC_H
@@ -70,7 +70,6 @@ class TRT_DAQ_ConditionsSvc : public AthService,
ServiceHandle<StoreGateSvc> m_detStore;
// jobOptions properties
- std::string m_EventInfoKey;
std::string m_FolderName;
// Straw Helpers
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/SCT_OnlineId.h b/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/SCT_OnlineId.h
index b8d328d9d431b8aeeeb2b3c5a6479684093f2482..73938ec07793746e68a81df5198d065fd1e39df2 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/SCT_OnlineId.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/SCT_OnlineId.h
@@ -58,7 +58,7 @@ public:
unsigned int index() const;
///Is the rod in range?
- static bool rodIdInRange(std::uint32_t r);
+ bool rodIdInRange(std::uint32_t r) const;
///constants for evaluating hash indices of the online id. The hashing formula is in 'index()'
enum {
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx
index c1b55e48d42ed2f23a8715644e9c0aea6c8b5aff..d5f737e206913221be79247a08eb6f541bcb3013 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_OnlineId.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*
* SCT_OnlineId.cxx
@@ -90,7 +90,7 @@ bool SCT_OnlineId::fibreInRange(std::uint32_t f) const{
}
//
-bool SCT_OnlineId::rodIdInRange(std::uint32_t r) {
+bool SCT_OnlineId::rodIdInRange(std::uint32_t r) const {
const std::uint32_t lowestRodId(0x210000);
const std::uint32_t highestRodId=0x24010F;
return ((r >=lowestRodId) and (r<=highestRodId)) ;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
index 71730b7c224a08719bf80417a2e201b834eb0aca..1aa1e1e716e8a157cc23a26dd9db801e496fa4fa 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
@@ -19,7 +19,7 @@ atlas_depends_on_subdirs(
PRIVATE
Database/AthenaPOOL/AthenaPoolUtilities
DetectorDescription/GeoPrimitives
- Event/EventInfo
+ Event/xAOD/xAODEventInfo
Event/EventPrimitives
InnerDetector/InDetConditions/InDetConditionsSummaryService
InnerDetector/InDetConditions/PixelConditionsServices
@@ -44,7 +44,7 @@ atlas_add_component( PixelMonitoring
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib AtlasDetDescr
GaudiKernel InDetRawData InDetPrepRawData LumiBlockCompsLib TrkTrack
- AthenaPoolUtilities GeoPrimitives EventInfo EventPrimitives InDetIdentifier
+ AthenaPoolUtilities GeoPrimitives xAODEventInfo EventPrimitives InDetIdentifier
InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkParameters TrkSpacePoint
TrkTrackSummary TrkToolInterfaces PixelCablingLib PixelGeoModelLib PathResolver
InDetTrackSelectionToolLib )
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
index 12e994d3993773bc19f67338ddb8677ea2c59c9f..b7a41aeaa2fb216260c52502d3be969b38858f91 100755
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PIXMAINMON_H_
@@ -21,7 +21,6 @@
#include "AtlasDetDescr/AtlasDetectorID.h"
#include "LumiBlockComps/ILuminosityTool.h"
#include "PixelGeoModel/IBLParameterSvc.h"
-#include "EventInfo/EventInfo.h"
#include "xAODEventInfo/EventInfo.h"
#include "StoreGate/ReadHandleKey.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
@@ -211,7 +210,6 @@ class PixelMainMon : public ManagedMonitorToolBase {
SG::ReadHandleKey<TrackCollection> m_TracksName;
SG::ReadHandleKey<InDetTimeCollection> m_PixelBCIDName;
SG::ReadHandleKey<xAOD::EventInfo> m_eventxAODInfoKey;
- SG::ReadHandleKey<EventInfo> m_eventInfoKey;
std::string m_detector_error_name;
std::string m_histTitleExt;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
index 82130edd0202bf4e866e375c310019ddfcda86a1..50c90a7378d3c1399edc86d53ad25550d14cfacc 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
@@ -31,7 +31,6 @@
#include "PixelMonitoring/PixelMon2DProfilesLW.h"
#include "PixelMonitoring/PixelMonModules.h"
-#include "EventInfo/TriggerInfo.h"
#include "PixelCabling/IPixelCablingSvc.h"
///////////////////////////////////////////////////////////////////////////////
@@ -470,11 +469,11 @@ StatusCode PixelMainMon::fillHitsMon(void) // Called once per event
}
int lvl1idATLAS(-1);
- auto thisEventInfo = SG::makeHandle(m_eventInfoKey);
+ SG::ReadHandle<xAOD::EventInfo> thisEventInfo(m_eventxAODInfoKey);
if(!(thisEventInfo.isValid())) {
ATH_MSG_WARNING("No EventInfo object found");
} else {
- lvl1idATLAS = (int)((thisEventInfo->trigger_info()->extendedLevel1ID()) & 0xf);
+ lvl1idATLAS = (int)((thisEventInfo->extendedLevel1ID()) & 0xf);
}
// retrieve Pixel RDO container from storegate
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
index 7482d602487a6488208ee098bd8f33cfaa85db42..67a8b1c8a7bd1521e043f3d5570bb1f839703c06 100755
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////////////////
@@ -130,7 +130,6 @@ PixelMainMon::PixelMainMon(const std::string& type, const std::string& name, con
m_currentTime = 0;
m_runNum = 0;
m_idHelper = 0;
- m_eventInfoKey = "ByteStreamEventInfo";
m_eventxAODInfoKey = "EventInfo";
// Initalize all pointers for histograms
@@ -387,7 +386,6 @@ StatusCode PixelMainMon::initialize() {
ATH_CHECK(m_Pixel_SiClustersName.initialize());
ATH_CHECK(m_TracksName.initialize());
ATH_CHECK(m_PixelBCIDName.initialize());
- ATH_CHECK(m_eventInfoKey.initialize());
ATH_CHECK(m_eventxAODInfoKey.initialize());
// Retrieve tools
if (detStore()->retrieve(m_pixelid, "PixelID").isFailure()) {
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt
index 2a00f918142fac684220d6fb1eb14012fce695b1..089e390212a8c4c83eab515cf6aaf04716d13836 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt
@@ -18,7 +18,6 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthContainers
DetectorDescription/AtlasDetDescr
DetectorDescription/Identifier
- Event/EventInfo
Event/EventPrimitives
Event/xAOD/xAODEventInfo
Event/xAOD/xAODTrigger
@@ -43,7 +42,7 @@ atlas_add_component( TRT_Monitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaMonitoringLib GaudiKernel InDetRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo xAODTrigger EventInfo EventPrimitives TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaMonitoringLib GaudiKernel InDetRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo xAODTrigger EventPrimitives TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces )
# Install files from the package:
atlas_install_headers( TRT_Monitoring )
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/TRT_Monitoring/TRT_Monitoring_Tool.h b/InnerDetector/InDetMonitoring/TRT_Monitoring/TRT_Monitoring/TRT_Monitoring_Tool.h
index 905d285c7524f28fe5c4c141e36ba67a78381fe9..b52230686c726aad22d4ac6f7fc570e3d88f6d93 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/TRT_Monitoring/TRT_Monitoring_Tool.h
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/TRT_Monitoring/TRT_Monitoring_Tool.h
@@ -1,6 +1,6 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_MONITORING_TOOL_H
@@ -12,7 +12,6 @@
// Data handles
#include "StoreGate/ReadHandleKey.h"
#include "TrkTrack/TrackCollection.h"
-#include "EventInfo/EventInfo.h"
#include "CommissionEvent/ComTime.h"
#include "xAODTrigger/TrigDecision.h"
#include "xAODEventInfo/EventInfo.h"
@@ -158,7 +157,6 @@ private:
SG::ReadHandleKey<TrackCollection> m_trackCollectionKey{this, "TRTTracksObjectName", "Tracks", "Name of tracks container"};
// NOTE: this property is not used anywhere, is it ok to change its name?
SG::ReadHandleKey<TrackCollection> m_combTrackCollectionKey{this, "track_collection_hole_finder", "CombinedInDetTracks", "Name of tracks container used for hole finder"};
- SG::ReadHandleKey<EventInfo> m_eventInfoKey{this, "EventInfo", "ByteStreamEventInfo", "Name of EventInfo object"};
SG::ReadHandleKey<xAOD::EventInfo> m_xAODEventInfoKey{this, "xAODEventInfo", "EventInfo", "Name of EventInfo object"};
SG::ReadHandleKey<InDetTimeCollection> m_TRT_BCIDCollectionKey{this, "TRTBCIDCollectionName", "TRT_BCID", "Name of TRT BCID collection"};
SG::ReadHandleKey<ComTime> m_comTimeObjectKey{this, "ComTimeObjectName", "TRT_Phase", "Name of ComTime object"};
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx
index b54aad98739063dcf72dd9b9f9c400d0235d600f..e0a57db301f6e6fab56c9f3d245a3feff556bffa 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TRT_Monitoring/TRT_Monitoring_Tool.h"
@@ -21,8 +21,6 @@
#include "TRT_ConditionsServices/ITRT_ByteStream_ConditionsSvc.h"
#include "TRT_ConditionsServices/ITRT_StrawNeighbourSvc.h"
#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
-#include "EventInfo/TriggerInfo.h"
-#include "EventInfo/EventID.h"
#include "xAODTrigger/TrigDecision.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
@@ -609,7 +607,6 @@ StatusCode TRT_Monitoring_Tool::initialize() {
ATH_CHECK( m_rdoContainerKey.initialize() );
ATH_CHECK( m_trackCollectionKey.initialize() );
ATH_CHECK( m_combTrackCollectionKey.initialize() );
- ATH_CHECK( m_eventInfoKey.initialize() );
ATH_CHECK( m_xAODEventInfoKey.initialize() );
ATH_CHECK( m_TRT_BCIDCollectionKey.initialize() );
ATH_CHECK( m_comTimeObjectKey.initialize() );
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/CMakeLists.txt b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/CMakeLists.txt
index 7a98df7a123745de020cd617a69ab734f1d27585..a62acee4850ceddc8c9f4d24729c7fa5ec5a1443 100644
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/CMakeLists.txt
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/CMakeLists.txt
@@ -7,6 +7,7 @@ atlas_subdir( InDetCompetingRIOsOnTrack )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
+ Control/CxxUtils
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
Tracking/TrkEvent/TrkCompetingRIOsOnTrack
PRIVATE
@@ -21,6 +22,6 @@ atlas_add_library( InDetCompetingRIOsOnTrack
src/*.cxx
PUBLIC_HEADERS InDetCompetingRIOsOnTrack
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES InDetRIO_OnTrack TrkCompetingRIOsOnTrack
+ LINK_LIBRARIES CxxUtils InDetRIO_OnTrack TrkCompetingRIOsOnTrack
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel TrkSurfaces )
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h
index 1d3aa42df21389815d02d35285ec73ed4f9689ea..b4051ac6e2f0a175e3a308ff9799e5e34de21e18 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h
@@ -11,8 +11,8 @@
// Trk
#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
+#include "CxxUtils/CachedUniquePtr.h"
#include "InDetRIO_OnTrack/PixelClusterOnTrack.h" // cannot forward declare
-#include <atomic>
#include <iosfwd>
class MsgStream;
@@ -104,7 +104,7 @@ private:
/** The global Position */
- mutable std::atomic<const Amg::Vector3D*> m_globalPosition;
+ CxxUtils::CachedUniquePtr<const Amg::Vector3D> m_globalPosition;
/** The vector of contained InDet::PixelClusterOnTrack objects */
std::vector<const InDet::PixelClusterOnTrack*>* m_containedChildRots;
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingSCT_ClustersOnTrack.h b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingSCT_ClustersOnTrack.h
index 4d535d492964fe1228d70c2e50fb4fceb3682d91..5f4b07ee0a6af0f4cafaea76862089b656414402 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingSCT_ClustersOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingSCT_ClustersOnTrack.h
@@ -12,9 +12,9 @@
// Trk
#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
#include "InDetRIO_OnTrack/SCT_ClusterOnTrack.h" // cannot fwd-declare because of covariant method
+#include "CxxUtils/CachedUniquePtr.h"
#include <iosfwd>
-#include <atomic>
class MsgStream;
@@ -106,7 +106,7 @@ private:
/** The global position */
- mutable std::atomic<const Amg::Vector3D*> m_globalPosition;
+ CxxUtils::CachedUniquePtr<const Amg::Vector3D> m_globalPosition;
/** The vector of contained InDet::SCT_ClusterOnTrack objects */
std::vector<const InDet::SCT_ClusterOnTrack*>* m_containedChildRots;
@@ -138,14 +138,10 @@ inline const InDet::SCT_ClusterOnTrack& CompetingSCT_ClustersOnTrack::rioOnTrack
}
inline const Amg::Vector3D& CompetingSCT_ClustersOnTrack::globalPosition() const {
- const Amg::Vector3D* ptr = m_globalPosition.load();
- if(ptr) return *ptr;
- const Amg::Vector3D* newptr = associatedSurface().localToGlobal(localParameters());
- if(m_globalPosition.compare_exchange_strong(ptr, newptr)){
- return *newptr; //new object is now stored in m_globalPosition
+ if (not m_globalPosition) {
+ m_globalPosition.set(std::unique_ptr<const Amg::Vector3D>(associatedSurface().localToGlobal(localParameters())));
}
- delete newptr; //Object was created on another thread, while this was running, so this is now unneeded.
- return *ptr; //ptr was replaced with other object by compare_exchange_strong, this is now returned.
+ return *m_globalPosition;
}
inline unsigned int CompetingSCT_ClustersOnTrack::numberOfContainedROTs() const {
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h
index 22fe614c83a6441b9ec45cd5b0c3c4fce9de589c..177d5c07648553ef4c40530d8ee950161e5b831c 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h
@@ -12,6 +12,7 @@
// Trk
#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
#include "InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h"
+#include "CxxUtils/CachedUniquePtr.h"
#include <atomic>
#include <iosfwd>
@@ -109,7 +110,7 @@ namespace InDet {
const Trk::Surface* m_associatedSurface;
//! The global Position
- mutable std::atomic<const Amg::Vector3D*> m_globalPosition;
+ CxxUtils::CachedUniquePtr<const Amg::Vector3D> m_globalPosition;
//! The vector of contained InDet::TRT_DriftCircleOnTrack objects
std::vector<const InDet::TRT_DriftCircleOnTrack*>* m_containedChildRots;
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx
index b3b8234e1d2e6df6e5f726cdd2d91c22e634a515..047359f83a5f4af8ad70cd49a50d1ca374045032 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -15,20 +15,23 @@
// default constructor
InDet::CompetingPixelClustersOnTrack::CompetingPixelClustersOnTrack():
Trk::CompetingRIOsOnTrack(),
- m_globalPosition(0),
+ m_globalPosition{},
m_containedChildRots(0)
{}
// copy constructor
InDet::CompetingPixelClustersOnTrack::CompetingPixelClustersOnTrack(const InDet::CompetingPixelClustersOnTrack& compROT) :
Trk::CompetingRIOsOnTrack(compROT),
- m_globalPosition(compROT.m_globalPosition ? new Amg::Vector3D(*compROT.m_globalPosition) : 0),
+ m_globalPosition{},
m_containedChildRots(0) {
m_containedChildRots = new std::vector< const InDet::PixelClusterOnTrack* >;
std::vector< const InDet::PixelClusterOnTrack* >::const_iterator rotIter = compROT.m_containedChildRots->begin();
for (; rotIter!=compROT.m_containedChildRots->end(); ++rotIter) {
m_containedChildRots->push_back((*rotIter)->clone());
}
+ if (compROT.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*compROT.m_globalPosition));
+ }
}
// explicit constructor
@@ -38,7 +41,7 @@ InDet::CompetingPixelClustersOnTrack::CompetingPixelClustersOnTrack(
)
:
Trk::CompetingRIOsOnTrack( assgnProb),
- m_globalPosition(0),
+ m_globalPosition{},
m_containedChildRots(childrots)
{
// initialize local position and error matrix
@@ -52,9 +55,11 @@ InDet::CompetingPixelClustersOnTrack& InDet::CompetingPixelClustersOnTrack::oper
// clear rots
clearChildRotVector();
delete m_containedChildRots;
- delete m_globalPosition;
+ if (m_globalPosition) delete m_globalPosition.release().get();
m_containedChildRots = new std::vector<const InDet::PixelClusterOnTrack*>;
- m_globalPosition = compROT.m_globalPosition ? new Amg::Vector3D(*compROT.m_globalPosition) : 0;
+ if (compROT.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*compROT.m_globalPosition));
+ }
std::vector<const InDet::PixelClusterOnTrack*>::const_iterator rotIter = compROT.m_containedChildRots->begin();
for (; rotIter!=compROT.m_containedChildRots->end(); ++rotIter)
m_containedChildRots->push_back((*rotIter)->clone());
@@ -69,16 +74,15 @@ InDet::CompetingPixelClustersOnTrack& InDet::CompetingPixelClustersOnTrack::oper
// clear rots
clearChildRotVector();
delete m_containedChildRots;
- delete m_globalPosition;
+ if (m_globalPosition) delete m_globalPosition.release().get();
m_containedChildRots = compROT.m_containedChildRots;
compROT.m_containedChildRots = nullptr;
- m_globalPosition = compROT.m_globalPosition.exchange(nullptr, std::memory_order_relaxed);
+ m_globalPosition = std::move(compROT.m_globalPosition);
}
return (*this);
}
InDet::CompetingPixelClustersOnTrack::~CompetingPixelClustersOnTrack() {
- delete m_globalPosition;
clearChildRotVector();
delete m_containedChildRots;
}
@@ -95,7 +99,7 @@ MsgStream& InDet::CompetingPixelClustersOnTrack::dump( MsgStream& out ) const {
<< "] competing Pixel RIO_OnTrack objects" << std::endl;
Trk::CompetingRIOsOnTrack::dump(out);
out << " - GlobalPosition : ";
- if (m_globalPosition==NULL) out << "null pointer"<<std::endl;
+ if (not m_globalPosition) out << "null pointer"<<std::endl;
else out << *m_globalPosition<<endmsg;
return out;
}
@@ -106,7 +110,7 @@ std::ostream& InDet::CompetingPixelClustersOnTrack::dump( std::ostream& out ) co
<< "] competing Pixel RIO_OnTrack objects" << std::endl;
Trk::CompetingRIOsOnTrack::dump(out);
out << " - GlobalPosition : ";
- if (m_globalPosition==NULL) out << "null pointer"<<std::endl;
+ if (not m_globalPosition) out << "null pointer"<<std::endl;
else out << *m_globalPosition<<std::endl;
return out;
}
@@ -117,13 +121,8 @@ bool InDet::CompetingPixelClustersOnTrack::ROTsHaveCommonSurface(const bool) con
}
const Amg::Vector3D& InDet::CompetingPixelClustersOnTrack::globalPosition() const {
- const Amg::Vector3D* ptr = m_globalPosition.load();
- if(ptr) return *ptr;
- const Amg::Vector3D* newptr = associatedSurface().localToGlobal(localParameters());
- if(m_globalPosition.compare_exchange_strong(ptr, newptr)){
- return *newptr; //new object is now stored in m_globalPosition
+ if (not m_globalPosition) {
+ m_globalPosition.set(std::unique_ptr<const Amg::Vector3D>(associatedSurface().localToGlobal(localParameters())));
}
- delete newptr; //Object was created on another thread, while this was running, so this is now unneeded.
- return *ptr; //ptr was replaced with other object by compare_exchange_strong, this is now returned.
+ return *m_globalPosition;
}
-
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingSCT_ClustersOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingSCT_ClustersOnTrack.cxx
index ac3bdd91975da90dfdc5a9730fc9df3b8ed21b2a..5460461be317ad76859bbdd4c50e06591ef6f098 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingSCT_ClustersOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingSCT_ClustersOnTrack.cxx
@@ -18,7 +18,7 @@
// default constructor
InDet::CompetingSCT_ClustersOnTrack::CompetingSCT_ClustersOnTrack():
Trk::CompetingRIOsOnTrack(),
- m_globalPosition(nullptr),
+ m_globalPosition{},
m_containedChildRots(0)
//
{}
@@ -26,13 +26,16 @@ InDet::CompetingSCT_ClustersOnTrack::CompetingSCT_ClustersOnTrack():
// copy constructor
InDet::CompetingSCT_ClustersOnTrack::CompetingSCT_ClustersOnTrack(const InDet::CompetingSCT_ClustersOnTrack& compROT) :
Trk::CompetingRIOsOnTrack(compROT),
- m_globalPosition(compROT.m_globalPosition ? new Amg::Vector3D(*compROT.m_globalPosition) : nullptr),
+ m_globalPosition{},
m_containedChildRots(0) {
m_containedChildRots = new std::vector< const InDet::SCT_ClusterOnTrack* >;
std::vector< const InDet::SCT_ClusterOnTrack* >::const_iterator rotIter = compROT.m_containedChildRots->begin();
for (; rotIter!=compROT.m_containedChildRots->end(); ++rotIter) {
m_containedChildRots->push_back((*rotIter)->clone());
}
+ if (compROT.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*compROT.m_globalPosition));
+ }
}
// explicit constructor
@@ -43,7 +46,7 @@ InDet::CompetingSCT_ClustersOnTrack::CompetingSCT_ClustersOnTrack(
):
Trk::CompetingRIOsOnTrack(assgnProb),
-m_globalPosition(nullptr),
+m_globalPosition{},
m_containedChildRots(childrots)
{
// initialize local position and error matrix
@@ -58,14 +61,16 @@ InDet::CompetingSCT_ClustersOnTrack& InDet::CompetingSCT_ClustersOnTrack::operat
// clear rots
clearChildRotVector();
delete m_containedChildRots;
- delete m_globalPosition;
+ if (m_globalPosition) delete m_globalPosition.release().get();
m_containedChildRots = new std::vector<const InDet::SCT_ClusterOnTrack*>;
std::vector<const InDet::SCT_ClusterOnTrack*>::const_iterator rotIter = compROT.m_containedChildRots->begin();
for (; rotIter!=compROT.m_containedChildRots->end(); ++rotIter)
m_containedChildRots->push_back((*rotIter)->clone());
- m_globalPosition = compROT.m_globalPosition ? new Amg::Vector3D(*compROT.m_globalPosition) : nullptr;
+ if (compROT.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*compROT.m_globalPosition));
+ }
}
return (*this);
}
@@ -73,7 +78,6 @@ InDet::CompetingSCT_ClustersOnTrack& InDet::CompetingSCT_ClustersOnTrack::operat
InDet::CompetingSCT_ClustersOnTrack::~CompetingSCT_ClustersOnTrack() {
clearChildRotVector();
delete m_containedChildRots;
- delete m_globalPosition;
}
void InDet::CompetingSCT_ClustersOnTrack::clearChildRotVector() {
@@ -90,8 +94,8 @@ MsgStream& InDet::CompetingSCT_ClustersOnTrack::dump( MsgStream& out ) const {
"over different surfaces") << " (given prob>cut)" << std::endl;
Trk::CompetingRIOsOnTrack::dump(out);
out << " - GlobalPosition : ";
- if (m_globalPosition==nullptr) out << "null pointer"<<endmsg;
- else out << *m_globalPosition<<endmsg;
+ if (not m_globalPosition) out << "null pointer"<<endmsg;
+ else out << *m_globalPosition << endmsg;
return out;
}
@@ -103,8 +107,8 @@ std::ostream& InDet::CompetingSCT_ClustersOnTrack::dump( std::ostream& out ) con
"over different surfaces") << " (given prob>cut)" << std::endl;
Trk::CompetingRIOsOnTrack::dump(out);
out << " - GlobalPosition : ";
- if (m_globalPosition==nullptr) out << "null pointer"<<std::endl;
- else out << *m_globalPosition<<std::endl;
+ if (not m_globalPosition) out << "null pointer"<<std::endl;
+ else out << *m_globalPosition << std::endl;
return out;
}
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx
index d56f06d795ef6df1ccf63f915a7e34699202a7f4..36cb7590723d46d05782040b50e12a1bbf75b6db 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx
@@ -20,14 +20,14 @@
InDet::CompetingTRT_DriftCirclesOnTrack::CompetingTRT_DriftCirclesOnTrack():
Trk::CompetingRIOsOnTrack(),
m_associatedSurface(0),
- m_globalPosition(0),
+ m_globalPosition{},
m_containedChildRots(0),
m_ROTsHaveCommonSurface(8) {}
// copy constructor
InDet::CompetingTRT_DriftCirclesOnTrack::CompetingTRT_DriftCirclesOnTrack(const InDet::CompetingTRT_DriftCirclesOnTrack& compROT) :
Trk::CompetingRIOsOnTrack(compROT),
- m_globalPosition(compROT.m_globalPosition ? new Amg::Vector3D(*(compROT.m_globalPosition.load())) : 0),
+ m_globalPosition{},
m_containedChildRots(0),
m_ROTsHaveCommonSurface(compROT.m_ROTsHaveCommonSurface.load()) {
if (compROT.m_associatedSurface) {
@@ -41,6 +41,9 @@ InDet::CompetingTRT_DriftCirclesOnTrack::CompetingTRT_DriftCirclesOnTrack(const
for (; rotIter!=compROT.m_containedChildRots->end(); ++rotIter) {
m_containedChildRots->push_back((*rotIter)->clone());
}
+ if (compROT.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*(compROT.m_globalPosition)));
+ }
}
// explicit constructor
@@ -56,7 +59,7 @@ InDet::CompetingTRT_DriftCirclesOnTrack::CompetingTRT_DriftCirclesOnTrack(
):
Trk::CompetingRIOsOnTrack(assgnProb),
m_associatedSurface(sf),
- m_globalPosition(0),
+ m_globalPosition{},
m_containedChildRots(childrots),
m_ROTsHaveCommonSurface(ROTsHaveComSrfc)
{
@@ -75,7 +78,7 @@ InDet::CompetingTRT_DriftCirclesOnTrack& InDet::CompetingTRT_DriftCirclesOnTrack
// clear rots
clearChildRotVector();
delete m_containedChildRots;
- delete m_globalPosition;
+ if (m_globalPosition) delete m_globalPosition.release().get();
// delete surface if not owned by detElement
if (m_associatedSurface && !m_associatedSurface->associatedDetectorElement())
delete m_associatedSurface;
@@ -86,7 +89,7 @@ InDet::CompetingTRT_DriftCirclesOnTrack& InDet::CompetingTRT_DriftCirclesOnTrack
} else {
m_associatedSurface = 0;
}
- m_globalPosition = compROT.m_globalPosition ? new Amg::Vector3D(*compROT.m_globalPosition) : 0;
+ if (compROT.m_globalPosition) m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*compROT.m_globalPosition));
m_ROTsHaveCommonSurface = compROT.m_ROTsHaveCommonSurface.load();
std::vector<const InDet::TRT_DriftCircleOnTrack*>::const_iterator rotIter = compROT.m_containedChildRots->begin();
for (; rotIter!=compROT.m_containedChildRots->end(); ++rotIter)
@@ -97,9 +100,9 @@ InDet::CompetingTRT_DriftCirclesOnTrack& InDet::CompetingTRT_DriftCirclesOnTrack
InDet::CompetingTRT_DriftCirclesOnTrack::~CompetingTRT_DriftCirclesOnTrack() {
// delete surface if not owned by detElement
- if (m_associatedSurface && !m_associatedSurface->associatedDetectorElement())
+ if (m_associatedSurface && !m_associatedSurface->associatedDetectorElement()) {
delete m_associatedSurface;
- delete m_globalPosition;
+ }
clearChildRotVector();
delete m_containedChildRots;
}
@@ -118,8 +121,8 @@ MsgStream& InDet::CompetingTRT_DriftCirclesOnTrack::dump( MsgStream& out ) const
"over different surfaces") << " (given prob>cut)" << std::endl;
Trk::CompetingRIOsOnTrack::dump(out);
out << " - GlobalPosition : ";
- if (m_globalPosition==NULL) out << "null pointer"<<endmsg;
- else out << *m_globalPosition<<endmsg;
+ if (not m_globalPosition) out << "null pointer" << endmsg;
+ else out << *m_globalPosition << endmsg;
return out;
}
@@ -131,8 +134,8 @@ std::ostream& InDet::CompetingTRT_DriftCirclesOnTrack::dump( std::ostream& out )
"over different surfaces") << " (given prob>cut)" << std::endl;
Trk::CompetingRIOsOnTrack::dump(out);
out << " - GlobalPosition : ";
- if (m_globalPosition==NULL) out << "null pointer"<<std::endl;
- else out << *m_globalPosition<<std::endl;
+ if (not m_globalPosition) out << "null pointer" << std::endl;
+ else out << *m_globalPosition << std::endl;
return out;
}
@@ -155,8 +158,7 @@ bool InDet::CompetingTRT_DriftCirclesOnTrack::ROTsHaveCommonSurface(const bool w
const Amg::Vector3D& InDet::CompetingTRT_DriftCirclesOnTrack::globalPosition() const {
- auto ptr = m_globalPosition.load();
- if (ptr) return (*ptr);
+ if (m_globalPosition) return *m_globalPosition;
// cannot use the localToGlobal transformation, because the local z-coordinate along
// the wire is not known here. The contained TRT_DriftCircleOnTrack use the full
// transformation => use the weighted mean of their GlobalPositions
@@ -179,13 +181,8 @@ const Amg::Vector3D& InDet::CompetingTRT_DriftCirclesOnTrack::globalPosition() c
} else {
globalPos = (*m_containedChildRots->begin())->globalPosition();
}
- auto newptr = new Amg::Vector3D(globalPos);
- if(m_globalPosition.compare_exchange_strong(ptr, newptr)){
- return *newptr; //new object is now stored in m_globalPosition for other threads
- }
- assert(ptr != nullptr);
- delete newptr; //Object was created on another thread, while this was running, so this is now unneeded.
- return *ptr; //ptr was replaced with other object by compare_exchange_strong, this is now returned.
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(globalPos));
+ return *m_globalPosition;
}
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/CMakeLists.txt b/InnerDetector/InDetRecEvent/InDetPrepRawData/CMakeLists.txt
index 15f4c0a5e7ae421ff9b1dd70b66187dfb2ecf998..2149394712e477415f048a4ab7b972ccdc024c3a 100644
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/CMakeLists.txt
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/CMakeLists.txt
@@ -8,6 +8,7 @@ atlas_subdir( InDetPrepRawData )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthLinks
+ Control/CxxUtils
Control/SGTools
DetectorDescription/GeoPrimitives
DetectorDescription/Identifier
@@ -28,12 +29,12 @@ atlas_add_library( InDetPrepRawData
PUBLIC_HEADERS InDetPrepRawData
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthLinks SGTools GeoPrimitives Identifier EventPrimitives GaudiKernel InDetReadoutGeometry TrkSurfaces TrkEventPrimitives TrkPrepRawData
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthLinks CxxUtils SGTools GeoPrimitives Identifier EventPrimitives GaudiKernel InDetReadoutGeometry TrkSurfaces TrkEventPrimitives TrkPrepRawData
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( InDetPrepRawDataDict
InDetPrepRawData/InDetPrepRawDataDict.h
InDetPrepRawData/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthLinks SGTools GeoPrimitives Identifier EventPrimitives GaudiKernel InDetReadoutGeometry TrkSurfaces TrkEventPrimitives TrkPrepRawData InDetPrepRawData EventContainers )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthLinks CxxUtils SGTools GeoPrimitives Identifier EventPrimitives GaudiKernel InDetReadoutGeometry TrkSurfaces TrkEventPrimitives TrkPrepRawData InDetPrepRawData EventContainers )
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.h b/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.h
index fc668b7f792dc15ea05ebeef043931a87f02bec7..a479fe3f0e118b198f5af6c96e3c4fb7fb51a7fe 100755
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.h
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SiCluster.h
@@ -19,12 +19,13 @@
// Base class
#include "TrkPrepRawData/PrepRawData.h"
+#include "CxxUtils/CachedUniquePtr.h"
#include "Identifier/Identifier.h"
#include "InDetPrepRawData/SiWidth.h"
#include "InDetReadoutGeometry/SiDetectorElement.h" // cant be forward declared
#include "TrkSurfaces/Surface.h"
-#include <atomic>
+#include <memory>
class PixelClusterContainerCnv;
class SCT_ClusterContainerCnv;
@@ -113,7 +114,7 @@ class SiCluster : public Trk::PrepRawData {
private:
InDet::SiWidth m_width; //col, row, and width in mm
- mutable std::atomic<const Amg::Vector3D*> m_globalPosition;
+ CxxUtils::CachedUniquePtr<const Amg::Vector3D> m_globalPosition;
bool m_gangedPixel;
const InDetDD::SiDetectorElement* m_detEl;
@@ -134,14 +135,8 @@ inline const InDet::SiWidth& SiCluster::width() const
// return globalPosition:
inline const Amg::Vector3D& SiCluster::globalPosition() const
{
- if (m_globalPosition==nullptr) {
- const Amg::Vector3D* expected{nullptr};
- const Amg::Vector3D* desired{m_detEl->surface(identify()).localToGlobal(localPosition())};
- if (not m_globalPosition.compare_exchange_strong(expected, desired)) {
- // This happens if more than one threads try to set m_globalPosition.
- delete desired;
- desired = nullptr;
- }
+ if (not m_globalPosition) {
+ m_globalPosition.set(std::unique_ptr<const Amg::Vector3D>(m_detEl->surface(identify()).localToGlobal(localPosition())));
}
return *m_globalPosition;
}
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SiCluster.cxx b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SiCluster.cxx
index 004125d0d9b63bf154de9fbdb151bea9acc2cac9..67382e4eae4a39f545af996096c4e12403d1e4c7 100755
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SiCluster.cxx
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SiCluster.cxx
@@ -28,7 +28,7 @@ SiCluster::SiCluster(
) :
PrepRawData(RDOId, locpos, rdoList, locErrMat), //call base class constructor
m_width(width),
- m_globalPosition(0),
+ m_globalPosition{},
m_gangedPixel(0),
m_detEl(detEl) {}
@@ -44,21 +44,20 @@ SiCluster::SiCluster(
std::move(rdoList),
std::move(locErrMat)), //call base class constructor
m_width(width),
- m_globalPosition(0),
+ m_globalPosition{},
m_gangedPixel(0),
m_detEl(detEl) {}
// Destructor:
SiCluster::~SiCluster()
{
- delete m_globalPosition;
// do not delete m_detEl since owned by DetectorStore
}
// Default constructor:
SiCluster::SiCluster():
PrepRawData(),
- m_globalPosition(0),
+ m_globalPosition{},
m_gangedPixel(0),
m_detEl(0)
{}
@@ -67,34 +66,37 @@ SiCluster::SiCluster():
SiCluster::SiCluster(const SiCluster& RIO):
PrepRawData( RIO ),
m_width( RIO.m_width ),
- m_globalPosition( 0 ),
+ m_globalPosition{},
m_gangedPixel( RIO.m_gangedPixel ),
m_detEl( RIO.m_detEl )
{
- // copy only if it exists
- m_globalPosition = (RIO.m_globalPosition) ? new Amg::Vector3D(*RIO.m_globalPosition) : 0;
+ // copy only if it exists
+ if (RIO.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<Amg::Vector3D>(*RIO.m_globalPosition));
+ }
}
//move constructor:
SiCluster::SiCluster(SiCluster&& RIO):
PrepRawData( std::move(RIO) ),
m_width( std::move(RIO.m_width) ),
- m_globalPosition( RIO.m_globalPosition.load() ),
+ m_globalPosition( std::move(RIO.m_globalPosition) ),
m_gangedPixel( RIO.m_gangedPixel ),
m_detEl( RIO.m_detEl )
{
- RIO.m_globalPosition = nullptr;
}
//assignment operator
SiCluster& SiCluster::operator=(const SiCluster& RIO){
- if (&RIO !=this) {
+ if (&RIO !=this) {
Trk::PrepRawData::operator= (RIO);
- delete m_globalPosition;
m_width = RIO.m_width;
- m_globalPosition = (RIO.m_globalPosition) ? new Amg::Vector3D(*RIO.m_globalPosition) : 0;
+ if (m_globalPosition) delete m_globalPosition.release().get();
+ if (RIO.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<Amg::Vector3D>(*RIO.m_globalPosition));
+ }
m_gangedPixel = RIO.m_gangedPixel;
m_detEl = RIO.m_detEl ;
}
@@ -105,12 +107,11 @@ SiCluster& SiCluster::operator=(const SiCluster& RIO){
SiCluster& SiCluster::operator=(SiCluster&& RIO){
if (&RIO !=this) {
Trk::PrepRawData::operator= (std::move(RIO));
- delete m_globalPosition;
- m_width = RIO.m_width;
- m_globalPosition = RIO.m_globalPosition.load();
- RIO.m_globalPosition = nullptr;
- m_gangedPixel = RIO.m_gangedPixel;
- m_detEl = RIO.m_detEl ;
+ m_width = RIO.m_width;
+ if (m_globalPosition) delete m_globalPosition.release().get();
+ m_globalPosition = std::move(RIO.m_globalPosition);
+ m_gangedPixel = RIO.m_gangedPixel;
+ m_detEl = RIO.m_detEl ;
}
return *this;
}
@@ -122,8 +123,8 @@ MsgStream& SiCluster::dump( MsgStream& stream) const
// have to do a lot of annoying checking to make sure that PRD is valid.
{
stream << "at global coordinates (x,y,z) = ("<<this->globalPosition().x()<<", "
- <<this->globalPosition().y()<<", "
- <<this->globalPosition().z()<<")"<<std::endl;
+ <<this->globalPosition().y()<<", "
+ <<this->globalPosition().z()<<")"<<std::endl;
}
if ( gangedPixel()==true )
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/CMakeLists.txt b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/CMakeLists.txt
index f14486e6c059075931db0334b48dbfee53c34603..c356fc192d6bc098777486ec7290288ff4af1bd6 100644
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/CMakeLists.txt
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/CMakeLists.txt
@@ -8,6 +8,7 @@ atlas_subdir( InDetRIO_OnTrack )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthLinks
+ Control/CxxUtils
DetectorDescription/Identifier
GaudiKernel
InnerDetector/InDetRecEvent/InDetPrepRawData
@@ -27,12 +28,12 @@ atlas_add_library( InDetRIO_OnTrack
src/*.cxx
PUBLIC_HEADERS InDetRIO_OnTrack
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthLinks Identifier GaudiKernel InDetPrepRawData TrkEventPrimitives TrkRIO_OnTrack EventContainers EventPrimitives
+ LINK_LIBRARIES AthLinks CxxUtils Identifier GaudiKernel InDetPrepRawData TrkEventPrimitives TrkRIO_OnTrack EventContainers EventPrimitives
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} InDetReadoutGeometry TrkSurfaces )
atlas_add_dictionary( InDetRIO_OnTrackDict
InDetRIO_OnTrack/InDetRIO_OnTrackDict.h
InDetRIO_OnTrack/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks Identifier GaudiKernel InDetPrepRawData TrkEventPrimitives TrkRIO_OnTrack InDetReadoutGeometry TrkSurfaces InDetRIO_OnTrack EventContainers EventPrimitives)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks CxxUtils Identifier GaudiKernel InDetPrepRawData TrkEventPrimitives TrkRIO_OnTrack InDetReadoutGeometry TrkSurfaces InDetRIO_OnTrack EventContainers EventPrimitives)
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/SiClusterOnTrack.h b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/SiClusterOnTrack.h
index 709cb650c9af341c673b73b72eaa46b918fcfaa8..da6123160f8bef0d128ebcfdb443d5cf8bd8b5da 100755
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/SiClusterOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/SiClusterOnTrack.h
@@ -10,10 +10,9 @@
#define TRKRIO_ONTRACK_SICLUSTERONTRACK_H
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
+#include "CxxUtils/CachedUniquePtr.h"
#include "Identifier/IdentifierHash.h"
-#include <atomic>
-
class SiClusterOnTrackCnv_p1;
namespace Trk
@@ -103,7 +102,7 @@ namespace InDet {
/** The IdentifierHash - probably not used*/
IdentifierHash m_idDE;
/** The global position */
- mutable std::atomic<const Amg::Vector3D*> m_globalPosition; // This may be replaced by CachedUniquePtr
+ CxxUtils::CachedUniquePtr<const Amg::Vector3D> m_globalPosition;
bool m_isbroad;
};
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h
index 98c8522e6d5c1095087b7355c0fd52dd27cddd6f..23a148021599efe77f560aec708229928c99665a 100755
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h
@@ -11,9 +11,9 @@
// Base classes
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
+#include "CxxUtils/CachedUniquePtr.h"
#include "TrkEventPrimitives/DriftCircleStatus.h"
#include "TrkEventPrimitives/DriftCircleSide.h"
-#include "GaudiKernel/GaudiException.h"
// InDet
@@ -22,6 +22,8 @@
#include "InDetPrepRawData/TRT_DriftCircleContainer.h"
#include "AthLinks/ElementLink.h"
+#include "GaudiKernel/GaudiException.h"
+
#include <atomic>
namespace Trk {
@@ -158,7 +160,7 @@ namespace InDet{
void setGlobalPosition(Amg::Vector3D& loc3Dframe) const;
/** global position to be cached */
- mutable std::atomic<const Amg::Vector3D*> m_globalPosition; // This may be replaced by CachedUniquePtr
+ CxxUtils::CachedUniquePtr<const Amg::Vector3D> m_globalPosition;
/**local angle to be written out */
mutable std::atomic<float> m_localAngle;
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SCT_ClusterOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SCT_ClusterOnTrack.cxx
index d1bcf1e158baa2c3b9de13c512a21385eaf4ca48..dfda5beff5c8be6102741774fefd4b7f0a5ead7b 100755
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SCT_ClusterOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SCT_ClusterOnTrack.cxx
@@ -90,12 +90,12 @@ void InDet::SCT_ClusterOnTrack::setValues(const Trk::TrkDetElementBase* detEl, c
const Amg::Vector3D& InDet::SCT_ClusterOnTrack::globalPosition() const
{
//checking whether the globalposition is available
- if(!m_globalPosition)
+ if (not m_globalPosition)
{
// calculate global position from the position of the strip and the position along the strip
Amg::Vector2D lpos( localParameters().get(Trk::locX), m_positionAlongStrip );
- m_globalPosition = detectorElement()->surface( identify() ).localToGlobal( lpos );
+ m_globalPosition.set(std::unique_ptr<const Amg::Vector3D>(detectorElement()->surface( identify() ).localToGlobal( lpos )));
}
return (*m_globalPosition);
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SiClusterOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SiClusterOnTrack.cxx
index acde8bb4711cee286e9db09525dc970d84ed6435..357c703d42af0cb8f4173deb3bc911d767f48053 100755
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SiClusterOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/SiClusterOnTrack.cxx
@@ -6,13 +6,14 @@
// SiClusterOnTrack.cxx, (c) ATLAS Detector software
///////////////////////////////////////////////////////////////////
-#include <new>
#include "InDetRIO_OnTrack/SiClusterOnTrack.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
#include "TrkEventPrimitives/LocalParameters.h"
#include "TrkSurfaces/Surface.h"
#include "InDetPrepRawData/SiCluster.h"
#include "GaudiKernel/MsgStream.h"
+#include <memory>
+#include <new>
#include <ostream>
#include <typeinfo>
@@ -25,7 +26,7 @@ InDet::SiClusterOnTrack::SiClusterOnTrack( const Trk::LocalParameters& locpars,
bool isbroad) :
RIO_OnTrack(locpars, locerr, id), //call base class constructor
m_idDE(idDE),
- m_globalPosition(0),
+ m_globalPosition{},
m_isbroad(isbroad)
{}
@@ -39,7 +40,7 @@ InDet::SiClusterOnTrack::SiClusterOnTrack( const Trk::LocalParameters& locpars,
:
RIO_OnTrack(locpars, locerr, id), //call base class constructor
m_idDE(idDE),
- m_globalPosition( new Amg::Vector3D(globalPosition) ),
+ m_globalPosition(std::make_unique<Amg::Vector3D>(globalPosition)),
m_isbroad(isbroad)
{}
@@ -47,14 +48,13 @@ InDet::SiClusterOnTrack::SiClusterOnTrack( const Trk::LocalParameters& locpars,
// Destructor:
InDet::SiClusterOnTrack::~SiClusterOnTrack()
{
- delete m_globalPosition;
}
// Default constructor:
InDet::SiClusterOnTrack::SiClusterOnTrack():
Trk::RIO_OnTrack(),
m_idDE(),
- m_globalPosition(),
+ m_globalPosition{},
m_isbroad(false)
{}
@@ -63,17 +63,23 @@ InDet::SiClusterOnTrack::SiClusterOnTrack( const SiClusterOnTrack& rot)
:
RIO_OnTrack(rot),
m_idDE(rot.m_idDE),
- m_globalPosition(rot.m_globalPosition ? new Amg::Vector3D(*rot.m_globalPosition) : 0),
+ m_globalPosition{},
m_isbroad(rot.m_isbroad)
-{}
+{
+ if (rot.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*(rot.m_globalPosition)));
+ }
+}
// assignment operator:
InDet::SiClusterOnTrack& InDet::SiClusterOnTrack::operator=( const SiClusterOnTrack& rot){
if ( &rot != this) {
- delete m_globalPosition;
- Trk::RIO_OnTrack::operator=(rot);
+ delete m_globalPosition.release().get();
+ Trk::RIO_OnTrack::operator=(rot);
m_idDE = rot.m_idDE;
- m_globalPosition = rot.m_globalPosition ? new Amg::Vector3D(*rot.m_globalPosition) : 0;
+ if (rot.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*(rot.m_globalPosition)));
+ }
m_isbroad = rot.m_isbroad;
}
return *this;
@@ -84,16 +90,10 @@ InDet::SiClusterOnTrack& InDet::SiClusterOnTrack::operator=( const SiClusterOnTr
const Amg::Vector3D& InDet::SiClusterOnTrack::globalPosition() const
{
- if (m_globalPosition==nullptr) {
- const Amg::Vector3D* expected{nullptr};
- const Amg::Vector3D* desired{associatedSurface().localToGlobal(localParameters())};
- if (not m_globalPosition.compare_exchange_strong(expected, desired)) {
- // This happens if more than one threads try to set m_globalPosition.
- delete desired;
- desired = nullptr;
- }
+ if (not m_globalPosition) {
+ m_globalPosition.set(std::unique_ptr<const Amg::Vector3D>(associatedSurface().localToGlobal(localParameters())));
}
- return (*m_globalPosition);
+ return (*m_globalPosition);
}
MsgStream& InDet::SiClusterOnTrack::dump( MsgStream& sl ) const
@@ -104,7 +104,7 @@ MsgStream& InDet::SiClusterOnTrack::dump( MsgStream& sl ) const
sl << "Global position (x,y,z) = (";
this->globalPosition();
- if ( m_globalPosition !=0 )
+ if (m_globalPosition)
{
sl <<this->globalPosition().x()<<", "
<<this->globalPosition().y()<<", "
@@ -124,7 +124,7 @@ std::ostream& InDet::SiClusterOnTrack::dump( std::ostream& sl ) const
sl << "Global position (x,y,z) = (";
this->globalPosition();
- if ( m_globalPosition !=0 )
+ if (m_globalPosition)
{
sl <<this->globalPosition().x()<<", "
<<this->globalPosition().y()<<", "
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/TRT_DriftCircleOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/TRT_DriftCircleOnTrack.cxx
index f1875eb771ecb5e1c27ec7db4acee58844c9a201..f4ecaafff05d6b1e5d850b4e8dddfdd0148bdb67 100755
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/TRT_DriftCircleOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/src/TRT_DriftCircleOnTrack.cxx
@@ -13,11 +13,14 @@
#include "TrkEventPrimitives/LocalParameters.h"
#include "TrkSurfaces/Surface.h"
#include "TrkSurfaces/StraightLineSurface.h"
-#include <cassert>
+
#include "GaudiKernel/MsgStream.h"
-#include <ostream>
-#include <limits>
+#include <cassert>
+#include <limits>
+#include <memory>
+#include <ostream>
+#include <utility>
// Constructor with parameters:
InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack(
@@ -30,7 +33,7 @@ InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack(
const Trk::DriftCircleStatus status)
:
Trk::RIO_OnTrack(driftRadius, errDriftRadius, RIO->identify()), //call base class constructor
- m_globalPosition(0),
+ m_globalPosition{},
m_positionAlongWire(predictedLocZ),
m_idDE(idDE),
m_status(status),
@@ -40,7 +43,7 @@ InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack(
{
m_rio.setElement(RIO);
const Trk::StraightLineSurface* slsf = dynamic_cast<const Trk::StraightLineSurface*>(&(m_detEl->surface(RIO->identify())));
- if(slsf) m_globalPosition = slsf->localToGlobal(driftRadius, predictedTrackDirection, predictedLocZ);
+ if (slsf) m_globalPosition.set(std::unique_ptr<const Amg::Vector3D>(slsf->localToGlobal(driftRadius, predictedTrackDirection, predictedLocZ)));
Amg::Vector3D loc_gDirection = predictedTrackDirection;
const double dr = driftRadius[Trk::driftRadius];
//scaling the direction with drift radius
@@ -52,13 +55,13 @@ InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack(
// Destructor:
InDet::TRT_DriftCircleOnTrack::~TRT_DriftCircleOnTrack()
-{ delete m_globalPosition; }
+{}
// default constructor:
InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack()
:
Trk::RIO_OnTrack(),
- m_globalPosition(0),
+ m_globalPosition{},
m_localAngle(std::numeric_limits<float>::quiet_NaN()),
m_positionAlongWire(std::numeric_limits<float>::quiet_NaN()),
m_rio(),
@@ -81,7 +84,7 @@ InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack
bool highLevel,
double timeOverThreshold)
: Trk::RIO_OnTrack (driftRadius, errDriftRadius, id),
- m_globalPosition(nullptr),
+ m_globalPosition{},
m_localAngle(localAngle),
m_positionAlongWire(predictedLocZ),
m_rio(RIO),
@@ -96,7 +99,7 @@ InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack
//copy constructor:
InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack( const InDet::TRT_DriftCircleOnTrack& rot):
Trk::RIO_OnTrack(rot),
- m_globalPosition(rot.m_globalPosition ? new Amg::Vector3D(*rot.m_globalPosition.load()) : 0 ),
+ m_globalPosition{},
m_localAngle(rot.m_localAngle.load()),
m_positionAlongWire(rot.m_positionAlongWire.load()),
m_rio(rot.m_rio),
@@ -105,15 +108,21 @@ InDet::TRT_DriftCircleOnTrack::TRT_DriftCircleOnTrack( const InDet::TRT_DriftCir
m_highLevel(rot.m_highLevel),
m_timeOverThreshold(rot.m_timeOverThreshold),
m_detEl(rot.m_detEl)
-{}
+{
+ if (rot.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*(rot.m_globalPosition)));
+ }
+}
//assignment operator:
InDet::TRT_DriftCircleOnTrack& InDet::TRT_DriftCircleOnTrack::operator=( const InDet::TRT_DriftCircleOnTrack& rot)
{
if ( &rot != this) {
Trk::RIO_OnTrack::operator= (rot);
- delete m_globalPosition;
- m_globalPosition = (rot.m_globalPosition ? new Amg::Vector3D(*rot.m_globalPosition) : 0);
+ if (m_globalPosition) delete m_globalPosition.release().get();
+ if (rot.m_globalPosition) {
+ m_globalPosition.set(std::make_unique<const Amg::Vector3D>(*(rot.m_globalPosition)));
+ }
m_rio = rot.m_rio;
m_localAngle = rot.m_localAngle.load();
m_positionAlongWire = rot.m_positionAlongWire.load();
@@ -131,8 +140,8 @@ InDet::TRT_DriftCircleOnTrack& InDet::TRT_DriftCircleOnTrack::operator=( InDet::
{
if ( &rot != this) {
Trk::RIO_OnTrack::operator= (rot);
- delete m_globalPosition;
- m_globalPosition = rot.m_globalPosition.load();
+ if (m_globalPosition) delete m_globalPosition.release().get();
+ m_globalPosition = std::move(rot.m_globalPosition);
m_rio = rot.m_rio;
m_localAngle = rot.m_localAngle.load();
m_positionAlongWire = rot.m_positionAlongWire.load();
@@ -161,15 +170,7 @@ const Trk::Surface& InDet::TRT_DriftCircleOnTrack::associatedSurface() const
void InDet::TRT_DriftCircleOnTrack::setGlobalPosition(Amg::Vector3D& loc3Dframe) const{
const Trk::StraightLineSurface* slsf = dynamic_cast<const Trk::StraightLineSurface*>( &(associatedSurface()) );
if(slsf) {
- delete m_globalPosition;
- m_globalPosition = nullptr;
- const Amg::Vector3D* expected{nullptr};
- const Amg::Vector3D* desired{new Amg::Vector3D(slsf->transform() * loc3Dframe)};
- if (not m_globalPosition.compare_exchange_strong(expected, desired)) {
- // This happens if more than one threads try to set m_globalPosition.
- delete desired;
- desired = nullptr;
- }
+ m_globalPosition.set(std::make_unique<Amg::Vector3D>(slsf->transform() * loc3Dframe));
}else{
throw GaudiException("Dynamic_cast to StraightLineSurface failed!",
"TRT_DriftCircleOnTrack::setGlobalPosition()",
@@ -184,7 +185,7 @@ void InDet::TRT_DriftCircleOnTrack::setValues(const Trk::TrkDetElementBase* detE
const Amg::Vector3D& InDet::TRT_DriftCircleOnTrack::globalPosition() const {
- if (!m_globalPosition)
+ if (not m_globalPosition)
{
if (side()==Trk::NONE)
@@ -241,7 +242,7 @@ std::ostream& InDet::TRT_DriftCircleOnTrack::dump( std::ostream& sl ) const
sl << "Global position (x,y,z) = (";
this->globalPosition();
- if ( m_globalPosition !=0 )
+ if (m_globalPosition)
{
sl <<this->globalPosition().x()<<", "
<<this->globalPosition().y()<<", "
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx
index 8e8da7b4e95730c2d782b5d36fa2e766a0c5bb70..39b1e0c85a8af549c057229b6196c1d371042f7a 100755
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingPixelClustersOnTrackTool.cxx
@@ -391,8 +391,9 @@ void InDet::CompetingPixelClustersOnTrackTool::updateCompetingROT(
// update maximum assign prob index:
compROT->m_indexMaxAssignProb = maximumAssignProbIndex;
// delete global position (will be recreated by the competingROT itself)
- delete compROT->m_globalPosition;
- compROT->m_globalPosition = 0; // very important, otherwise segfault...
+ if (compROT->m_globalPosition) {
+ delete compROT->m_globalPosition.release().get();
+ }
compROT->setLocalParametersAndErrorMatrix();
if (msgLvl(MSG::DEBUG)) testCompetingROT(*compROT);
}
@@ -543,8 +544,9 @@ StatusCode InDet::CompetingPixelClustersOnTrackTool::updateCompetingROTprobs(
} // end for loop
compROT->m_assignProb = assgnProbVector;
// delete global position (will be recreated by the competingROT itself)
- delete compROT->m_globalPosition;
- compROT->m_globalPosition = 0; // very important, otherwise segfault...
+ if (compROT->m_globalPosition) {
+ delete compROT->m_globalPosition.release().get();
+ }
// recalc localParameters
compROT->setLocalParametersAndErrorMatrix();
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx
index 4c03a8418bc6d48d45a33d17ea59a4222caf5ebf..4490984037a3db021dc30e057acdbdcde09f053f 100755
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx
@@ -386,8 +386,9 @@ void InDet::CompetingSCT_ClustersOnTrackTool::updateCompetingROT(
// update maximum assign prob index:
compROT->m_indexMaxAssignProb = maximumAssignProbIndex;
// delete global position (will be recreated by the competingROT itself)
- delete compROT->m_globalPosition;
- compROT->m_globalPosition = 0; // very important, otherwise segfault...
+ if (compROT->m_globalPosition) {
+ delete compROT->m_globalPosition.release().get();
+ }
// delete localParameters
compROT->setLocalParametersAndErrorMatrix();
if (msgLvl(MSG::VERBOSE)) testCompetingROT(*compROT);
@@ -539,8 +540,9 @@ StatusCode InDet::CompetingSCT_ClustersOnTrackTool::updateCompetingROTprobs(
} // end for loop
compROT->m_assignProb = assgnProbVector;
// delete global position (will be recreated by the competingROT itself)
- delete compROT->m_globalPosition;
- compROT->m_globalPosition = 0; // very important, otherwise segfault...
+ if (compROT->m_globalPosition) {
+ delete compROT->m_globalPosition.release().get();
+ }
// recalc localParameters
compROT->setLocalParametersAndErrorMatrix();
if (msgLvl(MSG::DEBUG)) testCompetingROT(*compROT);
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx
index 8be554aff34ad7ad3cad53084ad5c6919022b7bd..19e04cf777bbce85c35c785d6330978dcce556bb 100755
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx
@@ -718,8 +718,9 @@ void InDet::CompetingTRT_DriftCirclesOnTrackTool::updateCompetingROT(
delete compROT->m_associatedSurface;
compROT->m_associatedSurface=assocSurface;
// delete global position (will be recreated in competingROT itself
- delete compROT->m_globalPosition;
- compROT->m_globalPosition = 0; // very important otherwise segfault in destructor...
+ if (compROT->m_globalPosition) {
+ delete compROT->m_globalPosition.release().get();
+ }
//calling CompetingTRT_DriftCirclesOnTrack::setLocalParametersAndErrorMatrix() does not work here!
// have to set the effective measurement and error matrix directly:
//const_cast<InDet::CompetingTRT_DriftCirclesOnTrack*>(compROT)->setLocalParametersAndErrorMatrix();
diff --git a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
index f34b7e7551f47055e81379d0e21a4b943a842ac1..75bbc81bbf53a6c650ea41d97ca17732098b8867 100644
--- a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
+++ b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
@@ -1,14 +1,14 @@
-Thu Dec 6 05:33:31 CET 2018
+Mon Mar 11 15:46:25 CET 2019
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/fa0fd6d0989] -- built on [2018-12-06T0504]
+Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-centos7-gcc8-opt] [atlas-work3/27168cb1091] -- built on [2019-03-11T1355]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "LArRecUtils/LArFCalTowerBuilderTool_test.py"
SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5473 configurables from 53 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5462 configurables from 44 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
EventInfoMgtInit: Got release version Athena-22.0.1
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
@@ -18,20 +18,19 @@ Py:Athena INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobO
Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOptions.py"
Py:Athena INFO including file "TileIdCnv/TileIdCnv_jobOptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-[?1034hApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
- running on lxplus077.cern.ch on Thu Dec 6 05:33:48 2018
+ Welcome to ApplicationMgr (GaudiCoreSvc v31r0)
+ running on lxplus046.cern.ch on Mon Mar 11 15:46:42 2019
====================================================================================================================================
-ApplicationMgr INFO Successfully loaded modules : AthenaServices
ApplicationMgr INFO Application Manager Configured successfully
ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3219 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3440 CLIDRegistry entries for module ALL
CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -40,8 +39,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus077.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-03-10T2143/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host lxplus046.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -50,6 +49,7 @@ PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atla
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
@@ -70,7 +70,7 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 2134 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2094 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 17 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
@@ -125,7 +125,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
multi-layered version of absorbers activated, mlabs == 1
================================================
EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-ClassIDSvc INFO getRegistryEntries: read 5819 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5624 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
IdDictDetDescrCnv INFO in initialize
IdDictDetDescrCnv INFO in createObj: creating a IdDictManager object in the detector store
@@ -164,7 +164,7 @@ TileDddbManager INFO n_tileSwitches = 1
ClassIDSvc INFO getRegistryEntries: read 213 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -176,21 +176,23 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 65 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
-ClassIDSvc INFO getRegistryEntries: read 8831 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7104 CLIDRegistry entries for module ALL
+CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 161 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -207,12 +209,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -232,7 +234,6 @@ IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
-CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
@@ -6640,7 +6641,6 @@ towers
6398 100 63 0
6399 100 64 0
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-MetaDataSvc INFO MetaDataSvc::stop()
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
/cvmfs/atlas-co... INFO Database being retired...
@@ -6651,25 +6651,25 @@ IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
IncidentProcAlg2 INFO Finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.14 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 1.14 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.76 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.89 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 0.19 ))s
+IOVDbSvc INFO bytes in (( 2.79 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.19 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 2.79 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 480 [ms] Ave/Min/Max= 240(+- 230)/ 10/ 470 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 0.58 [s] Ave/Min/Max= 0.29(+- 0.25)/ 0.04/ 0.54 [s] #= 2
-ChronoStatSvc INFO Time User : Tot= 3.84 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 450 [ms] Ave/Min/Max= 225(+- 215)/ 10/ 440 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.23)/ 0.03/ 0.49 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 2.71 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseTool.h b/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseTool.h
index 479f407611a1e95a44eb45cce4f80c20ca761805..2b772f17eb6ebe12bcbd787d218f32381deb3d2c 100644
--- a/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseTool.h
+++ b/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseTool.h
@@ -31,7 +31,6 @@
#include "LArElecCalib/ILArMCSymTool.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArIdentifier/LArOnline_SuperCellID.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/LArID.h"
#include "GaudiKernel/IIncidentListener.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
diff --git a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx
index 2c81adb18e3621283b498780d16bb603d4eb6305..56088671e7f1eb0320d4877d5704f1d8add24fad 100644
--- a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.cxx
@@ -8,6 +8,7 @@
#include "LArIdentifier/LArOnlineID.h"
#include "LArIdentifier/LArOnline_SuperCellID.h"
#include "LArCabling/LArCablingLegacyService.h"
+#include "CaloIdentifier/CaloCell_ID.h"
#include <cmath>
/////////////////////////////////////////////////////////////////////////////
@@ -23,7 +24,6 @@ LArAutoCorrTotalTool::LArAutoCorrTotalTool(const std::string& type,
m_lar_on_id(nullptr),
m_cablingService(nullptr),
m_larmcsym("LArMCSymTool"),m_adc2mevTool("LArADC2MeVTool"),
- m_calo_id_man(nullptr),
m_lar_em_id(nullptr),
m_lar_hec_id(nullptr),
m_lar_fcal_id(nullptr),
@@ -77,16 +77,17 @@ StatusCode LArAutoCorrTotalTool::initialize()
}
//retrieves helpers for LArCalorimeter
- m_calo_id_man = CaloIdManager::instance();
+ const CaloCell_Base_ID* idHelper = nullptr;
if ( m_isSC ) {
- m_lar_em_id = m_calo_id_man->getEM_SuperCell_ID();
- m_lar_hec_id = m_calo_id_man->getHEC_SuperCell_ID();
- m_lar_fcal_id = m_calo_id_man->getFCAL_SuperCell_ID();
- } else {
- m_lar_em_id = m_calo_id_man->getEM_ID();
- m_lar_hec_id = m_calo_id_man->getHEC_ID();
- m_lar_fcal_id = m_calo_id_man->getFCAL_ID();
- }
+ ATH_CHECK( detStore()->retrieve (idHelper, "CaloCell_SuperCell_ID") );
+ }
+ else {
+ ATH_CHECK( detStore()->retrieve (idHelper, "CaloCell_ID") );
+ }
+
+ m_lar_em_id = idHelper->em_idHelper();
+ m_lar_hec_id = idHelper->hec_idHelper();
+ m_lar_fcal_id = idHelper->fcal_idHelper();
diff --git a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.h b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.h
index c633bc200cb7ab2dd1f849d563f06a880ca7516b..3c099b7f676b801a026e16522a10f4c5756ad019 100644
--- a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.h
+++ b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalTool.h
@@ -36,7 +36,6 @@
#include "StoreGate/DataHandle.h"
#include "LArElecCalib/ILArMCSymTool.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/LArID.h"
#include "GaudiKernel/IIncidentListener.h"
@@ -104,7 +103,6 @@ class LArAutoCorrTotalTool: public AthAlgTool,
ToolHandle<ILArMCSymTool> m_larmcsym;
ToolHandle<ILArADC2MeVTool> m_adc2mevTool;
- const CaloIdManager* m_calo_id_man;
const LArEM_Base_ID* m_lar_em_id;
const LArHEC_Base_ID* m_lar_hec_id;
const LArFCAL_Base_ID* m_lar_fcal_id;
diff --git a/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx b/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx
index a57a496306f4ec640e7118f7d96e6d4f57e5a220..af68292c7f044327cf787ab2f09e489dc67e3705 100644
--- a/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx
@@ -18,7 +18,6 @@ PURPOSE: Scales down the energy of cells due to simulated
#include "LArCellFakeProbElectronics.h"
#include "CaloEvent/CaloCellContainer.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/CaloCell_ID.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "LArCabling/LArCablingLegacyService.h"
@@ -77,12 +76,10 @@ double LArCellFakeProbElectronics::wtCell(const CaloCell * theCell ) const
// get calo id helper
- const CaloCell_ID* idHelper = CaloIdManager::instance()->getCaloCell_ID();
- if ( idHelper == 0 )
- {
- ATH_MSG_ERROR( "cannot allocate CaloCell_ID helper!" );
- return 1;
- }
+ const CaloCell_ID* idHelper = nullptr;
+ if (detStore()->retrieve (idHelper, "CaloCell_ID").isFailure()) {
+ return 1;
+ }
HWIdentifier id;
try{
diff --git a/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.cxx b/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.cxx
index cc6edfaa6f19ec41cca4246ce8fd5e054618c825..04e29ec37bcb96312efc889bb15dead58a8e9ece 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -7,8 +7,8 @@
#include "LArFCalTowerStore.h"
#include "CaloIdentifier/CaloCell_ID.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/LArFCAL_ID.h"
+#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloUtils/CaloTowerBuilderToolBase.h"
@@ -28,11 +28,12 @@ LArFCalTowerBuilderTool::LArFCalTowerBuilderTool(const std::string& name,
const IInterface* parent)
: CaloTowerBuilderToolBase(name,type,parent)
, m_minEt(0.)
+ , m_cellIdHelper(nullptr)
+ , m_larFCalId(nullptr)
+ , m_theManager(nullptr)
{
// Et cut for minicells
declareProperty("MinimumEt",m_minEt);
- m_larFCalId = (CaloIdManager::instance())->getFCAL_ID();
- // initialize intermediate store
}
LArFCalTowerBuilderTool::~LArFCalTowerBuilderTool(){
@@ -43,6 +44,11 @@ LArFCalTowerBuilderTool::~LArFCalTowerBuilderTool(){
/////////////////////////////
StatusCode LArFCalTowerBuilderTool::initializeTool(){
+ ATH_CHECK( detStore()->retrieve (m_cellIdHelper, "CaloCell_ID") );
+ m_larFCalId = m_cellIdHelper->fcal_idHelper();
+
+ ATH_CHECK( detStore()->retrieve (m_theManager, "CaloMgr") );
+
// ignore other input!
ATH_MSG_INFO( "CaloTowerBuilder for the FCal initiated" );
@@ -191,7 +197,10 @@ void LArFCalTowerBuilderTool::handle(const Incident&)
StatusCode LArFCalTowerBuilderTool::rebuildLookup()
{
CaloTowerContainer theTowers (towerSeg());
- if ( m_cellStore.buildLookUp(&theTowers) ) {
+ if ( m_cellStore.buildLookUp(*m_cellIdHelper,
+ *m_theManager,
+ &theTowers) )
+ {
return StatusCode::SUCCESS;
}
return StatusCode::FAILURE;
diff --git a/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.h b/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.h
index d4a2987695160b7b1c6cacc9003d40f614daa6e5..8702d99873f1a323721bbce489de85cb044e7285 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.h
+++ b/LArCalorimeter/LArRecUtils/src/LArFCalTowerBuilderTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARCLUSTERREC_LARFCALTOWERBUILDERTOOL_H
@@ -28,6 +28,7 @@ class LArFCalTowerStore;
class CaloTowerContainer;
class CaloTower;
+class CaloDetDescrManager;
class LArFCAL_ID;
@@ -96,7 +97,9 @@ private:
// FCal only
static CaloCell_ID::SUBCALO m_caloIndex;
+ const CaloCell_ID* m_cellIdHelper;
const LArFCAL_ID* m_larFCalId;
+ const CaloDetDescrManager* m_theManager;
LArFCalTowerStore m_cellStore;
};
diff --git a/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx b/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx
index 35cde60f2d59b5bb411941050a30dfcd2a5e376d..1b849095818946d7dd157f30b9a8740ed96315e0 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -20,8 +20,7 @@ Updated:
// include header files
#include "Identifier/IdentifierHash.h"
-#include "CaloIdentifier/CaloIdManager.h"
-//#include "CaloIdentifier/CaloCell_ID.h"
+#include "CaloIdentifier/CaloCell_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
@@ -65,7 +64,9 @@ LArFCalTowerStore::~LArFCalTowerStore(){
// Build LookUp Table //
////////////////////////
-bool LArFCalTowerStore::buildLookUp(CaloTowerContainer* theTowers)
+bool LArFCalTowerStore::buildLookUp(const CaloCell_ID& cellIdHelper,
+ const CaloDetDescrManager& theManager,
+ CaloTowerContainer* theTowers)
{
///////////////////////
// Store Preparation //
@@ -80,19 +81,11 @@ bool LArFCalTowerStore::buildLookUp(CaloTowerContainer* theTowers)
MsgStream msg(theMsgSvc,"LArFCalTowerStore");
// get cell id helper
- const CaloCell_ID* cellIdHelper = (CaloIdManager::instance())->getCaloCell_ID();
- const LArFCAL_ID* fcalIdHelper = (CaloIdManager::instance())->getFCAL_ID();
-
- // get cell description manager
- const CaloDetDescrManager* theManager = CaloDetDescrManager::instance();
- if ( ! theManager->isInitialized() ){
- msg << MSG::ERROR<< "CaloDetDescrManager is not initialized, module unusable!" << endmsg;
- return false;
- }
+ const LArFCAL_ID& fcalIdHelper = *cellIdHelper.fcal_idHelper();
// find numerical ranges
IdentifierHash firstIndex, lastIndex;
- cellIdHelper->calo_cell_hash_range((int)CaloCell_ID::LARFCAL, firstIndex, lastIndex);
+ cellIdHelper.calo_cell_hash_range((int)CaloCell_ID::LARFCAL, firstIndex, lastIndex);
m_indxOffset = (size_t)firstIndex;
m_indxBound = (size_t)lastIndex;
@@ -138,7 +131,7 @@ bool LArFCalTowerStore::buildLookUp(CaloTowerContainer* theTowers)
//std::cout<<"cell:"<<anIndex<<std::endl;
// get cell geometry
- const CaloDetDescrElement* theElement = theManager->get_element(cellIndex);
+ const CaloDetDescrElement* theElement = theManager.get_element(cellIndex);
if (!theElement) {
msg << MSG::ERROR<< "Can't find element for index " << cellIndex
<< endmsg;
@@ -151,7 +144,7 @@ bool LArFCalTowerStore::buildLookUp(CaloTowerContainer* theTowers)
double dyCell = theElement->dy();
// get cell logical location
- int thisModule = fcalIdHelper->module(theElement->identify());
+ int thisModule = fcalIdHelper.module(theElement->identify());
// get cell splitting
thisModule--;
double theXBin = dxCell / (double)m_ndxFCal[thisModule];
diff --git a/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.h b/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.h
index 089b24b54e92160a6ba5d960dc53736aa9fd7b1d..f54ab5ab29028b1511582ec7925e7893f6bea782 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.h
+++ b/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRECUTILS_LARFCALTOWERSTORE_H
@@ -32,6 +32,8 @@ PACKAGE: offline/LArCalorimeter/LArClusterRec
#include <map>
#include <vector>
+class CaloDetDescrManager;
+
class LArFCalTowerStore
{
public:
@@ -70,7 +72,9 @@ class LArFCalTowerStore
unsigned int towerSize(tower_iterator t) const {return t->size();}
/// \brief setup trigger
- bool buildLookUp(CaloTowerContainer* theTowers);
+ bool buildLookUp(const CaloCell_ID& cellIdHelper,
+ const CaloDetDescrManager& theManager,
+ CaloTowerContainer* theTowers);
/// \brief size of internal data store
size_t size() const { return m_TTCmatrix.size(); }
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
index 56284850ad2ed0465d156d7ab188e647de8c7566..5c45c9d1954356224cdc7c28c18190748fa96e81 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "./LArHVCondAlg.h"
@@ -12,7 +12,7 @@
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
-#include "CaloIdentifier/CaloIdManager.h"
+#include "CaloIdentifier/CaloCell_ID.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "LArReadoutGeometry/EMBCell.h"
#include "LArHV/LArHVManager.h"
@@ -62,6 +62,7 @@
// constructor
LArHVCondAlg::LArHVCondAlg( const std::string& name, ISvcLocator* pSvcLocator )
: AthReentrantAlgorithm(name,pSvcLocator),
+ m_calodetdescrmgr(nullptr),
m_larem_id(nullptr),
m_larhec_id(nullptr),
m_larfcal_id(nullptr),
@@ -81,11 +82,12 @@ LArHVCondAlg::~LArHVCondAlg()
//initialize
StatusCode LArHVCondAlg::initialize(){
- ATH_CHECK(detStore()->retrieve(m_caloIdMgr));
+ const CaloCell_ID* idHelper = nullptr;
+ ATH_CHECK( detStore()->retrieve (idHelper, "CaloCell_ID") );
- m_larem_id = m_caloIdMgr->getEM_ID();
- m_larhec_id = m_caloIdMgr->getHEC_ID();
- m_larfcal_id = m_caloIdMgr->getFCAL_ID();
+ m_larem_id = idHelper->em_idHelper();
+ m_larhec_id = idHelper->hec_idHelper();
+ m_larfcal_id = idHelper->fcal_idHelper();
ATH_CHECK(detStore()->retrieve(m_calodetdescrmgr));
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
index b69427da2f8386b3d278b4c1a96c1d3aaeb7eb0b..a05c11389962bdc8f4743af0538680cdc55a0615 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,6 @@ class AthenaAttributeList;
class LArEM_ID;
class LArHEC_ID;
class LArFCAL_ID;
-class CaloIdManager;
class CaloDetDescrManager;
class Identifier;
class LArElectrodeID;
@@ -77,8 +76,7 @@ class LArHVCondAlg: public AthReentrantAlgorithm
// other members:
- const DataHandle<CaloIdManager> m_caloIdMgr;
- const DataHandle<CaloDetDescrManager> m_calodetdescrmgr;
+ const CaloDetDescrManager* m_calodetdescrmgr;
const LArEM_ID* m_larem_id;
const LArHEC_ID* m_larhec_id;
const LArFCAL_ID* m_larfcal_id;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx
index c09f3e35d5393b0385bd885a7a66032c2c7adc5e..8893edfe85ac1cb6418984d7252da8a36f9c0120 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx
@@ -28,18 +28,19 @@ LArHVCorrTool::LArHVCorrTool(const std::string& type,
const IInterface* parent)
:
AthAlgTool(type, name, parent),
- m_lar_on_id(NULL),
- m_calocell_id(NULL),
- m_larem_id(NULL),
- m_larhec_id(NULL),
- m_larfcal_id(NULL),
- m_electrodeID(NULL),
+ m_lar_on_id(nullptr),
+ m_calocell_id(nullptr),
+ m_larem_id(nullptr),
+ m_larhec_id(nullptr),
+ m_larfcal_id(nullptr),
+ m_electrodeID(nullptr),
+ m_calodetdescrmgr(nullptr),
m_cablingService("LArCablingLegacyService"),
m_hvtool("LArHVToolMC")
{
declareInterface<ILArHVCorrTool>(this);
- m_Tdrift = NULL;
+ m_Tdrift = nullptr;
m_ownScale = true;
m_keyOutput = "LArHVScaleCorr";
m_keyOutputTd = "LArTdrift";
@@ -73,64 +74,22 @@ LArHVCorrTool::~LArHVCorrTool() {
StatusCode LArHVCorrTool::initialize() {
ATH_MSG_DEBUG("LArHVCorrTool initialize() begin");
- StatusCode sc = detStore()->retrieve(m_lar_on_id,"LArOnlineID");
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to retrieve LArOnlineID from DetectorStore" << endmsg;
- return StatusCode::FAILURE;
- }
-
- sc=detStore()->retrieve(m_calocell_id,"CaloCell_ID");
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to retrieve CaloCellID from DetectorStore" << endmsg;
- return StatusCode::FAILURE;
- }
-// retrieve LArEM id helper
-
- sc = detStore()->retrieve( m_caloIdMgr );
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to retrieve CaloIdMgr " << endmsg;
- return sc;
- }
-
- m_larem_id = m_caloIdMgr->getEM_ID();
- m_larhec_id = m_caloIdMgr->getHEC_ID();
- m_larfcal_id = m_caloIdMgr->getFCAL_ID();
+ ATH_CHECK( detStore()->retrieve(m_lar_on_id,"LArOnlineID") );
+ ATH_CHECK( detStore()->retrieve(m_calocell_id,"CaloCell_ID") );
- if(m_cablingService.retrieve().isFailure()){
- msg(MSG::ERROR) << "Unable to get CablingService " << endmsg;
- return StatusCode::FAILURE;
- }
+ m_larem_id = m_calocell_id->em_idHelper();
+ m_larhec_id = m_calocell_id->hec_idHelper();
+ m_larfcal_id = m_calocell_id->fcal_idHelper();
- sc = detStore()->retrieve(m_calodetdescrmgr);
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to get CaloDetDescrManager" << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( m_cablingService.retrieve() );
+ ATH_CHECK( detStore()->retrieve(m_calodetdescrmgr) );
+ ATH_CHECK( detStore()->retrieve(m_electrodeID) );
+ ATH_CHECK( m_hvtool.retrieve() );
+ ATH_CHECK( detStore()->regFcn(&ILArHVTool::LoadCalibration,dynamic_cast<ILArHVTool*>(&(*m_hvtool)),
+ &ILArHVCorrTool::LoadCalibration,dynamic_cast<ILArHVCorrTool*>(this)) );
- sc=detStore()->retrieve(m_electrodeID);
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to get LArElectrodeID helper" << endmsg;
- return sc;
- }
-
- if (m_hvtool.retrieve().isFailure()) {
- msg(MSG::ERROR) << "Unable to find tool for LArHVTool" << endmsg;
- return StatusCode::FAILURE;
- }
-
- sc = detStore()->regFcn(&ILArHVTool::LoadCalibration,dynamic_cast<ILArHVTool*>(&(*m_hvtool)),
- &ILArHVCorrTool::LoadCalibration,dynamic_cast<ILArHVCorrTool*>(this));
- if (sc.isFailure()) {
- msg(MSG::ERROR) << "canot register callback " << endmsg;
- return sc;
- }
-
- sc = this->buildFixHVList();
- if (sc.isFailure()) {
- msg(MSG::ERROR) << " cannot build list to fix HV corrections " << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( this->buildFixHVList() );
//Initialize hash-ranges
//FIXME: Hardcoded numbers are not ideal
@@ -254,7 +213,7 @@ StatusCode LArHVCorrTool::finalize()
// *** compute global ADC2MeV factor from subfactors ***
StatusCode LArHVCorrTool::getScale(const HASHRANGEVEC& hashranges) const {
- if (m_doTdrift && m_Tdrift==NULL) {
+ if (m_doTdrift && m_Tdrift==nullptr) {
m_Tdrift = new LArTdriftComplete();
if( (m_Tdrift->setGroupingType("ExtendedSubDetector",msg())).isFailure()) {
msg(MSG::ERROR) << " cannot setGroupingType " << endmsg;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.h b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.h
index bce0b2ae3ca17dd22ce1b9fed9d2e53977b50a06..608689b6a4acd806924f504abb1f16427e14dbe3 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.h
@@ -17,7 +17,6 @@
#include "StoreGate/DataHandle.h"
#include "LArCabling/LArCablingLegacyService.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/LArID.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
@@ -70,8 +69,7 @@ class LArHVCorrTool: public AthAlgTool,
const LArHEC_ID* m_larhec_id;
const LArFCAL_ID* m_larfcal_id;
const LArElectrodeID* m_electrodeID;
- const DataHandle<CaloIdManager> m_caloIdMgr;
- const DataHandle<CaloDetDescrManager> m_calodetdescrmgr;
+ const CaloDetDescrManager* m_calodetdescrmgr;
ToolHandle<LArCablingLegacyService> m_cablingService;
ToolHandle<ILArHVTool> m_hvtool;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
index f04294614960bd9512edcede9ce5a6f9d8d4e533..d3eb7dedd5f033cfceef1f1899eece0d93c39e03 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHVPathologyDbCondAlg.h"
@@ -14,7 +14,7 @@
#include "CoralBase/Blob.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
-#include "CaloIdentifier/CaloIdManager.h"
+#include "CaloIdentifier/CaloCell_ID.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
@@ -41,29 +41,15 @@ StatusCode LArHVPathologyDbCondAlg::initialize()
ATH_CHECK(m_hvMappingKey.initialize());
ATH_CHECK(m_hvPAthologyKey.initialize());
- StatusCode sc = detStore()->retrieve( m_caloIdMgr );
- if (sc.isFailure()) {
- ATH_MSG_ERROR( "Unable to retrieve CaloIdMgr ");
- return sc;
- }
-
- m_larem_id = m_caloIdMgr->getEM_ID();
- m_larhec_id = m_caloIdMgr->getHEC_ID();
- m_larfcal_id = m_caloIdMgr->getFCAL_ID();
+ const CaloCell_ID* idHelper = nullptr;
+ ATH_CHECK( detStore()->retrieve (idHelper, "CaloCell_ID") );
-// retrieve CaloDetDescrMgr
- sc = detStore()->retrieve(m_calodetdescrmgr);
- if (sc.isFailure()) {
- ATH_MSG_ERROR("Unable to retrieve CaloDetDescrMgr ");
- return sc;
- }
-
- sc = detStore()->retrieve(m_laronline_id,"LArOnlineID");
- if (sc.isFailure()) {
- ATH_MSG_ERROR("Unable to retrieve LArOnlineID from DetectorStore");
- return sc;
- }
+ m_larem_id = idHelper->em_idHelper();
+ m_larhec_id = idHelper->hec_idHelper();
+ m_larfcal_id = idHelper->fcal_idHelper();
+ ATH_CHECK( detStore()->retrieve (m_calodetdescrmgr, "CaloMgr") );
+ ATH_CHECK( detStore()->retrieve(m_laronline_id,"LArOnlineID") );
ATH_CHECK(detStore()->retrieve(m_hvlineHelper,"LArHVLineID"));
return StatusCode::SUCCESS;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
index 95c034f44fff15a33dc3e4113eeb82cbb67b4f40..c5bce4d3e10338275cb601db782c12cb028f265c 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHVPATHOLOGYDBCONDALG
@@ -17,7 +17,6 @@ class LArEM_ID;
class LArHEC_ID;
class LArFCAL_ID;
class LArOnlineID;
-class CaloIdManager;
class CaloDetDescrManager;
class LArHVLineID;
class Identifier;
@@ -41,8 +40,7 @@ class LArHVPathologyDbCondAlg: public AthReentrantAlgorithm
SG::ReadCondHandleKey<LArHVIdMapping> m_hvMappingKey {this, "HVMappingKey", "LArHVIdMap", "Key for mapping object" };
SG::WriteCondHandleKey<LArHVPathology> m_hvPAthologyKey {this, "HVPAthologyKey", "LArHVPathology", "Key for HV pathologies in Cond. store"};
- const DataHandle<CaloIdManager> m_caloIdMgr;
- const DataHandle<CaloDetDescrManager> m_calodetdescrmgr;
+ const CaloDetDescrManager* m_calodetdescrmgr;
const LArEM_ID* m_larem_id;
const LArHEC_ID* m_larhec_id;
const LArFCAL_ID* m_larfcal_id;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx
index 7c4b510f4224ea32988ccf6240251ae6caa05aef..825822bd62c862b13ae6c5b0bab7a6654143d7e7 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHVScaleCorrCondAlg.h"
@@ -30,7 +30,8 @@ LArHVScaleCorrCondAlg::LArHVScaleCorrCondAlg(const std::string& name, ISvcLocato
m_larem_id(nullptr),
m_larhec_id(nullptr),
m_larfcal_id(nullptr),
- m_electrodeID(nullptr)
+ m_electrodeID(nullptr),
+ m_calodetdescrmgr(nullptr)
{
m_deltatupdate = 0;
@@ -56,11 +57,10 @@ StatusCode LArHVScaleCorrCondAlg::initialize() {
// retrieve id helpers
ATH_CHECK(detStore()->retrieve(m_lar_on_id,"LArOnlineID"));
ATH_CHECK(detStore()->retrieve(m_calocell_id,"CaloCell_ID"));
- ATH_CHECK(detStore()->retrieve( m_caloIdMgr ));
- m_larem_id = m_caloIdMgr->getEM_ID();
- m_larhec_id = m_caloIdMgr->getHEC_ID();
- m_larfcal_id = m_caloIdMgr->getFCAL_ID();
+ m_larem_id = m_calocell_id->em_idHelper();
+ m_larhec_id = m_calocell_id->hec_idHelper();
+ m_larfcal_id = m_calocell_id->fcal_idHelper();
ATH_CHECK(detStore()->retrieve(m_calodetdescrmgr));
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.h
index 0e31884e91051b2ebfb37a6f41023f166ded3092..da4f21cfba5cedccf1cab6c066b7e7e1584c575c 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Rewritten from LArHVScaleCorrTool
@@ -15,7 +15,6 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "LArIdentifier/LArOnlineID.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/LArID.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "LArRecConditions/LArHVData.h"
@@ -53,8 +52,7 @@ class LArHVScaleCorrCondAlg: public AthAlgorithm
const LArHEC_ID* m_larhec_id;
const LArFCAL_ID* m_larfcal_id;
const LArElectrodeID* m_electrodeID;
- const DataHandle<CaloIdManager> m_caloIdMgr;
- const DataHandle<CaloDetDescrManager> m_calodetdescrmgr;
+ const CaloDetDescrManager* m_calodetdescrmgr;
SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey {this,"keyCabling", "LArOnOffIdMap", "Input key for Id mapping"} ;
SG::ReadCondHandleKey<LArHVData> m_hvKey {this, "keyHVdata", "LArHVData", "Input key for HV data from DCS"};
diff --git a/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx b/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx
index dd212ff648a45ab33a257c2ba94cc72c594fed19..f880811e76349f8a270feb72aa3c893a278f72f0 100644
--- a/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArOFCTool.cxx
@@ -31,7 +31,6 @@ LArOFCTool::LArOFCTool(const std::string& type,
m_lar_on_id(nullptr),
m_cablingService(nullptr),
m_larmcsym("LArMCSymTool"),
- m_calo_id_man(nullptr),
m_lar_em_id(nullptr),
m_lar_hec_id(nullptr),
m_lar_fcal_id(nullptr),
@@ -83,16 +82,18 @@ StatusCode LArOFCTool::initialize()
}
//retrieves helpers for LArCalorimeter
- m_calo_id_man = CaloIdManager::instance();
+ const CaloCell_Base_ID* idHelper = nullptr;
if ( m_isSC ) {
- m_lar_em_id = m_calo_id_man->getEM_SuperCell_ID();
- m_lar_hec_id = m_calo_id_man->getHEC_SuperCell_ID();
- m_lar_fcal_id = m_calo_id_man->getFCAL_SuperCell_ID();
- } else {
- m_lar_em_id = m_calo_id_man->getEM_ID();
- m_lar_hec_id = m_calo_id_man->getHEC_ID();
- m_lar_fcal_id = m_calo_id_man->getFCAL_ID();
+ ATH_CHECK( detStore()->retrieve (idHelper, "CaloCell_SuperCell_ID") );
}
+ else {
+ ATH_CHECK( detStore()->retrieve (idHelper, "CaloCell_ID") );
+ }
+
+ m_lar_em_id = idHelper->em_idHelper();
+ m_lar_hec_id = idHelper->hec_idHelper();
+ m_lar_fcal_id = idHelper->fcal_idHelper();
+
IToolSvc* toolSvc = nullptr;
ATH_CHECK( service( "ToolSvc",toolSvc ) );
if ( m_isSC ) {
diff --git a/LArCalorimeter/LArRecUtils/src/LArOFCTool.h b/LArCalorimeter/LArRecUtils/src/LArOFCTool.h
index 92f5e8f80733ade780962ecceb0d4f61adba539c..0698de4b3fe64d3f5f92d4b627543a08b5138f75 100644
--- a/LArCalorimeter/LArRecUtils/src/LArOFCTool.h
+++ b/LArCalorimeter/LArRecUtils/src/LArOFCTool.h
@@ -42,7 +42,6 @@
#include "LArCabling/LArCablingBase.h"
#include "LArElecCalib/ILArMCSymTool.h"
#include "LArIdentifier/LArOnlineID_Base.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/LArID.h"
class StoreGateSvc;
@@ -101,7 +100,6 @@ class LArOFCTool: public AthAlgTool,
LArCablingBase* m_cablingService;
ToolHandle<ILArMCSymTool> m_larmcsym;
- const CaloIdManager* m_calo_id_man;
const LArEM_Base_ID* m_lar_em_id;
const LArHEC_Base_ID* m_lar_hec_id;
const LArFCAL_Base_ID* m_lar_fcal_id;
diff --git a/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx b/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
index ee6788a58d11ad72d57d1b15591581e508707bce..c20397cb439e890b3a1bd1461188f69379e2ac54 100644
--- a/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
+++ b/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
@@ -11,7 +11,6 @@
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloDetDescr/CaloDetDescrElement.h"
#include "CaloIdentifier/CaloCell_ID.h"
-#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
@@ -55,7 +54,7 @@ void MakeLArCellFromRaw::initialize( const LArRoI_Map* roiMap ,
StatusCode sc = svcLoc->service("MessageSvc", m_msgSvc);
if (sc.isFailure())
{
- std::cout << "MakeLArCellFromRaw ERROR cannot retrieve MessageSvc " << std::endl;
+ std::cout << "MakeLArCellFromRaw ERROR cannot retrieve MessageSvc " << std::endl;
return;
}
@@ -66,7 +65,19 @@ void MakeLArCellFromRaw::initialize( const LArRoI_Map* roiMap ,
if(pCorr) log <<MSG::INFO <<" Number of Corrections "<< pCorr->size()<< endmsg ;
- const CaloDetDescrManager* man = CaloDetDescrManager::instance();
+ StoreGateSvc* detStore = nullptr;
+ sc = svcLoc->service("DetectorStore", detStore);
+ if (sc.isFailure())
+ {
+ log << MSG::ERROR << "MakeLArCellFromRaw ERROR cannot retrieve DetectorStore " << endmsg;
+ return;
+ }
+
+ const CaloDetDescrManager* man = nullptr;
+ if ( detStore->retrieve (man, "CaloMgr").isFailure() ) {
+ log << MSG::ERROR << "MakeLArCellFromRaw ERROR cannot retrieve CaloMgr " << endmsg;
+ return;
+ }
IToolSvc* p_toolSvc;
StatusCode status = svcLoc->service( "ToolSvc",p_toolSvc );
@@ -98,25 +109,14 @@ void MakeLArCellFromRaw::initialize( const LArRoI_Map* roiMap ,
}
- const CaloIdManager* caloCIM = man->getCalo_Mgr();
- const LArEM_ID& em_id = *( caloCIM->getEM_ID() );
- const LArHEC_ID& hec_id = *( caloCIM->getHEC_ID() );
- const LArFCAL_ID& fcal_id = *(caloCIM->getFCAL_ID() );
-
-// retrive onlineID helper from detStore
+ const CaloCell_ID* calo_id = man->getCaloCell_ID();
+ const LArEM_ID& em_id = *calo_id->em_idHelper();
+ const LArHEC_ID& hec_id = *calo_id->hec_idHelper();
+ const LArFCAL_ID& fcal_id = *calo_id->fcal_idHelper();
- StoreGateSvc* detStore;
- if (svcLoc->service("DetectorStore", detStore).isFailure()) {
- log << MSG::ERROR << "Unable to access DetectoreStoren MakeLArCellFromRaw" << endmsg ;
- return;
- }
-
-// retrieve OnlineID helper from detStore
- sc = detStore->retrieve(m_onlineID, "LArOnlineID");
- if (sc.isFailure()) {
- log << MSG::ERROR << "MakeLArCellFromRaw: Could not get LArOnlineID helper !" << endmsg ;
- return;
- }
+ if (detStore->retrieve(m_onlineID, "LArOnlineID").isFailure()) {
+ log <<MSG::ERROR << "cannot find LArOnlineID in MakeLArCellFromRaw " << endmsg;
+ }
int n_em = 0 ;
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 6363d17ae0f6f7c5c23022df049533bef8384fb8..14e4ea9065fbc934b044ee52f53cdffa3e5673bb 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -24,7 +24,7 @@ def MuonCacheCfg():
RpcCacheKey = MuonCacheNames.RpcCache,
TgcCacheKey = MuonCacheNames.TgcCache)
acc.addEventAlgo( cacheCreator )
- return acc, cacheCreator
+ return acc
## This configuration function sets up everything for decoding RPC bytestream data into RDOs
@@ -130,9 +130,6 @@ def MdtBytestreamDecodeCfg(flags, forTrigger=False):
MuonMdtRawDataProviderTool = Muon__MDT_RawDataProviderTool(name = "MDT_RawDataProviderTool",
Decoder = MDTRodDecoder)
if forTrigger:
- # Trigger the creation of cache containers
- cacheAcc,cacheAlg = MuonCacheCfg()
- acc.merge( cacheAcc )
# tell the raw data provider tool to use the cache
MuonMdtRawDataProviderTool.CsmContainerCacheKey = MuonCacheNames.MdtCsmCache
@@ -170,9 +167,6 @@ def CscBytestreamDecodeCfg(flags, forTrigger=False):
MuonCscRawDataProviderTool = Muon__CSC_RawDataProviderTool(name = "CSC_RawDataProviderTool",
Decoder = CSCRodDecoder)
if forTrigger:
- # Trigger the creation of cache containers
- cacheAcc,cacheAlg = MuonCacheCfg()
- acc.merge( cacheAcc )
# tell the raw data provider tool to use the cache
MuonCscRawDataProviderTool.CscContainerCacheKey = MuonCacheNames.CscCache
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index f96f53de9347697ec427bbb5ba348a2b73532a80..1398b7bf5cafe9b2db943bbbb066e2b52685c87b 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -169,11 +169,17 @@ def muonRdoDecodeTestData( forTrigger = False ):
log.info('About to setup Rpc Raw data decoding')
cfg=ComponentAccumulator()
+
# Seem to need this to read BS properly
from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg
cfg.merge(TrigBSReadCfg(ConfigFlags ))
+ if forTrigger:
+ # cache creators loaded independently
+ from MuonConfig.MuonBytestreamDecodeConfig import MuonCacheCfg
+ cfg.merge( MuonCacheCfg() )
+
# Schedule Rpc bytestream data decoding - once mergeAll is working can simplify these lines
from MuonConfig.MuonBytestreamDecodeConfig import RpcBytestreamDecodeCfg
rpcdecodingAcc, rpcdecodingAlg = RpcBytestreamDecodeCfg( ConfigFlags )
diff --git a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
index 0c3da702cdbd62bc62873c119b8f8ddb36b8bdf7..411d55dcbaee95b3b5cd697423f63b202f43aa44 100644
--- a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
+++ b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
@@ -72,6 +72,7 @@ Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderS
Py:ComponentAccumulator DEBUG Adding component ByteStreamAttListMetadataSvc/ByteStreamAttListMetadataSvc to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbMetaDataTool/IOVDbMetaDataTool to the job
Py:ComponentAccumulator DEBUG Adding component ByteStreamMetadataTool/ByteStreamMetadataTool to the job
+Py:ComponentAccumulator DEBUG Merging algorithm MuonCacheCreator to a sequence AthAlgSeq
Py:Athena INFO using release [AthenaExternals-22.0.1] [x86_64-centos7-gcc8-opt] [2.0.25/141317d] -- built on [2019-03-11T2107]
dynamically loading the flag Detector
Flag Name : Value
@@ -658,7 +659,6 @@ Py:IOVDbSvc.CondDB DEBUG Loading basic services for CondDBSetup...
Py:ConfigurableDb DEBUG loading confDb files...
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libMagFieldServices.confdb]...
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libCaloRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libTrigUpgradeTest.confdb]...
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libCaloTools.confdb]...
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libLArCabling.confdb]...
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libegammaCaloTools.confdb]...
@@ -666,6 +666,7 @@ Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gc
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libLArCellRec.confdb]...
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/WorkDir.confdb]...
Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libTrigT2CaloCommon.confdb]...
+Py:ConfigurableDb DEBUG -loading [/home/wlampl/master/build/x86_64-centos7-gcc8-opt/lib/libTrigUpgradeTest.confdb]...
Py:ConfigurableDb DEBUG -loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-03-11T2143/GAUDI/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/lib/Gaudi.confdb]...
Py:ConfigurableDb DEBUG -loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-03-11T2143/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/lib/Athena.confdb]...
Py:ConfigurableDb DEBUG loading confDb files... [DONE]
@@ -747,9 +748,7 @@ Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
Py:ComponentAccumulator DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
-Py:ComponentAccumulator DEBUG Merging algorithm MuonCacheCreator to a sequence AthAlgSeq
Py:ComponentAccumulator DEBUG Adding component Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool to the job
-Py:ComponentAccumulator DEBUG Merging algorithm MuonCacheCreator to a sequence AthAlgSeq
Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
Py:ComponentAccumulator DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
@@ -826,7 +825,6 @@ Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
Py:ComponentAccumulator DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
-Py:ComponentAccumulator DEBUG Merging algorithm MuonCacheCreator to a sequence AthAlgSeq
Py:ComponentAccumulator DEBUG Adding component Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool to the job
Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
@@ -1449,27 +1447,59 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
|-AuditStop = False
|-Cardinality = 0
|-ContinueEventloopOnFPE = False
-|-DetStore @0x7f16dec04f50 = ServiceHandle('StoreGateSvc/DetectorStore')
+|-DetStore @0x7f4fdccaff90 = ServiceHandle('StoreGateSvc/DetectorStore')
|-Enable = True
|-ErrorCounter = 0
|-ErrorMax = 1
-|-EvtStore @0x7f16dec04ed0 = ServiceHandle('StoreGateSvc')
-|-ExtraInputs @0x7f16dd1998c0 = [] (default: [])
-|-ExtraOutputs @0x7f16dd199950 = [] (default: [])
+|-EvtStore @0x7f4fdccaff10 = ServiceHandle('StoreGateSvc')
+|-ExtraInputs @0x7f4fdb241830 = [] (default: [])
+|-ExtraOutputs @0x7f4fdb2418c0 = [] (default: [])
|-FilterCircularDependencies = True
|-IgnoreFilterPassed = False
|-IsIOBound = False
-|-Members @0x7f16dd199560 = ['Muon::RpcRawDataProvider/RpcRawDataProvider', 'Muon::TgcRawDataProvider/TgcRawDataProvider', 'MuonCacheCreator/MuonCacheCreator', 'Muon::MdtRawDataProvider/MdtRawDataProvider', 'Muon::CscRawDataProvider/CscRawDataProvider', 'RpcRdoToRpcPrepData/RpcRdoToRpcPrepData', 'TgcRdoToTgcPrepData/TgcRdoToTgcPrepData', 'MdtRdoToMdtPrepData/MdtRdoToMdtPrepData', 'CscRdoToCscPrepData/CscRdoToCscPrepData', 'CscThresholdClusterBuilder/CscThesholdClusterBuilder']
+|-Members @0x7f4fdb2413f8 = ['MuonCacheCreator/MuonCacheCreator', 'Muon::RpcRawDataProvider/RpcRawDataProvider', 'Muon::TgcRawDataProvider/TgcRawDataProvider', 'Muon::MdtRawDataProvider/MdtRawDataProvider', 'Muon::CscRawDataProvider/CscRawDataProvider', 'RpcRdoToRpcPrepData/RpcRdoToRpcPrepData', 'TgcRdoToTgcPrepData/TgcRdoToTgcPrepData', 'MdtRdoToMdtPrepData/MdtRdoToMdtPrepData', 'CscRdoToCscPrepData/CscRdoToCscPrepData', 'CscThresholdClusterBuilder/CscThesholdClusterBuilder']
| (default: [])
|-ModeOR = False
|-MonitorService = 'MonitorSvc'
-|-NeededResources @0x7f16dd1997a0 = [] (default: [])
+|-NeededResources @0x7f4fdb241710 = [] (default: [])
|-OutputLevel = 0
|-RegisterForContextService = False
-|-Sequential @0x7f16e0dc8b00 = True (default: False)
+|-Sequential @0x7f4fdee72b00 = True (default: False)
|-StopOverride = False
|-TimeOut = 0.0
|-Timeline = True
+|=/***** Algorithm MuonCacheCreator/MuonCacheCreator *************************************************
+| |-AuditAlgorithms = False
+| |-AuditBeginRun = False
+| |-AuditEndRun = False
+| |-AuditExecute = False
+| |-AuditFinalize = False
+| |-AuditInitialize = False
+| |-AuditReinitialize = False
+| |-AuditRestart = False
+| |-AuditStart = False
+| |-AuditStop = False
+| |-Cardinality = 0
+| |-CscCacheKey @0x7f4fdbb9e780 = 'CscCache' (default: 'StoreGateSvc+')
+| |-DetStore @0x7f4fdb9cfed0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DisableViewWarning = False
+| |-Enable = True
+| |-ErrorCounter = 0
+| |-ErrorMax = 1
+| |-EvtStore @0x7f4fdb9cfe50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241908 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241758 = [] (default: [])
+| |-FilterCircularDependencies = True
+| |-IsIOBound = False
+| |-MdtCsmCacheKey @0x7f4fdbb9e480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
+| |-MonitorService = 'MonitorSvc'
+| |-NeededResources @0x7f4fdb241950 = [] (default: [])
+| |-OutputLevel = 0
+| |-RegisterForContextService = False
+| |-RpcCacheKey @0x7f4fdbb9e4b0 = 'RpcCache' (default: 'StoreGateSvc+')
+| |-TgcCacheKey @0x7f4fdbb9e4e0 = 'TgcCache' (default: 'StoreGateSvc+')
+| |-Timeline = True
+| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
|=/***** Algorithm Muon::RpcRawDataProvider/RpcRawDataProvider ***************************************
| |-AuditAlgorithms = False
| |-AuditBeginRun = False
@@ -1482,22 +1512,22 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd827a10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9c1150 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd827990 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199a70 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1997e8 = [] (default: [])
+| |-EvtStore @0x7f4fdb9c10d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb2415f0 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241a70 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199680 = [] (default: [])
+| |-NeededResources @0x7f4fdb241ab8 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16ddce5908 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdbbf8718 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
| | (default: 'Muon::RPC_RawDataProviderTool/RpcRawDataProviderTool')
-| |-RegionSelectionSvc @0x7f16dd827a90 = ServiceHandle('RegSelSvc')
+| |-RegionSelectionSvc @0x7f4fdb9c11d0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -1509,11 +1539,11 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f16ddce5a00 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
-| | |-DetStore @0x7f16dd796850 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd796890 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd811758 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd8114d0 = [] (default: [])
+| | |-Decoder @0x7f4fdbbf8810 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
+| | |-DetStore @0x7f4fdb87c890 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb87c8d0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb877c20 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb877d40 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RPCSec = 'StoreGateSvc+RPC_SECTORLOGIC'
@@ -1527,10 +1557,10 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStop = False
| | | |-AuditTools = False
| | | |-DataErrorPrintLimit = 1000
-| | | |-DetStore @0x7f16dd796950 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd796990 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd8115f0 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd8115a8 = [] (default: [])
+| | | |-DetStore @0x7f4fdb87c990 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb87c9d0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb877dd0 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb877d88 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-Sector13Data = False
@@ -1550,19 +1580,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd7789d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9cf110 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd778950 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199cb0 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199d88 = [] (default: [])
+| |-EvtStore @0x7f4fdb9cf090 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241cf8 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241dd0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199cf8 = [] (default: [])
+| |-NeededResources @0x7f4fdb241d40 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16de9b29b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdca5f9b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
| | (default: 'Muon::TGC_RawDataProviderTool/TgcRawDataProviderTool')
| |-RegisterForContextService = False
| |-Timeline = True
@@ -1574,12 +1604,12 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f16de9b2aa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
+| | |-Decoder @0x7f4fdca5faa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
| | | (default: 'Muon::TGC_RodDecoderReadout/TGC_RodDecoderReadout')
-| | |-DetStore @0x7f16dd7bde90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd7bded0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd7c7710 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd7c7560 = [] (default: [])
+| | |-DetStore @0x7f4fdb826ed0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb826f10 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb82c8c0 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb82c710 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RdoLocation = 'StoreGateSvc+TGCRDO'
@@ -1591,10 +1621,10 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd7bdf90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd7bdfd0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd7c73b0 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd7c7518 = [] (default: [])
+| | | |-DetStore @0x7f4fdb826fd0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb831050 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb82c560 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb82c6c8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ShowStatusWords = False
@@ -1602,38 +1632,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | \----- (End of Private AlgTool Muon::TGC_RodDecoderReadout/TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder) -----
| | \----- (End of Private AlgTool Muon::TGC_RawDataProviderTool/TgcRawDataProvider.TGC_RawDataProviderTool) -----
| \----- (End of Algorithm Muon::TgcRawDataProvider/TgcRawDataProvider) ------------------------------
-|=/***** Algorithm MuonCacheCreator/MuonCacheCreator *************************************************
-| |-AuditAlgorithms = False
-| |-AuditBeginRun = False
-| |-AuditEndRun = False
-| |-AuditExecute = False
-| |-AuditFinalize = False
-| |-AuditInitialize = False
-| |-AuditReinitialize = False
-| |-AuditRestart = False
-| |-AuditStart = False
-| |-AuditStop = False
-| |-Cardinality = 0
-| |-CscCacheKey @0x7f16ddb72780 = 'CscCache' (default: 'StoreGateSvc+')
-| |-DetStore @0x7f16dd78a7d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| |-DisableViewWarning = False
-| |-Enable = True
-| |-ErrorCounter = 0
-| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd78a750 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd2f2560 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd2f2518 = [] (default: [])
-| |-FilterCircularDependencies = True
-| |-IsIOBound = False
-| |-MdtCsmCacheKey @0x7f16ddb72480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
-| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd2f22d8 = [] (default: [])
-| |-OutputLevel = 0
-| |-RegisterForContextService = False
-| |-RpcCacheKey @0x7f16ddb724b0 = 'RpcCache' (default: 'StoreGateSvc+')
-| |-TgcCacheKey @0x7f16ddb724e0 = 'TgcCache' (default: 'StoreGateSvc+')
-| |-Timeline = True
-| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
|=/***** Algorithm Muon::MdtRawDataProvider/MdtRawDataProvider ***************************************
| |-AuditAlgorithms = False
| |-AuditBeginRun = False
@@ -1646,19 +1644,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd77ac10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9b4350 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd77ab90 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199998 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199dd0 = [] (default: [])
+| |-EvtStore @0x7f4fdb9b42d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241e18 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241ea8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199e18 = [] (default: [])
+| |-NeededResources @0x7f4fdb241d88 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16dda26a50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdbb9cc50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
| | (default: 'Muon::MDT_RawDataProviderTool/MdtRawDataProviderTool')
| |-RegisterForContextService = False
| |-Timeline = True
@@ -1670,14 +1668,14 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-CsmContainerCacheKey @0x7f16ddb72480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
-| | |-Decoder @0x7f16de9b2d70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
-| | |-DetStore @0x7f16dd32ffd0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd2b9050 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd323a28 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd323a70 = [] (default: [])
+| | |-CsmContainerCacheKey @0x7f4fdbb9e480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
+| | |-Decoder @0x7f4fdca5fd70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
+| | |-DetStore @0x7f4fdb3dafd0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb363050 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb3ceb90 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb3cea28 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
-| | |-OutputLevel @ 0x123c1d8 = 1 (default: 0)
+| | |-OutputLevel @ 0xa0e1d8 = 1 (default: 0)
| | |-RdoLocation = 'StoreGateSvc+MDTCSM'
| | |-ReadKey = 'ConditionStore+MuonMDT_CablingMap'
| | |=/***** Private AlgTool MdtROD_Decoder/MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder *****
@@ -1688,10 +1686,10 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd2b9110 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd2b9150 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd323908 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd3238c0 = [] (default: [])
+| | | |-DetStore @0x7f4fdb363110 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb363150 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb3ceab8 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb3cea70 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ReadKey = 'ConditionStore+MuonMDT_CablingMap'
@@ -1711,19 +1709,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd80ead0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9c5850 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd80ea50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199ef0 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199e60 = [] (default: [])
+| |-EvtStore @0x7f4fdb9c5790 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241f38 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241e60 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199ab8 = [] (default: [])
+| |-NeededResources @0x7f4fdb2419e0 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16dda26c50 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdbb9ce50 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
| | (default: 'Muon::CSC_RawDataProviderTool/CscRawDataProviderTool')
| |-RegisterForContextService = False
| |-Timeline = True
@@ -1735,15 +1733,15 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-CscContainerCacheKey @0x7f16ddb72780 = 'CscCache' (default: 'StoreGateSvc+')
-| | |-Decoder @0x7f16dd753050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
-| | |-DetStore @0x7f16dd2f1e90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-CscContainerCacheKey @0x7f4fdbb9e780 = 'CscCache' (default: 'StoreGateSvc+')
+| | |-Decoder @0x7f4fdb7fe050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+| | |-DetStore @0x7f4fdb31ee90 = ServiceHandle('StoreGateSvc/DetectorStore')
| | |-EventInfoKey = 'StoreGateSvc+EventInfo'
-| | |-EvtStore @0x7f16dd2f1ed0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd2f2098 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd2f2200 = [] (default: [])
+| | |-EvtStore @0x7f4fdb31eed0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb320c68 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb320f80 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
-| | |-OutputLevel @ 0x123c1d8 = 1 (default: 0)
+| | |-OutputLevel @ 0xa0e1d8 = 1 (default: 0)
| | |-RdoLocation = 'StoreGateSvc+CSCRDO'
| | |=/***** Private AlgTool Muon::CscROD_Decoder/CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder *****
| | | |-AuditFinalize = False
@@ -1753,10 +1751,10 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd2f1f90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd2f1fd0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd273cf8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd273cb0 = [] (default: [])
+| | | |-DetStore @0x7f4fdb31ef90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb31efd0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb320d88 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb320d40 = [] (default: [])
| | | |-IsCosmics = False
| | | |-IsOldCosmics = False
| | | |-MonitorService = 'MonitorSvc'
@@ -1776,25 +1774,25 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DecodingTool @0x7f16de8c3e68 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
+| |-DecodingTool @0x7f4fdc96ce68 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
| | (default: 'Muon::RpcRdoToPrepDataTool/RpcRdoToPrepDataTool')
-| |-DetStore @0x7f16dd2ab8d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb355950 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd2ab850 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a60e0 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199d40 = [] (default: [])
+| |-EvtStore @0x7f4fdb3558d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb251128 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241ef0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199f38 = [] (default: [])
+| |-NeededResources @0x7f4fdb241b00 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+RPC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f16dd2ab950 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectionSvc @0x7f4fdb3559d0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -1807,16 +1805,16 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21aa90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd21ab10 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd2860e0 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd286e18 = [] (default: [])
+| | |-DetStore @0x7f4fdb2c5b10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb2c5b90 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb333fc8 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb3338c0 = [] (default: [])
| | |-InputCollection = 'StoreGateSvc+RPC_triggerHits'
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+RPCPAD'
| | |-OutputLevel = 0
| | |-RPCInfoFromDb = False
-| | |-RdoDecoderTool @0x7f16dd69d590 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
+| | |-RdoDecoderTool @0x7f4fdb7374b0 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
| | | (default: 'Muon::RpcRDO_Decoder')
| | |-TriggerOutputCollection = 'StoreGateSvc+RPC_Measurements'
| | |-etaphi_coincidenceTime = 20.0
@@ -1834,10 +1832,10 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd21ab90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd21abd0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd27d098 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd27d050 = [] (default: [])
+| | | |-DetStore @0x7f4fdb2c5c10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb2c5c50 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb333a28 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb333ab8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::RpcRDO_Decoder/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool.Muon::RpcRDO_Decoder) -----
@@ -1855,25 +1853,25 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DecodingTool @0x7f16dd22b050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
+| |-DecodingTool @0x7f4fdb2d3050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
| | (default: 'Muon::TgcRdoToPrepDataTool/TgcPrepDataProviderTool')
-| |-DetStore @0x7f16dd2057d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb2ae850 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd205750 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6098 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199ea8 = [] (default: [])
+| |-EvtStore @0x7f4fdb2ae7d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb251050 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb251170 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a6128 = [] (default: [])
+| |-NeededResources @0x7f4fdb251098 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+TGC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectorSvc @0x7f16dd205850 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectorSvc @0x7f4fdb2ae8d0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Setting = 0
@@ -1887,10 +1885,10 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21ac10 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd21add0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd229170 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd229128 = [] (default: [])
+| | |-DetStore @0x7f4fdb2c5c90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb2c5e50 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb2d4e18 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb2d4dd0 = [] (default: [])
| | |-FillCoinData = True
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCoinCollection = 'TrigT1CoinDataCollection'
@@ -1899,9 +1897,9 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-RDOContainer = 'StoreGateSvc+TGCRDO'
| | |-TGCHashIdOffset = 26000
| | |-dropPrdsWithZeroWidth = True
-| | |-outputCoinKey @0x7f16dd229050 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
+| | |-outputCoinKey @0x7f4fdb2d4878 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
| | | (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
-| | |-prepDataKeys @0x7f16dd229200 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
+| | |-prepDataKeys @0x7f4fdb2d4ea8 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
| | | (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
| | |-show_warning_level_invalid_A09_SSW6_hit = False
| | \----- (End of Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool) -----
@@ -1918,25 +1916,25 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DecodingTool @0x7f16e0e71890 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
+| |-DecodingTool @0x7f4fdef1b9f0 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
| | (default: 'Muon::MdtRdoToPrepDataTool/MdtPrepDataProviderTool')
-| |-DetStore @0x7f16dd29a790 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb345810 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd29a710 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6290 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1a6050 = [] (default: [])
+| |-EvtStore @0x7f4fdb345790 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb2512d8 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb2510e0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a6200 = [] (default: [])
+| |-NeededResources @0x7f4fdb251248 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f16dd29a810 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectionSvc @0x7f4fdb345890 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -1950,13 +1948,13 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditTools = False
| | |-CalibratePrepData = True
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21ae10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-DetStore @0x7f4fdb2c5d50 = ServiceHandle('StoreGateSvc/DetectorStore')
| | |-DiscardSecondaryHitTwin = False
| | |-DoPropagationCorrection = False
| | |-DoTofCorrection = True
-| | |-EvtStore @0x7f16dd21af90 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd22a2d8 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd22a128 = [] (default: [])
+| | |-EvtStore @0x7f4fdb2c5fd0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb2d0dd0 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb2d45a8 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| | |-OutputLevel = 0
@@ -1984,25 +1982,25 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-CscRdoToCscPrepDataTool @0x7f16dd909380 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
+| |-CscRdoToCscPrepDataTool @0x7f4fdb8fa380 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
| | (default: 'Muon::CscRdoToCscPrepDataTool/CscRdoToPrepDataTool')
-| |-DetStore @0x7f16dd27fd10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb32bcd0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd27fc10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6368 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1a61b8 = [] (default: [])
+| |-EvtStore @0x7f4fdb32bbd0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb2513b0 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb251200 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a62d8 = [] (default: [])
+| |-NeededResources @0x7f4fdb251320 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f16dd27fd90 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectionSvc @0x7f4fdb32bd50 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -2015,13 +2013,13 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-CSCHashIdOffset = 22000
-| | |-CscCalibTool @0x7f16e0e74860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
-| | |-CscRdoDecoderTool @0x7f16dd223de8 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
+| | |-CscCalibTool @0x7f4fdef1e860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
+| | |-CscRdoDecoderTool @0x7f4fdb2cdde8 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21ad50 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd237090 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd23b098 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd23b488 = [] (default: [])
+| | |-DetStore @0x7f4fdb2de050 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb2de150 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb2e5170 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb2e54d0 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| | |-OutputLevel = 0
@@ -2034,10 +2032,10 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd2370d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd237290 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd236cf8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd236878 = [] (default: [])
+| | | |-DetStore @0x7f4fdb2de190 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb2de1d0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb2e1bd8 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb2e19e0 = [] (default: [])
| | | |-IsOnline = True
| | | |-Latency = 100.0
| | | |-MonitorService = 'MonitorSvc'
@@ -2064,11 +2062,11 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-CscCalibTool @0x7f16dd237250 = PublicToolHandle('CscCalibTool')
-| | | |-DetStore @0x7f16dd237110 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd237050 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd2367a0 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd236f38 = [] (default: [])
+| | | |-CscCalibTool @0x7f4fdb2de0d0 = PublicToolHandle('CscCalibTool')
+| | | |-DetStore @0x7f4fdb2de090 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb2de110 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb2e5248 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb2e52d8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::CscRDO_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscRDO_Decoder) -----
@@ -2086,21 +2084,21 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd25e610 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb307690 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd25e590 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6320 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1a6170 = [] (default: [])
+| |-EvtStore @0x7f4fdb307610 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb251368 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb2511b8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a63b0 = [] (default: [])
+| |-NeededResources @0x7f4fdb2513f8 = [] (default: [])
| |-OutputLevel = 0
| |-RegisterForContextService = False
| |-Timeline = True
-| |-cluster_builder @0x7f16dd1a0f10 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
+| |-cluster_builder @0x7f4fdb238f90 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
| | (default: 'CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool')
| \----- (End of Algorithm CscThresholdClusterBuilder/CscThesholdClusterBuilder) ---------------------
\----- (End of Algorithm AthSequencer/AthAlgSeq) ---------------------------------------------------
@@ -2143,27 +2141,59 @@ Py:Athena INFO Save Config
|-AuditStop = False
|-Cardinality = 0
|-ContinueEventloopOnFPE = False
-|-DetStore @0x7f16dec04f50 = ServiceHandle('StoreGateSvc/DetectorStore')
+|-DetStore @0x7f4fdccaff90 = ServiceHandle('StoreGateSvc/DetectorStore')
|-Enable = True
|-ErrorCounter = 0
|-ErrorMax = 1
-|-EvtStore @0x7f16dec04ed0 = ServiceHandle('StoreGateSvc')
-|-ExtraInputs @0x7f16dd1998c0 = [] (default: [])
-|-ExtraOutputs @0x7f16dd199950 = [] (default: [])
+|-EvtStore @0x7f4fdccaff10 = ServiceHandle('StoreGateSvc')
+|-ExtraInputs @0x7f4fdb241830 = [] (default: [])
+|-ExtraOutputs @0x7f4fdb2418c0 = [] (default: [])
|-FilterCircularDependencies = True
|-IgnoreFilterPassed = False
|-IsIOBound = False
-|-Members @0x7f16dd1994d0 = ['Muon::RpcRawDataProvider/RpcRawDataProvider', 'Muon::TgcRawDataProvider/TgcRawDataProvider', 'MuonCacheCreator/MuonCacheCreator', 'Muon::MdtRawDataProvider/MdtRawDataProvider', 'Muon::CscRawDataProvider/CscRawDataProvider', 'RpcRdoToRpcPrepData/RpcRdoToRpcPrepData', 'TgcRdoToTgcPrepData/TgcRdoToTgcPrepData', 'MdtRdoToMdtPrepData/MdtRdoToMdtPrepData', 'CscRdoToCscPrepData/CscRdoToCscPrepData', 'CscThresholdClusterBuilder/CscThesholdClusterBuilder']
+|-Members @0x7f4fdb836c68 = ['MuonCacheCreator/MuonCacheCreator', 'Muon::RpcRawDataProvider/RpcRawDataProvider', 'Muon::TgcRawDataProvider/TgcRawDataProvider', 'Muon::MdtRawDataProvider/MdtRawDataProvider', 'Muon::CscRawDataProvider/CscRawDataProvider', 'RpcRdoToRpcPrepData/RpcRdoToRpcPrepData', 'TgcRdoToTgcPrepData/TgcRdoToTgcPrepData', 'MdtRdoToMdtPrepData/MdtRdoToMdtPrepData', 'CscRdoToCscPrepData/CscRdoToCscPrepData', 'CscThresholdClusterBuilder/CscThesholdClusterBuilder']
| (default: [])
|-ModeOR = False
|-MonitorService = 'MonitorSvc'
-|-NeededResources @0x7f16dd1997a0 = [] (default: [])
+|-NeededResources @0x7f4fdb241710 = [] (default: [])
|-OutputLevel = 0
|-RegisterForContextService = False
-|-Sequential @0x7f16e0dc8b00 = True (default: False)
+|-Sequential @0x7f4fdee72b00 = True (default: False)
|-StopOverride = False
|-TimeOut = 0.0
|-Timeline = True
+|=/***** Algorithm MuonCacheCreator/MuonCacheCreator *************************************************
+| |-AuditAlgorithms = False
+| |-AuditBeginRun = False
+| |-AuditEndRun = False
+| |-AuditExecute = False
+| |-AuditFinalize = False
+| |-AuditInitialize = False
+| |-AuditReinitialize = False
+| |-AuditRestart = False
+| |-AuditStart = False
+| |-AuditStop = False
+| |-Cardinality = 0
+| |-CscCacheKey @0x7f4fdbb9e780 = 'CscCache' (default: 'StoreGateSvc+')
+| |-DetStore @0x7f4fdb9cfed0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DisableViewWarning = False
+| |-Enable = True
+| |-ErrorCounter = 0
+| |-ErrorMax = 1
+| |-EvtStore @0x7f4fdb9cfe50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241908 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241758 = [] (default: [])
+| |-FilterCircularDependencies = True
+| |-IsIOBound = False
+| |-MdtCsmCacheKey @0x7f4fdbb9e480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
+| |-MonitorService = 'MonitorSvc'
+| |-NeededResources @0x7f4fdb241950 = [] (default: [])
+| |-OutputLevel = 0
+| |-RegisterForContextService = False
+| |-RpcCacheKey @0x7f4fdbb9e4b0 = 'RpcCache' (default: 'StoreGateSvc+')
+| |-TgcCacheKey @0x7f4fdbb9e4e0 = 'TgcCache' (default: 'StoreGateSvc+')
+| |-Timeline = True
+| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
|=/***** Algorithm Muon::RpcRawDataProvider/RpcRawDataProvider ***************************************
| |-AuditAlgorithms = False
| |-AuditBeginRun = False
@@ -2176,22 +2206,22 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd827a10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9c1150 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd827990 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199a70 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1997e8 = [] (default: [])
+| |-EvtStore @0x7f4fdb9c10d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb2415f0 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241a70 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199680 = [] (default: [])
+| |-NeededResources @0x7f4fdb241ab8 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16ddce5908 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdbbf8718 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
| | (default: 'Muon::RPC_RawDataProviderTool/RpcRawDataProviderTool')
-| |-RegionSelectionSvc @0x7f16dd827a90 = ServiceHandle('RegSelSvc')
+| |-RegionSelectionSvc @0x7f4fdb9c11d0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -2203,11 +2233,11 @@ Py:Athena INFO Save Config
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f16ddce5a00 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
-| | |-DetStore @0x7f16dd796850 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd796890 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd811758 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd8114d0 = [] (default: [])
+| | |-Decoder @0x7f4fdbbf8810 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
+| | |-DetStore @0x7f4fdb87c890 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb87c8d0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb877c20 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb877d40 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RPCSec = 'StoreGateSvc+RPC_SECTORLOGIC'
@@ -2221,10 +2251,10 @@ Py:Athena INFO Save Config
| | | |-AuditStop = False
| | | |-AuditTools = False
| | | |-DataErrorPrintLimit = 1000
-| | | |-DetStore @0x7f16dd796950 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd796990 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd8115f0 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd8115a8 = [] (default: [])
+| | | |-DetStore @0x7f4fdb87c990 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb87c9d0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb877dd0 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb877d88 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-Sector13Data = False
@@ -2244,19 +2274,19 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd7789d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9cf110 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd778950 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199cb0 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199d88 = [] (default: [])
+| |-EvtStore @0x7f4fdb9cf090 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241cf8 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241dd0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199cf8 = [] (default: [])
+| |-NeededResources @0x7f4fdb241d40 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16de9b29b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdca5f9b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
| | (default: 'Muon::TGC_RawDataProviderTool/TgcRawDataProviderTool')
| |-RegisterForContextService = False
| |-Timeline = True
@@ -2268,12 +2298,12 @@ Py:Athena INFO Save Config
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f16de9b2aa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
+| | |-Decoder @0x7f4fdca5faa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
| | | (default: 'Muon::TGC_RodDecoderReadout/TGC_RodDecoderReadout')
-| | |-DetStore @0x7f16dd7bde90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd7bded0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd7c7710 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd7c7560 = [] (default: [])
+| | |-DetStore @0x7f4fdb826ed0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb826f10 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb82c8c0 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb82c710 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RdoLocation = 'StoreGateSvc+TGCRDO'
@@ -2285,10 +2315,10 @@ Py:Athena INFO Save Config
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd7bdf90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd7bdfd0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd7c73b0 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd7c7518 = [] (default: [])
+| | | |-DetStore @0x7f4fdb826fd0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb831050 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb82c560 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb82c6c8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ShowStatusWords = False
@@ -2296,38 +2326,6 @@ Py:Athena INFO Save Config
| | | \----- (End of Private AlgTool Muon::TGC_RodDecoderReadout/TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder) -----
| | \----- (End of Private AlgTool Muon::TGC_RawDataProviderTool/TgcRawDataProvider.TGC_RawDataProviderTool) -----
| \----- (End of Algorithm Muon::TgcRawDataProvider/TgcRawDataProvider) ------------------------------
-|=/***** Algorithm MuonCacheCreator/MuonCacheCreator *************************************************
-| |-AuditAlgorithms = False
-| |-AuditBeginRun = False
-| |-AuditEndRun = False
-| |-AuditExecute = False
-| |-AuditFinalize = False
-| |-AuditInitialize = False
-| |-AuditReinitialize = False
-| |-AuditRestart = False
-| |-AuditStart = False
-| |-AuditStop = False
-| |-Cardinality = 0
-| |-CscCacheKey @0x7f16ddb72780 = 'CscCache' (default: 'StoreGateSvc+')
-| |-DetStore @0x7f16dd78a7d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| |-DisableViewWarning = False
-| |-Enable = True
-| |-ErrorCounter = 0
-| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd78a750 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd2f2560 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd2f2518 = [] (default: [])
-| |-FilterCircularDependencies = True
-| |-IsIOBound = False
-| |-MdtCsmCacheKey @0x7f16ddb72480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
-| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd2f22d8 = [] (default: [])
-| |-OutputLevel = 0
-| |-RegisterForContextService = False
-| |-RpcCacheKey @0x7f16ddb724b0 = 'RpcCache' (default: 'StoreGateSvc+')
-| |-TgcCacheKey @0x7f16ddb724e0 = 'TgcCache' (default: 'StoreGateSvc+')
-| |-Timeline = True
-| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
|=/***** Algorithm Muon::MdtRawDataProvider/MdtRawDataProvider ***************************************
| |-AuditAlgorithms = False
| |-AuditBeginRun = False
@@ -2340,19 +2338,19 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd77ac10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9b4350 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd77ab90 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199998 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199dd0 = [] (default: [])
+| |-EvtStore @0x7f4fdb9b42d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241e18 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241ea8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199e18 = [] (default: [])
+| |-NeededResources @0x7f4fdb241d88 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16dda26a50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdbb9cc50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
| | (default: 'Muon::MDT_RawDataProviderTool/MdtRawDataProviderTool')
| |-RegisterForContextService = False
| |-Timeline = True
@@ -2364,14 +2362,14 @@ Py:Athena INFO Save Config
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-CsmContainerCacheKey @0x7f16ddb72480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
-| | |-Decoder @0x7f16de9b2d70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
-| | |-DetStore @0x7f16dd32ffd0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd2b9050 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd323a28 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd323a70 = [] (default: [])
+| | |-CsmContainerCacheKey @0x7f4fdbb9e480 = 'MdtCsmCache' (default: 'StoreGateSvc+')
+| | |-Decoder @0x7f4fdca5fd70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
+| | |-DetStore @0x7f4fdb3dafd0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb363050 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb3ceb90 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb3cea28 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
-| | |-OutputLevel @ 0x123c1d8 = 1 (default: 0)
+| | |-OutputLevel @ 0xa0e1d8 = 1 (default: 0)
| | |-RdoLocation = 'StoreGateSvc+MDTCSM'
| | |-ReadKey = 'ConditionStore+MuonMDT_CablingMap'
| | |=/***** Private AlgTool MdtROD_Decoder/MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder *****
@@ -2382,10 +2380,10 @@ Py:Athena INFO Save Config
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd2b9110 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd2b9150 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd323908 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd3238c0 = [] (default: [])
+| | | |-DetStore @0x7f4fdb363110 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb363150 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb3ceab8 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb3cea70 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ReadKey = 'ConditionStore+MuonMDT_CablingMap'
@@ -2405,19 +2403,19 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd80ead0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb9c5850 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd80ea50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd199ef0 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199e60 = [] (default: [])
+| |-EvtStore @0x7f4fdb9c5790 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb241f38 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241e60 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199ab8 = [] (default: [])
+| |-NeededResources @0x7f4fdb2419e0 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f16dda26c50 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
+| |-ProviderTool @0x7f4fdbb9ce50 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
| | (default: 'Muon::CSC_RawDataProviderTool/CscRawDataProviderTool')
| |-RegisterForContextService = False
| |-Timeline = True
@@ -2429,15 +2427,15 @@ Py:Athena INFO Save Config
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-CscContainerCacheKey @0x7f16ddb72780 = 'CscCache' (default: 'StoreGateSvc+')
-| | |-Decoder @0x7f16dd753050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
-| | |-DetStore @0x7f16dd2f1e90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-CscContainerCacheKey @0x7f4fdbb9e780 = 'CscCache' (default: 'StoreGateSvc+')
+| | |-Decoder @0x7f4fdb7fe050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+| | |-DetStore @0x7f4fdb31ee90 = ServiceHandle('StoreGateSvc/DetectorStore')
| | |-EventInfoKey = 'StoreGateSvc+EventInfo'
-| | |-EvtStore @0x7f16dd2f1ed0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd2f2098 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd2f2200 = [] (default: [])
+| | |-EvtStore @0x7f4fdb31eed0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb320c68 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb320f80 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
-| | |-OutputLevel @ 0x123c1d8 = 1 (default: 0)
+| | |-OutputLevel @ 0xa0e1d8 = 1 (default: 0)
| | |-RdoLocation = 'StoreGateSvc+CSCRDO'
| | |=/***** Private AlgTool Muon::CscROD_Decoder/CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder *****
| | | |-AuditFinalize = False
@@ -2447,10 +2445,10 @@ Py:Athena INFO Save Config
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd2f1f90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd2f1fd0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd273cf8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd273cb0 = [] (default: [])
+| | | |-DetStore @0x7f4fdb31ef90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb31efd0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb320d88 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb320d40 = [] (default: [])
| | | |-IsCosmics = False
| | | |-IsOldCosmics = False
| | | |-MonitorService = 'MonitorSvc'
@@ -2470,25 +2468,25 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DecodingTool @0x7f16de8c3e68 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
+| |-DecodingTool @0x7f4fdc96ce68 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
| | (default: 'Muon::RpcRdoToPrepDataTool/RpcRdoToPrepDataTool')
-| |-DetStore @0x7f16dd2ab8d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb355950 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd2ab850 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a60e0 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199d40 = [] (default: [])
+| |-EvtStore @0x7f4fdb3558d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb251128 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb241ef0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd199f38 = [] (default: [])
+| |-NeededResources @0x7f4fdb241b00 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+RPC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f16dd2ab950 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectionSvc @0x7f4fdb3559d0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -2501,16 +2499,16 @@ Py:Athena INFO Save Config
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21aa90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd21ab10 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd2860e0 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd286e18 = [] (default: [])
+| | |-DetStore @0x7f4fdb2c5b10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb2c5b90 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb333fc8 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb3338c0 = [] (default: [])
| | |-InputCollection = 'StoreGateSvc+RPC_triggerHits'
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+RPCPAD'
| | |-OutputLevel = 0
| | |-RPCInfoFromDb = False
-| | |-RdoDecoderTool @0x7f16dd69d590 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
+| | |-RdoDecoderTool @0x7f4fdb7374b0 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
| | | (default: 'Muon::RpcRDO_Decoder')
| | |-TriggerOutputCollection = 'StoreGateSvc+RPC_Measurements'
| | |-etaphi_coincidenceTime = 20.0
@@ -2528,10 +2526,10 @@ Py:Athena INFO Save Config
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd21ab90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd21abd0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd27d098 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd27d050 = [] (default: [])
+| | | |-DetStore @0x7f4fdb2c5c10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb2c5c50 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb333a28 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb333ab8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::RpcRDO_Decoder/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool.Muon::RpcRDO_Decoder) -----
@@ -2549,25 +2547,25 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DecodingTool @0x7f16dd22b050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
+| |-DecodingTool @0x7f4fdb2d3050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
| | (default: 'Muon::TgcRdoToPrepDataTool/TgcPrepDataProviderTool')
-| |-DetStore @0x7f16dd2057d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb2ae850 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd205750 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6098 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd199ea8 = [] (default: [])
+| |-EvtStore @0x7f4fdb2ae7d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb251050 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb251170 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a6128 = [] (default: [])
+| |-NeededResources @0x7f4fdb251098 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+TGC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectorSvc @0x7f16dd205850 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectorSvc @0x7f4fdb2ae8d0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Setting = 0
@@ -2581,10 +2579,10 @@ Py:Athena INFO Save Config
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21ac10 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd21add0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd229170 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd229128 = [] (default: [])
+| | |-DetStore @0x7f4fdb2c5c90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb2c5e50 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb2d4e18 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb2d4dd0 = [] (default: [])
| | |-FillCoinData = True
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCoinCollection = 'TrigT1CoinDataCollection'
@@ -2593,9 +2591,9 @@ Py:Athena INFO Save Config
| | |-RDOContainer = 'StoreGateSvc+TGCRDO'
| | |-TGCHashIdOffset = 26000
| | |-dropPrdsWithZeroWidth = True
-| | |-outputCoinKey @0x7f16dd229050 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
+| | |-outputCoinKey @0x7f4fdb2d4878 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
| | | (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
-| | |-prepDataKeys @0x7f16dd229200 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
+| | |-prepDataKeys @0x7f4fdb2d4ea8 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
| | | (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
| | |-show_warning_level_invalid_A09_SSW6_hit = False
| | \----- (End of Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool) -----
@@ -2612,25 +2610,25 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DecodingTool @0x7f16e0e71890 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
+| |-DecodingTool @0x7f4fdef1b9f0 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
| | (default: 'Muon::MdtRdoToPrepDataTool/MdtPrepDataProviderTool')
-| |-DetStore @0x7f16dd29a790 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb345810 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd29a710 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6290 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1a6050 = [] (default: [])
+| |-EvtStore @0x7f4fdb345790 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb2512d8 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb2510e0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a6200 = [] (default: [])
+| |-NeededResources @0x7f4fdb251248 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f16dd29a810 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectionSvc @0x7f4fdb345890 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -2644,13 +2642,13 @@ Py:Athena INFO Save Config
| | |-AuditTools = False
| | |-CalibratePrepData = True
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21ae10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-DetStore @0x7f4fdb2c5d50 = ServiceHandle('StoreGateSvc/DetectorStore')
| | |-DiscardSecondaryHitTwin = False
| | |-DoPropagationCorrection = False
| | |-DoTofCorrection = True
-| | |-EvtStore @0x7f16dd21af90 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd22a2d8 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd22a128 = [] (default: [])
+| | |-EvtStore @0x7f4fdb2c5fd0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb2d0dd0 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb2d45a8 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| | |-OutputLevel = 0
@@ -2678,25 +2676,25 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-CscRdoToCscPrepDataTool @0x7f16dd909380 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
+| |-CscRdoToCscPrepDataTool @0x7f4fdb8fa380 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
| | (default: 'Muon::CscRdoToCscPrepDataTool/CscRdoToPrepDataTool')
-| |-DetStore @0x7f16dd27fd10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb32bcd0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd27fc10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6368 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1a61b8 = [] (default: [])
+| |-EvtStore @0x7f4fdb32bbd0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb2513b0 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb251200 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a62d8 = [] (default: [])
+| |-NeededResources @0x7f4fdb251320 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f16e0dc8b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f16dd27fd90 = ServiceHandle('RegSelSvc')
+| |-PrintPrepData @0x7f4fdee72b20 = False (default: False)
+| |-RegionSelectionSvc @0x7f4fdb32bd50 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Timeline = True
@@ -2709,13 +2707,13 @@ Py:Athena INFO Save Config
| | |-AuditStop = False
| | |-AuditTools = False
| | |-CSCHashIdOffset = 22000
-| | |-CscCalibTool @0x7f16e0e74860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
-| | |-CscRdoDecoderTool @0x7f16dd223de8 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
+| | |-CscCalibTool @0x7f4fdef1e860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
+| | |-CscRdoDecoderTool @0x7f4fdb2cdde8 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
| | |-DecodeData = True
-| | |-DetStore @0x7f16dd21ad50 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f16dd237090 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f16dd23b098 = [] (default: [])
-| | |-ExtraOutputs @0x7f16dd23b488 = [] (default: [])
+| | |-DetStore @0x7f4fdb2de050 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore @0x7f4fdb2de150 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs @0x7f4fdb2e5170 = [] (default: [])
+| | |-ExtraOutputs @0x7f4fdb2e54d0 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| | |-OutputLevel = 0
@@ -2728,10 +2726,10 @@ Py:Athena INFO Save Config
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f16dd2370d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd237290 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd236cf8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd236878 = [] (default: [])
+| | | |-DetStore @0x7f4fdb2de190 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb2de1d0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb2e1bd8 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb2e19e0 = [] (default: [])
| | | |-IsOnline = True
| | | |-Latency = 100.0
| | | |-MonitorService = 'MonitorSvc'
@@ -2758,11 +2756,11 @@ Py:Athena INFO Save Config
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-CscCalibTool @0x7f16dd237250 = PublicToolHandle('CscCalibTool')
-| | | |-DetStore @0x7f16dd237110 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f16dd237050 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f16dd2367a0 = [] (default: [])
-| | | |-ExtraOutputs @0x7f16dd236f38 = [] (default: [])
+| | | |-CscCalibTool @0x7f4fdb2de0d0 = PublicToolHandle('CscCalibTool')
+| | | |-DetStore @0x7f4fdb2de090 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore @0x7f4fdb2de110 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs @0x7f4fdb2e5248 = [] (default: [])
+| | | |-ExtraOutputs @0x7f4fdb2e52d8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::CscRDO_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscRDO_Decoder) -----
@@ -2780,28 +2778,28 @@ Py:Athena INFO Save Config
| |-AuditStart = False
| |-AuditStop = False
| |-Cardinality = 1
-| |-DetStore @0x7f16dd25e610 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DetStore @0x7f4fdb307690 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f16dd25e590 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f16dd1a6320 = [] (default: [])
-| |-ExtraOutputs @0x7f16dd1a6170 = [] (default: [])
+| |-EvtStore @0x7f4fdb307610 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs @0x7f4fdb251368 = [] (default: [])
+| |-ExtraOutputs @0x7f4fdb2511b8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f16dd1a63b0 = [] (default: [])
+| |-NeededResources @0x7f4fdb2513f8 = [] (default: [])
| |-OutputLevel = 0
| |-RegisterForContextService = False
| |-Timeline = True
-| |-cluster_builder @0x7f16dd1a0f10 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
+| |-cluster_builder @0x7f4fdb238f90 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
| | (default: 'CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool')
| \----- (End of Algorithm CscThresholdClusterBuilder/CscThesholdClusterBuilder) ---------------------
\----- (End of Algorithm AthSequencer/AthAlgSeq) ---------------------------------------------------
JOs reading stage finished, launching Athena from pickle file
-Wed Mar 13 10:51:05 CET 2019
+Wed Mar 13 14:28:03 CET 2019
Preloading tcmalloc_minimal.so
Py:Athena INFO using release [AthenaExternals-22.0.1] [x86_64-centos7-gcc8-opt] [2.0.25/141317d] -- built on [2019-03-11T2107]
Py:Athena INFO including file "AthenaCommon/Preparation.py"
@@ -2817,7 +2815,7 @@ ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to leve
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v31r0)
- running on pcaz004 on Wed Mar 13 10:51:09 2019
+ running on pcaz004 on Wed Mar 13 14:28:07 2019
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
@@ -2844,7 +2842,7 @@ ByteStreamAddre... INFO -- Will fill Store with id = 0
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128) will be considered for COOL data
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-03-11T2143/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO Total of 10 servers found for host pcaz004.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
DBReplicaSvc INFO COOL SQLite replicas will be excluded if matching pattern /DBRelease/
@@ -3128,7 +3126,7 @@ MuGM:MuonFactory INFO *****************************************************
MGM::MuonDetect... INFO Init A/B Line Containers - done - size is respectively 1758/0
MGM::MuonDetect... INFO No Aline for CSC wire layers loaded
-GeoModelSvc INFO GeoModelSvc.MuonDetectorTool SZ= 42840Kb Time = 0.36S
+GeoModelSvc INFO GeoModelSvc.MuonDetectorTool SZ= 42840Kb Time = 0.45S
GeoModelSvc.Muo... INFO CondAttrListCollection not found in the DetectorStore
GeoModelSvc.Muo... INFO Unable to register callback on CondAttrListCollection for any folder in the list
GeoModelSvc.Muo... INFO This is OK unless you expect to read alignment and deformations from COOL
@@ -3177,7 +3175,7 @@ TgcRawDataProvi... INFO Tool = TgcRawDataProvider.TGC_RawDataProviderTool is
MuonTGC_CablingSvc INFO for 1/12 sector initialize
ToolSvc.TGCCabl... INFO initialize
ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonTGC_CablingSvc[0x108dcc00]+219 bound to CondAttrListCollection[/TGC/CABLING/MAP_SCHEMA]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonTGC_CablingSvc[0x10cbcc00]+219 bound to CondAttrListCollection[/TGC/CABLING/MAP_SCHEMA]
TgcRawDataProvi... INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderTool
MdtRawDataProvider INFO MdtRawDataProvider::initialize
ClassIDSvc INFO getRegistryEntries: read 922 CLIDRegistry entries for module ALL
@@ -3237,14 +3235,14 @@ ClassIDSvc INFO getRegistryEntries: read 60 CLIDRegistry entries for
CscRdoToCscPrep... INFO The Geometry version is MuonSpectrometer-R.08.01
MuonCalib::CscC... INFO Initializing CscCoolStrSvc
ClassIDSvc INFO getRegistryEntries: read 181 CLIDRegistry entries for module ALL
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_PED]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_NOISE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_PSLOPE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_STAT]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_RMS]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_FTHOLD]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_T0BASE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1aaacd00]+259 bound to CondAttrListCollection[CSC_T0PHASE]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_PED]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_NOISE]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_PSLOPE]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_STAT]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_RMS]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_FTHOLD]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_T0BASE]
+IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x1ae96d00]+259 bound to CondAttrListCollection[CSC_T0PHASE]
CscRdoToCscPrep... INFO Retrieved CscRdoToCscPrepDataTool = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
HistogramPersis...WARNING Histograms saving not required.
EventSelector INFO Initializing EventSelector - package version ByteStreamCnvSvc-00-00-00
@@ -4617,34 +4615,34 @@ IncidentProcAlg2 INFO Finalize
AtlasFieldSvc INFO finalize() successful
EventInfoByteSt... INFO finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 (( 0.27 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 1.17 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216520 (( 0.70 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/288 (( 0.49 ))s
+IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 (( 0.19 ))s
+IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 1.04 ))s
+IOVDbFolder INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216520 (( 0.18 ))s
+IOVDbFolder INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/288 (( 0.56 ))s
IOVDbFolder INFO Folder /MDT/RTBLOB (AttrListColl) db-read 0/0 objs/chan/bytes 0/1186/0 (( 0.00 ))s
IOVDbFolder INFO Folder /MDT/T0BLOB (AttrListColl) db-read 0/0 objs/chan/bytes 0/1186/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/222235 (( 1.17 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/29402 (( 0.39 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/1 objs/chan/bytes 1613/1613/7562651 (( 0.64 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/1 objs/chan/bytes 1612/1612/8096306 (( 1.06 ))s
-IOVDbFolder INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/3704 (( 0.47 ))s
-IOVDbFolder INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322656 (( 0.61 ))s
-IOVDbFolder INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/350062 (( 0.75 ))s
-IOVDbFolder INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411187 (( 0.13 ))s
-IOVDbFolder INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/353376 (( 0.03 ))s
-IOVDbFolder INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411395 (( 0.03 ))s
-IOVDbFolder INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/230496 (( 0.10 ))s
-IOVDbFolder INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/314380 (( 2.85 ))s
-IOVDbFolder INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3136 (( 0.68 ))s
-IOVDbSvc INFO bytes in (( 11.54 ))s
+IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/222235 (( 0.10 ))s
+IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/29402 (( 0.46 ))s
+IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/1 objs/chan/bytes 1613/1613/7562651 (( 0.77 ))s
+IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/1 objs/chan/bytes 1612/1612/8096306 (( 0.16 ))s
+IOVDbFolder INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/3704 (( 0.03 ))s
+IOVDbFolder INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322656 (( 0.58 ))s
+IOVDbFolder INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/350062 (( 0.11 ))s
+IOVDbFolder INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411187 (( 0.99 ))s
+IOVDbFolder INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/353376 (( 5.85 ))s
+IOVDbFolder INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411395 (( 0.05 ))s
+IOVDbFolder INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/230496 (( 0.05 ))s
+IOVDbFolder INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/314380 (( 0.04 ))s
+IOVDbFolder INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3136 (( 0.03 ))s
+IOVDbSvc INFO bytes in (( 11.19 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=CONDBR2 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLONL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: (( 1.19 ))s
-IOVDbSvc INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: (( 3.27 ))s
+IOVDbSvc INFO Connection COOLONL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: (( 0.74 ))s
+IOVDbSvc INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: (( 1.50 ))s
IOVDbSvc INFO Connection COOLOFL_MDT/CONDBR2 : nConnect: 1 nFolders: 2 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_CSC/CONDBR2 : nConnect: 2 nFolders: 8 ReadTime: (( 5.18 ))s
-IOVDbSvc INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 1.17 ))s
-IOVDbSvc INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.47 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.27 ))s
+IOVDbSvc INFO Connection COOLOFL_CSC/CONDBR2 : nConnect: 2 nFolders: 8 ReadTime: (( 7.71 ))s
+IOVDbSvc INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 1.04 ))s
+IOVDbSvc INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.03 ))s
+IOVDbSvc INFO Connection COOLOFL_DCS/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.19 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.ByteStr... INFO in finalize()
@@ -4669,7 +4667,7 @@ ToolSvc.TGCCabl... INFO finalize
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
cObj_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 18
-ChronoStatSvc INFO Time User : Tot= 5.14 [s] #= 1
+ChronoStatSvc INFO Time User : Tot= 5.05 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/MuonSpectrometer/MuonOverlay/CscOverlay/CscOverlay/CscOverlay.h b/MuonSpectrometer/MuonOverlay/CscOverlay/CscOverlay/CscOverlay.h
index 042c28904d766bd32e4d06041e8fec03154085e6..66d185126505cc42181bbff0a9b18efe3a1594ce 100644
--- a/MuonSpectrometer/MuonOverlay/CscOverlay/CscOverlay/CscOverlay.h
+++ b/MuonSpectrometer/MuonOverlay/CscOverlay/CscOverlay/CscOverlay.h
@@ -37,20 +37,25 @@ public:
CscOverlay(const std::string &name,ISvcLocator *pSvcLocator);
- /** Framework implemenrtation for the event loop */
virtual StatusCode initialize() override final;
virtual StatusCode execute() override final;
private:
- /** given 2 container of data - zero bias real data and the simulation,
- do the merging */
- StatusCode overlayContainer(const CscRawDataContainer* main, const CscRawDataContainer* overlay);
+ /// @brief Overlay signal on the background container and record to the output one
+ StatusCode overlayContainer(const CscRawDataContainer *bkgContainer,
+ const CscRawDataContainer *signalContainer,
+ CscRawDataContainer *outputContainer);
- /** if the 2 container do overlay,
- loop over the container and do the overlap collection by collection */
- void mergeCollections(CscRawDataCollection *out_coll, const CscRawDataCollection *orig_coll,
- const CscRawDataCollection *ovl_coll, CLHEP::HepRandomEngine* rndmEngine);
+ /// @brief Copy CscRawDataCollection, optionally only copy properties
+ std::unique_ptr<CscRawDataCollection> copyCollection(const CscRawDataCollection *collection,
+ bool propertiesOnly = false) const;
+
+ /// @brief In case of overlap merge signal and background collections
+ void mergeCollections(const CscRawDataCollection *bkgCollection,
+ const CscRawDataCollection *signalCollection,
+ CscRawDataCollection *outputCollection,
+ CLHEP::HepRandomEngine *rndmEngine);
/** get the data in one SPU of a chamber */
void spuData( const CscRawDataCollection * coll, const uint16_t spuID, std::vector<const CscRawData*>& data);
@@ -77,9 +82,6 @@ private:
//Whether the data needs to be fliped by 49-strip for bug#56002
bool needtoflip(const int address) const;
- // Copying CscRawDataCollection properties
- void copyCscRawDataCollectionProperties(const CscRawDataCollection& sourceColl, CscRawDataCollection& outColl) const;
-
// ----------------------------------------------------------------
// jO controllable properties.
diff --git a/MuonSpectrometer/MuonOverlay/CscOverlay/src/CscOverlay.cxx b/MuonSpectrometer/MuonOverlay/CscOverlay/src/CscOverlay.cxx
index 7006962cdab05e2c1768c4900600dfb02cfa6c7e..97dde499aad284f73e63aea39da2aaed03314772 100644
--- a/MuonSpectrometer/MuonOverlay/CscOverlay/src/CscOverlay.cxx
+++ b/MuonSpectrometer/MuonOverlay/CscOverlay/src/CscOverlay.cxx
@@ -4,7 +4,6 @@
#include "CscOverlay/CscOverlay.h"
-#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
@@ -14,10 +13,9 @@
#include "CLHEP/Random/RandomEngine.h"
#include "CLHEP/Random/RandGauss.h"
-#include <iostream>
-#include <typeinfo>
-
-constexpr uint16_t MAX_AMPL = 4095; // 12-bit ADC
+namespace {
+ constexpr uint16_t MAX_AMPL = 4095; // 12-bit ADC
+}
//================================================================
CscOverlay::CscOverlay(const std::string &name, ISvcLocator *pSvcLocator) :
@@ -52,201 +50,215 @@ StatusCode CscOverlay::initialize()
//================================================================
StatusCode CscOverlay::execute() {
- ATH_MSG_DEBUG("CscOverlay::execute() begin");
- //----------------------------------------------------------------
+ ATH_MSG_DEBUG("execute() begin");
+
+
SG::ReadHandle<CscRawDataContainer> bkgContainer(m_bkgInputKey);
if(!bkgContainer.isValid()) {
- ATH_MSG_ERROR("Could not get signal CSC container " << bkgContainer.name() << " from store " << bkgContainer.store());
+ ATH_MSG_ERROR("Could not get background CscRawDataContainer called " << bkgContainer.name() << " from store " << bkgContainer.store());
return StatusCode::FAILURE;
}
ATH_MSG_DEBUG("Found background CscRawDataContainer called " << bkgContainer.name() << " in store " << bkgContainer.store());
- ATH_MSG_DEBUG("Retrieving signal input CSC container");
SG::ReadHandle<CscRawDataContainer> signalContainer(m_signalInputKey);
if(!signalContainer.isValid()) {
- ATH_MSG_ERROR("Could not get signal CSC container " << signalContainer.name() << " from store " << signalContainer.store());
+ ATH_MSG_ERROR("Could not get signal CscRawOverlayContainer called " << signalContainer.name() << " from store " << signalContainer.store());
return StatusCode::FAILURE;
}
ATH_MSG_DEBUG("Found signal CscRawOverlayContainer called " << signalContainer.name() << " in store " << signalContainer.store());
- /* now do the overlay */
- ATH_CHECK(this->overlayContainer(bkgContainer.cptr(), signalContainer.cptr()));
+ SG::WriteHandle<CscRawDataContainer> outputContainer(m_outputKey);
+ ATH_CHECK(outputContainer.record(std::make_unique<CscRawDataContainer>(bkgContainer->size())));
+ if (!outputContainer.isValid()) {
+ ATH_MSG_ERROR("Could not record output CscRawOverlayContainer called " << outputContainer.name() << " to store " << outputContainer.store());
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG("Recorded output CscRawOverlayContainer called " << outputContainer.name() << " in store " << outputContainer.store());
+
+ // now do the overlay
+ ATH_CHECK(overlayContainer(bkgContainer.cptr(), signalContainer.cptr(), outputContainer.ptr()));
+
- //----------------------------------------------------------------
- ATH_MSG_DEBUG("CscOverlay::execute() end");
+ ATH_MSG_DEBUG("execute() end");
return StatusCode::SUCCESS;
}
//================================================================
-StatusCode CscOverlay::overlayContainer(const CscRawDataContainer *main,
- const CscRawDataContainer *overlay)
+StatusCode CscOverlay::overlayContainer(const CscRawDataContainer *bkgContainer,
+ const CscRawDataContainer *signalContainer,
+ CscRawDataContainer *outputContainer)
{
- ATH_MSG_DEBUG("overlayContainer<>() begin");
-
- SG::WriteHandle<CscRawDataContainer> outputContainer(m_outputKey);
- if (outputContainer.record(std::make_unique<CscRawDataContainer>()).isFailure()) {
- ATH_MSG_ERROR("Could not record output CscRawDataContainer called " << outputContainer.name() << " to store " << outputContainer.store());
- return StatusCode::FAILURE;
+ ATH_MSG_DEBUG("overlayContainer() begin");
+
+ // Get all the hashes for the signal and background containers
+ const std::vector<IdentifierHash> bkgHashes = bkgContainer->GetAllCurrentHashes();
+ const std::vector<IdentifierHash> signalHashes = signalContainer->GetAllCurrentHashes();
+
+ // The MC signal container should typically be smaller than bkgContainer,
+ // because the latter contains all the noise, minimum bias and pile up.
+ // Thus we firstly iterate over signal hashes and store them in a map.
+ std::map<IdentifierHash, bool> overlapMap;
+ for (const IdentifierHash &hashId : signalHashes) {
+ overlapMap.emplace(hashId, false);
}
- /** Add data from the main container to the output one */
- CscRawDataContainer::const_iterator p_main = main->begin();
- CscRawDataContainer::const_iterator p_main_end = main->end();
- for(; p_main != p_main_end; ) {
- const CscRawDataCollection& mainColl(**p_main);
- //Deep-copy CscRawDataCollection
- //FIXME Write a copy-constructor for CscRawDataCollection!!
- auto p_newColl = std::make_unique<CscRawDataCollection>(mainColl.identify());
- this->copyCscRawDataCollectionProperties(mainColl, *p_newColl);
- for(auto rawData : **p_main) {
- auto newData = std::make_unique<CscRawData>(*rawData); // TODO confirm implicit copy-constructor works as expected
- p_newColl->push_back(newData.release());
- }
- if ( outputContainer->addCollection(p_newColl.release(), p_main.hashId()).isFailure() ) {
- ATH_MSG_WARNING("addCollection failed for main");
- }
- else {
- ATH_MSG_DEBUG("data overlayContainer() added overlaid RDO");
+ // Now loop through the background hashes and copy unique ones over
+ for (const IdentifierHash &hashId : bkgHashes) {
+ auto search = overlapMap.find(hashId);
+ if (search == overlapMap.end()) {
+ // Copy the background collection
+ std::unique_ptr<CscRawDataCollection> bkgCollection
+ = copyCollection(bkgContainer->indexFindPtr(hashId));
+
+ if (outputContainer->addCollection(bkgCollection.get(), hashId).isFailure()) {
+ ATH_MSG_ERROR("Adding background Collection with hashId " << hashId << " failed");
+ return StatusCode::FAILURE;
+ } else {
+ bkgCollection.release();
+ }
+ } else {
+ // Flip the overlap flag
+ search->second = true;
}
- ++p_main;
}
+ // Setup random engine
ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() );
CLHEP::HepRandomEngine *rndmEngine(*rngWrapper);
- /** Add data from the ovl container to the output one */
- CscRawDataContainer::const_iterator p_ovl = overlay->begin();
- CscRawDataContainer::const_iterator p_ovl_end = overlay->end();
-
- for(; p_ovl != p_ovl_end; ) {
+ // Finally loop through the map and process the signal and overlay if
+ // necessary
+ for (const auto &[hashId, overlap] : overlapMap) {
+ // Retrieve the signal collection
+ const CscRawDataCollection *signalCollection = signalContainer->indexFindPtr(hashId);
- const CscRawDataCollection *coll_ovl = *p_ovl;
- const uint16_t coll_id = (*p_ovl)->identify();
+ // Output collection
+ std::unique_ptr<CscRawDataCollection> outputCollection{};
- /** The newly created stuff will go to the output EventStore SG */
- auto out_coll = std::make_unique<CscRawDataCollection>( coll_id );
+ if (overlap) { // Do overlay
+ // Retrieve the background collection
+ const CscRawDataCollection *bkgCollection = bkgContainer->indexFindPtr(hashId);
- /** Look for the same ID in the main StoreGate EventStore */
- CscRawDataContainer::const_iterator q = outputContainer->indexFind(coll_id);
+ // Create the output collection with background collection as a base
+ // TODO: should it be signal collection?
+ outputCollection = copyCollection(bkgCollection, true);
- if( q != outputContainer->end() ) {
- /** Need to merge the collections
- Retrieve q */
+ // Merge the collections
+ mergeCollections(bkgCollection, signalCollection, outputCollection.get(), rndmEngine);
+ } else {
+ // Create the output collection with signal collection as a base
+ outputCollection = copyCollection(signalCollection, true);
- const CscRawDataCollection *coll_data = *q;
- this->copyCscRawDataCollectionProperties(*coll_data, *out_coll);
- this->mergeCollections(out_coll.get(), coll_data, coll_ovl, rndmEngine);
+ uint16_t numSamples = signalCollection->numSamples();
- /** Here the new collection is created, but not yet registered.
- Put it in IDC in place of the original collection.
- */
-
- outputContainer->removeCollection(p_ovl.hashId());
- if(outputContainer->addCollection(out_coll.release(), p_ovl.hashId()).isFailure()) {
- ATH_MSG_WARNING("addCollection failed ");
- }
- else {
- ATH_MSG_DEBUG("overlayContainer() added overlaid RDO");
- }
- }
- else {
- /** Copy the complete collection from ovl to output,
- hopefully preserving the "most derived" type of its raw data */
- this->copyCscRawDataCollectionProperties(*coll_ovl, *out_coll);
-
- /** Copy the complete collection from ovl to output,
- hopefully preserving the "most derived" type of its raw data */
- unsigned int numSamples = coll_ovl->numSamples();
- for(CscRawDataCollection::const_iterator i=coll_ovl->begin(); i!=coll_ovl->end(); i++) {
-
- /** Put Digit into Collection */
- const CscRawData *data = ( *i );
- if( !data ) {
+ for (const CscRawData *data : *signalCollection) {
+ if (!data) {
ATH_MSG_WARNING("NULL pointer to Digit!");
continue;
}
- else{
- /** The new RDO goes to m_storeGateOutput - no need to mess with the pedestal, but add in noise */
- uint16_t width = data->width();
- uint32_t hashOffset = data->hashId();
- std::vector<uint16_t> all_samples;
- for (unsigned int j=0; j<width; ++j) {
- uint32_t stripHash = hashOffset+j;
- double noise = m_cscCalibTool->stripNoise( stripHash, false );
- //double pedestal = m_cscCalibTool->stripPedestal( stripHash, false );
- std::vector<uint16_t> samples;
- bool extractSamples = data->samples(j, numSamples, samples);
- if (!extractSamples) {
- ATH_MSG_WARNING("Unable to extract samples for strip " << j
- << " Online Cluster width = " << width
- << " for number of Samples = " << numSamples
- << " continuing ...");
- }
- else {
- for (unsigned int k=0; k<samples.size(); ++k) {
- double theNoise = CLHEP::RandGauss::shoot(rndmEngine, 0.0, noise);
- float adcCount = samples[k] + theNoise;
- if ( adcCount > MAX_AMPL ) {
- ATH_MSG_DEBUG("value out of range (copying over signal): " << adcCount << " "
- << " Setting it to max value = " << MAX_AMPL
- << " IdentifierHash is " << stripHash);
- adcCount = MAX_AMPL;
- }
- all_samples.push_back( (uint16_t) rint(adcCount) );
+
+ // Copy the digit and add noise
+ std::vector<uint16_t> samples;
+
+ uint16_t width = data->width();
+ uint32_t hashOffset = data->hashId();
+
+ // Loop over width
+ for (uint16_t j = 0; j < width; ++j) {
+ uint32_t stripHash = hashOffset + j;
+ double stripNoise = m_cscCalibTool->stripNoise(stripHash, false);
+ // Get the samples
+ std::vector<uint16_t> stripSamples;
+ bool extractSamplesStatus = data->samples(j, numSamples, stripSamples);
+ if (!extractSamplesStatus) {
+ ATH_MSG_WARNING("Unable to extract samples for strip " << j
+ << " Online Cluster width = " << width
+ << " for number of Samples = " << numSamples
+ << " continuing ...");
+ } else {
+ for (uint16_t sample : stripSamples) {
+ double sampleNoise = CLHEP::RandGauss::shoot(rndmEngine, 0.0, stripNoise);
+ // TODO: rounding issue - some strange type conversion is going on
+ // uint16_t adcCount = sample + std::lrint(sampleNoise);
+ float adcCount = sample + sampleNoise;
+ if (adcCount > MAX_AMPL) {
+ ATH_MSG_DEBUG("value out of range (copying over signal): " << adcCount << " "
+ << " Setting it to max value = " << MAX_AMPL
+ << " IdentifierHash is " << stripHash);
+ adcCount = MAX_AMPL;
}
+ // TODO: rounding issue
+ // samples.push_back(adcCount);
+ samples.push_back( (uint16_t) rint(adcCount) );
}
}
- auto rdo = std::make_unique<CscRawData>( all_samples, data->address(), data->identify(), data->rpuID(), data->width() );
- rdo->setHashID( data->hashId() );//ACH - was "width()" ???
- rdo->setTime( data->time() );//ACH - was absent
+ }
- //perform some checks
- bool good=true;
- for (unsigned int j=0; j<width; ++j) {
- const Identifier channelId = m_cscRdoDecoderTool->channelIdentifier(rdo.get(), j);
- if(!(m_cscHelper->valid(channelId))) {
- ATH_MSG_WARNING("Invalid CSC Identifier! - skipping " << channelId);
- good=false;
- }
- }
- if (good){
- out_coll->push_back( rdo.release() );
+ // Copy over the digit with the updated samples
+ auto rdo = std::make_unique<CscRawData>(samples, data->address(), data->identify(), data->time(), data->rpuID(), data->width(), data->hashId());
+
+ // Perform some checks
+ bool good = true;
+ for (uint16_t j = 0; j < width; ++j) {
+ const Identifier channelId = m_cscRdoDecoderTool->channelIdentifier(rdo.get(), j);
+ if (!m_cscHelper->valid(channelId)) {
+ ATH_MSG_WARNING("Invalid CSC Identifier! - skipping " << channelId);
+ good = false;
+ break;
}
}
- }
-
- /** The new collection goes to m_storeGateOutput */
- if(outputContainer->addCollection(out_coll.get(), out_coll->identify()).isFailure()) {
- ATH_MSG_ERROR("overlayContainer(): Problem in outputContainer->addCollection(Identifier)");
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG("overlayContainer() added new RDO");
- out_coll.release(); // now owned by outputContainer
+ if (good) {
+ outputCollection->push_back(rdo.release());
+ }
}
}
- ++p_ovl;
+ if (outputContainer->addCollection(outputCollection.get(), hashId).isFailure()) {
+ ATH_MSG_ERROR("Adding overlaid Collection with hashId " << hashId << " failed");
+ return StatusCode::FAILURE;
+ } else {
+ outputCollection.release();
+ }
}
- ATH_MSG_DEBUG("overlayContainer<>() end");
+ ATH_MSG_DEBUG("overlayContainer>() end");
return StatusCode::SUCCESS;
}
-// Copying CscRawDataCollection properties
- void CscOverlay::copyCscRawDataCollectionProperties(const CscRawDataCollection& sourceColl, CscRawDataCollection& outColl) const {
- /** copy a few things to the new collection */
- outColl.setIdentifyHash( sourceColl.identifyHash() );
- outColl.set_eventType( sourceColl.eventType() );
- outColl.setRodId ( sourceColl.rodId() );
- outColl.setSubDetectorId ( sourceColl.subDetectorId() );
- if (sourceColl.samplingPhase()) { outColl.set_samplingPhase(); }
- if (sourceColl.triggerType()) { outColl.set_triggerType(); }
- outColl.set_firstBitSummary( sourceColl.firstBitSummary() );
- outColl.set_scaAddress( sourceColl.scaAddress() );
- for (auto dataType : sourceColl.dataType()) { outColl.addDataType( dataType ); }
- }
+// Copy CscRawDataCollection
+std::unique_ptr<CscRawDataCollection>
+CscOverlay::copyCollection(const CscRawDataCollection *collection,
+ bool propertiesOnly) const
+{
+ auto outputCollection = std::make_unique<CscRawDataCollection>(collection->identify());
+
+ // Copy property values to the new collection
+ outputCollection->setIdentifyHash(collection->identifyHash());
+ outputCollection->set_eventType(collection->eventType());
+ outputCollection->setRodId(collection->rodId());
+ outputCollection->setSubDetectorId(collection->subDetectorId());
+ outputCollection->set_samplingPhase(collection->samplingPhase());
+ outputCollection->set_triggerType(collection->triggerType());
+ outputCollection->set_firstBitSummary(collection->firstBitSummary());
+ outputCollection->set_scaAddress(collection->scaAddress());
+ for (uint8_t dataType : collection->dataType()) {
+ outputCollection->addDataType(dataType);
+ }
+
+ // Return if only properties requested
+ if (propertiesOnly) {
+ return outputCollection;
+ }
+
+ for (const CscRawData *existingDatum : *collection) {
+ // Owned by the collection
+ auto *datumCopy = new CscRawData(*existingDatum);
+ outputCollection->push_back(datumCopy);
+ }
+
+ return outputCollection;
+}
void CscOverlay::spuData( const CscRawDataCollection * coll, const uint16_t spuID, std::vector<const CscRawData*>& data) {
data.clear(); if ( !coll ) return;
@@ -267,36 +279,33 @@ bool CscOverlay::needtoflip(const int address) const {
return false;
}
-//
-//
-//
-//
+
//================================================================
-void CscOverlay::mergeCollections(CscRawDataCollection *out_coll,
- const CscRawDataCollection *data_coll,
- const CscRawDataCollection *ovl_coll,
- CLHEP::HepRandomEngine* rndmEngine)
+void CscOverlay::mergeCollections(const CscRawDataCollection *bkgCollection,
+ const CscRawDataCollection *signalCollection,
+ CscRawDataCollection *outputCollection,
+ CLHEP::HepRandomEngine *rndmEngine)
{
- ATH_MSG_DEBUG("mergeCollection<>() begin");
+ ATH_MSG_DEBUG("mergeCollection() begin");
// number of ADC samples in the both data stream
- unsigned int nSigSamples = data_coll->numSamples();
- unsigned int nOvlSamples = ovl_coll->numSamples();
+ unsigned int nSigSamples = bkgCollection->numSamples();
+ unsigned int nOvlSamples = signalCollection->numSamples();
// sampling times in both data streams
- unsigned int dataSamplingTime = data_coll->rate();
- unsigned int ovlSamplingTime = ovl_coll->rate();
+ unsigned int dataSamplingTime = bkgCollection->rate();
+ unsigned int ovlSamplingTime = signalCollection->rate();
if ( dataSamplingTime != ovlSamplingTime ) {
- ATH_MSG_WARNING("Overlay of inconsistent data - sampling times not the same "
- << dataSamplingTime << " ns " << ovlSamplingTime << " ns");
- return;
+ ATH_MSG_ERROR("Overlay of inconsistent data - sampling times not the same "
+ << dataSamplingTime << " ns " << ovlSamplingTime << " ns");
+ throw std::runtime_error("mergeCollections(): sampling time mismatch");
}
if ( nSigSamples != nOvlSamples ) {
- ATH_MSG_WARNING("Overlay of inconsistent data - number of samples not the same "
- << nSigSamples << " " << nOvlSamples);
- return;
+ ATH_MSG_ERROR("Overlay of inconsistent data - number of samples not the same "
+ << nSigSamples << " " << nOvlSamples);
+ throw std::runtime_error("mergeCollections(): number of samples mismatch");
}
/** loop over the SPU - collecting thr data by layer
@@ -306,10 +315,10 @@ void CscOverlay::mergeCollections(CscRawDataCollection *out_coll,
for ( uint16_t spuID=0; spuID<10; ++spuID) {
std::vector<const CscRawData*> sigData; // real data
- this->spuData(data_coll, spuID, sigData);
+ this->spuData(bkgCollection, spuID, sigData);
std::vector<const CscRawData*> ovlData; // simulation
- this->spuData(ovl_coll, spuID, ovlData);
+ this->spuData(signalCollection, spuID, ovlData);
/** for the non-precision strips, all the 4 layers in a chamber
are in the same SPU, we need to recover the data by chamber layer */
@@ -360,7 +369,7 @@ void CscOverlay::mergeCollections(CscRawDataCollection *out_coll,
for (std::map< int,std::vector<uint16_t> >::const_iterator s=sigSamples.begin(); s!=sigSamples.end(); ++s){readstrips.insert(s->first);}
for (std::map< int,std::vector<uint16_t> >::const_iterator si=ovlSamples.begin(); si!=ovlSamples.end(); ++si){readstrips.insert(si->first);}
- std::vector<CscRawData*> datums = this->overlay(sigSamples, ovlSamples,address, spuID, out_coll->identify(), hash, rndmEngine);
+ std::vector<CscRawData*> datums = this->overlay(sigSamples, ovlSamples,address, spuID, outputCollection->identify(), hash, rndmEngine);
if ( datums.size()==0 ) { ATH_MSG_WARNING("datums is size 0!"); }
for (unsigned int di=0; di<datums.size(); ++di){
CscRawData* datum=datums[di];
@@ -407,7 +416,7 @@ void CscOverlay::mergeCollections(CscRawDataCollection *out_coll,
}
else{ATH_MSG_DEBUG("Valid CSC Identifier in merge " << channelId);}
}
- if (good){ out_coll->push_back(datum); }
+ if (good){ outputCollection->push_back(datum); }
else{ continue; }
//keep count
@@ -425,8 +434,8 @@ void CscOverlay::mergeCollections(CscRawDataCollection *out_coll,
}
}
- for (unsigned int i=0; i<10; ++i) out_coll->set_spuCount(i,clusterCounts[i]);
- for (unsigned int i=0; i<2; ++i) { if (rpuCount[i] != 0) out_coll->addRPU(rpuCount[i]); }
+ for (unsigned int i=0; i<10; ++i) outputCollection->set_spuCount(i,clusterCounts[i]);
+ for (unsigned int i=0; i<2; ++i) { if (rpuCount[i] != 0) outputCollection->addRPU(rpuCount[i]); }
// FIXME --- need to be able to reset the dataType - should add a new method to CscRawDataCollection for this
ATH_MSG_DEBUG("mergeCollection<>() end ");
}
diff --git a/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h b/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h
index 50ded5fd4265ce7eda3aa91cbff5fa26053994ac..f14d27742687e2ba58de93c443b940e2bbc7ebe0 100644
--- a/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h
+++ b/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h
@@ -75,6 +75,12 @@ protected:
StatusCode
copyModRecord(const SG::ReadHandleKey<T>&,
const SG::WriteHandleKey<T>&) const;
+
+ // temporary trigger helper needed until we can
+ // decommission TrigHLTJetRec classes
+ template<class T, class Taux, class Tsingle>
+ StatusCode
+ copyModForTrigger(const T&) const;
};
template<class T>
@@ -106,5 +112,28 @@ JetConstituentModSequence::copyModRecord(const SG::ReadHandleKey<T>& inKey,
return StatusCode::SUCCESS;
}
+template<class T, class Taux, class Tsingle>
+StatusCode
+JetConstituentModSequence::copyModForTrigger(const T& originals) const
+{
+
+ // This is the trigger case, revert to a deep copy of the input container.
+ // Create the new container and its auxiliary store.
+ T* constitCopy = new T();
+ Taux* constitCopyAux = new Taux();
+ constitCopy->setStore( constitCopyAux ); //< Connect the two
+
+ for(const Tsingle* orig_constit : originals) {
+ Tsingle* theconstit = new Tsingle();
+ constitCopy->push_back( theconstit );
+ *theconstit= *orig_constit; // copies auxdata from one auxstore to the other
+ }
+
+ for (auto t : m_modifiers) {ATH_CHECK(t->process(constitCopy));}
+
+ // Update the output container pointer
+ m_trigOutputConstits = constitCopy;
+ return StatusCode::SUCCESS;
+}
#endif
diff --git a/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx b/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx
index 4a8b4b1b0fd3e7f84616d2f8c523a55970f7f09d..e2e17de28ffb820351aed16c8bf60521156e1391 100644
--- a/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx
+++ b/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx
@@ -7,6 +7,7 @@
// Will later add the intermediate step
#include "JetRecTools/JetConstituentModSequence.h"
+#include "xAODCaloEvent/CaloClusterAuxContainer.h"
JetConstituentModSequence::JetConstituentModSequence(const std::string &name):
asg::AsgTool(name),
@@ -19,7 +20,7 @@ JetConstituentModSequence::JetConstituentModSequence(const std::string &name):
declareProperty("OutputContainer", m_outputContainer, "The output container for the sequence.");
declareProperty("InputType", m_inputType, "The xAOD type name for the input container.");
declareProperty("Modifiers", m_modifiers, "List of IJet tools.");
- declareProperty("Trigger", m_trigger=false);
+ declareProperty("Trigger", m_trigger=false);
declareProperty("SaveAsShallow", m_saveAsShallow=true, "Save as shallow copy");
}
@@ -72,19 +73,29 @@ StatusCode JetConstituentModSequence::initialize() {
}
int JetConstituentModSequence::execute() const {
- if (m_trigger){return 0;}
// Create the shallow copy according to the input type
switch(m_inputType){
case xAOD::Type::CaloCluster: {
- auto sc = copyModRecord(m_inClusterKey,
- m_outClusterKey);
- if(!sc.isSuccess()){return 1;}
+ if (m_trigger){
+ auto clustersin = dynamic_cast<const xAOD::CaloClusterContainer*>(m_trigInputConstits);
+ if(clustersin==nullptr) {
+ ATH_MSG_ERROR("Failed to cast trigInputConstits to CaloCluster");
+ return(3);
+ }
+ auto sc = copyModForTrigger<xAOD::CaloClusterContainer,xAOD::CaloClusterAuxContainer,xAOD::CaloCluster>(*clustersin);
+ if(!sc.isSuccess()){return 1;}
+ } else {
+ auto sc = copyModRecord(m_inClusterKey,
+ m_outClusterKey);
+ if(!sc.isSuccess()){return 1;}
+ }
break;
}
case xAOD::Type::ParticleFlow: {
+ if (m_trigger){return 2;}
auto sc = copyModRecordPFO();
if(!sc.isSuccess()){return 1;}
break;
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
index a9fa8ce47c34323b256b4a17d0fa682e77d72761..d2371cf227ca6e596bd154e442ccc810986ddd18 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//****************************************************************************
@@ -74,7 +74,7 @@ class TilePulseShape;
class TileHWID;
class TileInfo;
-class IAtRndmGenSvc;
+class IAthRNGSvc;
class TH1F;
class TFile;
@@ -114,8 +114,7 @@ private:
SG::WriteHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
"TileRawChannelContainer", "TrueAmp", "Output Tile raw channel container key"};
- CLHEP::HepRandomEngine * m_pHRengine; //!< Random number generator engine to use
- ServiceHandle <IAtRndmGenSvc> m_rndmSvc; //!< Random number service to use
+ ServiceHandle <IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""}; //!< Random number service to use
//Parameters
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h
index 870dfbe8050b3c59c7425bb6c90e725b3758e843..fb7fb3ef82635d6e2cce986907499f0dc6348c35 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//****************************************************************************
@@ -50,7 +50,7 @@
#include "TileEvent/TileHitContainer.h"
-class IAtRndmGenSvc;
+class IAthRNGSvc;
class PileUpMergeSvc;
class TileID;
class TileTBID;
@@ -153,9 +153,7 @@ class TileDigitsMaker: public AthAlgorithm {
int m_binTime0Lo; //!< Index of time=0 bin for low gain pulse shape
double m_timeStepLo; //!< Time step in low gain pulse shape: 25.0 / nBinsPerXLo
- CLHEP::HepRandomEngine * m_pHRengine; //!< Random number generator engine to use
-
- ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number service to use
+ ServiceHandle<IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""}; //!< Random number service to use
ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
"TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile sample noise tool"};
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h
index f8dda86c1804c6a8d106f8be4759952eb759cd09..a628d57fb737795014f805265f2f2c566dc0f0b8 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToRawChannel.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//****************************************************************************
@@ -51,7 +51,7 @@
#include <vector>
-class IAtRndmGenSvc;
+class IAthRNGSvc;
class TileID;
class TileTBID;
class TileHWID;
@@ -111,8 +111,7 @@ class TileHitToRawChannel: public AthAlgorithm {
double m_threshHi; //!< Value of the mimimal amplitude required to do the conversion to raw channel in high gain (not used for low gain)
double m_ampMaxHi; //!< Value of the maximum amplitude to be stored as a high gain channel. For larger amplitudes, the channel is converted to low gain
- IAtRndmGenSvc * m_atRndmGenSvc; //!< Random number generator engine to use
- CLHEP::HepRandomEngine * m_pHRengine; //!< Random number service to use
+ ServiceHandle<IAthRNGSvc> m_atRndmGenSvc{this, "RndmSvc", "AthRNGSvc", ""}; //!< Random number generator engine to use
ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
"TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h
index d40163eb4a7a44e0eaa39b6c41afb770779c6354..faae77d0af7d8772c2247aafc70e5ec7b5b2ff64 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitToTTL1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//****************************************************************************
@@ -42,11 +42,9 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "CLHEP/Random/RandomEngine.h"
-
#include <string>
-class IAtRndmGenSvc;
+class IAthRNGSvc;
class TileID;
class TileTBID;
class TileHWID;
@@ -118,9 +116,7 @@ class TileHitToTTL1: public AthAlgorithm {
bool m_tileNoise; //!< If true => generate noise for the TileTTL1 creation
bool m_tileThresh; //!< If true => apply threshold on the conversion to TileTTL1
- CLHEP::HepRandomEngine* m_pHRengine; //!< Random number service to use
-
- ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number generator engine to use
+ ServiceHandle<IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""}; //!< Random number generator engine to use
ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
"TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h
index fa3f0d0525305535c99cdd1fb39d3f20b761d091..a8a7ed378dae47b0427f4d299aa044eb8d677fd6 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h
@@ -37,7 +37,8 @@
// Athena includes
#include "PileUpTools/PileUpToolBase.h"
#include "StoreGate/WriteHandleKey.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+
#include "AthenaKernel/ITriggerTime.h"
// Gaudi includes
@@ -94,8 +95,8 @@ class TileHitVecToCntTool: public PileUpToolBase {
StatusCode createContainers();
void processHitVectorForOverlay(const TileHitVector* inputHits, int& nHit, double& eHitTot);
void processHitVectorForPileUp(const TileHitVector* inputHits, double SubEvtTimOffset, int& nHit, double& eHitTot, bool isSignal = false);
- void processHitVectorWithoutPileUp(const TileHitVector* inputHits, int& nHit, double& eHitTot, TileHitNonConstContainer* &hitCont);
- double applyPhotoStatistics(double energy, Identifier pmt_id); //!< Method to apply photostatistics effect
+ void processHitVectorWithoutPileUp(const TileHitVector* inputHits, int& nHit, double& eHitTot, TileHitNonConstContainer* &hitCont, CLHEP::HepRandomEngine * engine);
+ double applyPhotoStatistics(double energy, Identifier pmt_id, CLHEP::HepRandomEngine * engine); //!< Method to apply photostatistics effect
void findAndMergeE1(TileHitCollection* coll, int frag_id, TileHitNonConstContainer* &hitCont);
void findAndMergeMBTS(TileHitCollection* coll, int frag_id, TileHitNonConstContainer* &hitCont);
@@ -131,8 +132,7 @@ class TileHitVecToCntTool: public PileUpToolBase {
const TileDetDescrManager* m_tileMgr; //!< Pointer to TileDetDescrManager
float m_nPhotoElectrons[7]; //!< number of photo electrons per GeV in samplings
- CLHEP::HepRandomEngine* m_pHRengine; //!< Random number service to use
- ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number generator engine to use
+ ServiceHandle<IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""}; //!< Random number generator engine to use
std::vector<TileHit*> m_allHits; //!< vector for all TileHits
std::vector<TileHit*> m_allHits_DigiHSTruth; //!< vector for all TileHits
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.h
index 9d0b66c21b1f513dde75cdc4708c88925fa4c419..ddfa17f2d891f8c1500bfaa2200cce06a27d8daf 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TilePulseForTileMuonReceiver.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//****************************************************************************
@@ -53,9 +53,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "CLHEP/Random/RandomEngine.h"
-
-class IAtRndmGenSvc;
+class IAthRNGSvc;
class PileUpMergeSvc;
class HWIdentifier;
@@ -127,8 +125,7 @@ class TilePulseForTileMuonReceiver: public AthAlgorithm {
//
std::vector<double> m_shapeMuonReceiver;//!< Muon receiver pulse shape
- CLHEP::HepRandomEngine* m_pHRengine; //!< Random number generator engine to use
- ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number service to use
+ ServiceHandle<IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""}; //!< Random number service to use
ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
"TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile sample noise tool"};
diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py b/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py
index 40dd0f6f39e2d9b9516adb95d01ef47fbfb9e44d..f83c2a867bed519d14ae099b961094e38d0987eb 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileDigitsGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# Author: J. Poveda (Ximo.Poveda@cern.ch)
# TileDigits creation from TileHit
@@ -65,10 +65,6 @@ class TileDigitsGetter ( Configured ) :
theTileDigitsMaker.CalibrationRun=False
- # Random number engine
- theTileDigitsMaker.RndmSvc=digitizationFlags.rndmSvc()
- digitizationFlags.rndmSeedList.addSeed("Tile_DigitsMaker", 4789899, 989240512)
-
# Save integer numbers in digits vector if not pile-up premixing
theTileDigitsMaker.IntegerDigits = not digitizationFlags.PileUpPremixing()
diff --git a/TileCalorimeter/TileSimAlgs/python/TileRawChannelFromHitsGetter.py b/TileCalorimeter/TileSimAlgs/python/TileRawChannelFromHitsGetter.py
index 3994a819cf73848589dbb568104229aaf1fbde9c..64e2e6748cf1b227a375197fab71d86e4e702125 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileRawChannelFromHitsGetter.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileRawChannelFromHitsGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# Author: J. Poveda (Ximo.Poveda@cern.ch)
# TileRawChannel creation from TileHit
@@ -65,11 +65,6 @@ class TileRawChannelFromHitsGetter ( Configured ) :
objKeyStore.addStreamESD(self.outputType(),self.outputKey())
- # Random number engine
- from Digitization.DigitizationFlags import digitizationFlags
- digitizationFlags.rndmSeedList.addSeed("Tile_DigitsMaker", 4789899, 989240512)
-
-
# now add algorithm to topSequence
# this should always come at the end
diff --git a/TileCalorimeter/TileSimAlgs/python/TileSimAlgsConfig.py b/TileCalorimeter/TileSimAlgs/python/TileSimAlgsConfig.py
index 8ffb0575f19fcaa98b137d7c0ba1de109ac9c536..6a5cf4fe333cb50e437618e1c6645133167173c2 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileSimAlgsConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileSimAlgsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from Digitization.DigitizationFlags import digitizationFlags
from AthenaCommon import CfgMgr
@@ -40,10 +40,6 @@ def TileHitVecToCntTool(name="TileHitVecToCntTool", **kwargs):
kwargs.setdefault("HitTimeFlag", 2)
kwargs.setdefault("UseTriggerTime", True)
- # Random number engine
- kwargs.setdefault("RndmSvc", digitizationFlags.rndmSvc())
- digitizationFlags.rndmSeedList.addSeed("Tile_HitVecToCnt", 4789899, 989240512)
-
if digitizationFlags.doXingByXingPileUp(): # PileUpTool approach
kwargs.setdefault("FirstXing", Tile_FirstXing() )
kwargs.setdefault("LastXing", Tile_LastXing() )
diff --git a/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py
index e482a3694fcd210ab8e9f90b42d1ea2f117e649a..a022e6194614af6dd1f22a73f163a67997a4432a 100644
--- a/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py
+++ b/TileCalorimeter/TileSimAlgs/share/TileFitDigitization_jobOptions.py
@@ -80,11 +80,6 @@ if doTileHitToDigit:
theTileDigitsMaker.UseCoolPulseShapes=False
theTileDigitsMaker.MaskBadChannels=False
theTileDigitsMaker.RndmEvtOverlay=False
-
- # Random number engine
- from Digitization.DigitizationFlags import jobproperties
- theTileDigitsMaker.RndmSvc=jobproperties.Digitization.rndmSvc()
- jobproperties.Digitization.rndmSeedList.addSeed("Tile_DigitsMaker", 4789899, 989240512)
if doTileDigitToRawChannel:
diff --git a/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py
index 01464381ac2d9c2e6bc233d2908c2b73657b4f2c..32f162bbe779ad08fa9b1413f849f8260dc96e70 100644
--- a/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py
+++ b/TileCalorimeter/TileSimAlgs/share/TileMuonReceiver_jobOptions.py
@@ -48,12 +48,9 @@ topSequence += CfgMgr.TilePulseForTileMuonReceiver('TilePulseForTileMuonReceiver
, UseCoolPedestal = False
, UseCoolPulseShapes = True
, TileCondToolPulseShape = toolSvc.TileCondToolMuRcvPulseShape
- , TileRawChannelBuilderMF = toolSvc.TileMuRcvRawChannelBuilderMF
- , RndmSvc = jobproperties.Digitization.rndmSvc())
+ , TileRawChannelBuilderMF = toolSvc.TileMuRcvRawChannelBuilderMF)
-jobproperties.Digitization.rndmSeedList.addSeed("Tile_PulseForTileMuonReceiver", 4789899, 989240512)
-
topSequence += CfgMgr.TileMuonReceiverDecision('TileMuonReceiverDecision'
# , OutputLevel = VERBOSE
, MuonReceiverEneThreshCellD6Low = 500
diff --git a/TileCalorimeter/TileSimAlgs/share/TileTTL1_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileTTL1_jobOptions.py
index 4e40fd9f75e0b20f2e4e938a3994bccdae9cfbbc..41f01c71eac43e94b2a68108d678b2abe997270f 100644
--- a/TileCalorimeter/TileSimAlgs/share/TileTTL1_jobOptions.py
+++ b/TileCalorimeter/TileSimAlgs/share/TileTTL1_jobOptions.py
@@ -5,8 +5,6 @@ from TileSimAlgs.TileTTL1FromHitsGetter import TileTTL1FromHitsGetter
theTileTTL1FromHitsGetter = TileTTL1FromHitsGetter()
from Digitization.DigitizationFlags import jobproperties
-topSequence.TileHitToTTL1.RndmSvc = jobproperties.Digitization.rndmSvc()
-jobproperties.Digitization.rndmSeedList.addSeed("Tile_HitToTTL1", 4789899, 989240512)
from AthenaCommon.BeamFlags import jobproperties
if jobproperties.Beam.beamType == 'cosmics':
@@ -17,7 +15,4 @@ if jobproperties.Beam.beamType == 'cosmics':
TileTTL1Container = "TileTTL1CosmicsCnt",
TileMBTSTTL1Container = "TileMBTSTTL1CosmicsContainer"
)
- theTileTTL1Cosmics.RndmSvc=jobproperties.Digitization.rndmSvc()
- jobproperties.Digitization.rndmSeedList.addSeed("Tile_TTL1Cosmics", 4789899, 989240512)
-
topSequence += theTileTTL1Cosmics
diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
index d26dac72a08c3c313a736ed9a639bdebe9c3472b..378bdee6eb5117eab0c39205f6009d58d581edfe 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -35,7 +35,8 @@
#include "AthAllocators/DataPool.h"
#include "PathResolver/PathResolver.h"
//Random number service
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+#include "AthenaKernel/RNGWrapper.h"
#include <CLHEP/Random/Randomize.h>
#include <CLHEP/Units/SystemOfUnits.h>
@@ -60,10 +61,7 @@ using CLHEP::RandFlat;
TileDigitsFromPulse::TileDigitsFromPulse(std::string name, ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator),
m_tileHWID(0),
- m_tileInfo(0),
- m_pHRengine(0),
- m_rndmSvc("AtRndmGenSvc", name)
-
+ m_tileInfo(0)
{
m_rChUnit = TileRawChannelUnit::ADCcounts;
m_rChType = TileFragHash::Default;
@@ -205,8 +203,6 @@ StatusCode TileDigitsFromPulse::initialize() {
if (!m_rndmSvc.retrieve().isSuccess()) {
ATH_MSG_FATAL("Could not initialize find Random Number Service.");
return StatusCode::FAILURE;
- } else {
- m_pHRengine = m_rndmSvc->GetEngine("Tile_DigitsMaker");
}
if (m_chanNoise)
m_gaussNoise = kFALSE; //Make sure channel noise overrides gaussian noise.
@@ -223,6 +219,10 @@ StatusCode TileDigitsFromPulse::execute() {
ATH_MSG_DEBUG("in execute()");
+ // Prepare RNG service
+ ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
+ rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() );
+
// Create new container for digits
auto digitsContainer = std::make_unique<TileMutableDigitsContainer>(true,
TileFragHash::Digitizer,
@@ -321,8 +321,8 @@ StatusCode TileDigitsFromPulse::execute() {
double Hfn1 = m_tileToolNoiseSample->getHfn1(drawerIdx, channel, gain);
double Hfn2 = m_tileToolNoiseSample->getHfn2(drawerIdx, channel, gain);
double Norm = m_tileToolNoiseSample->getHfnNorm(drawerIdx, channel, gain);
- RandGaussQ::shootArray(m_pHRengine, samples.size(), Rndm, 0.0, 1.0);
- RandFlat::shootArray(m_pHRengine, 1, Rndm_dG, 0.0, 1.0);
+ RandGaussQ::shootArray(*rngWrapper, samples.size(), Rndm, 0.0, 1.0);
+ RandFlat::shootArray(*rngWrapper, 1, Rndm_dG, 0.0, 1.0);
for (unsigned int js = 0; js < samples.size(); ++js) {
//using the same gaussian(sigma) for all samples in one channel in one event
if (Rndm_dG[0] < Norm)
diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
index 00da31feb79f25699188b479ddf424a81683845d..0f2e466ac388d999c9239231b1f6f3545bc679f0 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
@@ -34,7 +34,9 @@
// Atlas include
#include "AthenaKernel/errorcheck.h"
// For the Athena-based random numbers.
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+#include "AthenaKernel/RNGWrapper.h"
+
#include "AthenaKernel/Units.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
@@ -87,16 +89,13 @@ TileDigitsMaker::TileDigitsMaker(std::string name, ISvcLocator* pSvcLocator)
m_nShapeLo(0),
m_nBinsPerXLo(0),
m_binTime0Lo(0),
- m_timeStepLo(0.0),
- m_pHRengine(0),
- m_rndmSvc ("AtRndmGenSvc", name)
+ m_timeStepLo(0.0)
{
declareProperty("FilterThreshold", m_filterThreshold = 100.0 * MeV, "Threshold on filtered digits (default - 100 MeV)");
declareProperty("FilterThresholdMBTS", m_filterThresholdMBTS = 0.0 * MeV, "Threshold on filtered digits of MBTS (default - 0 MeV)");
declareProperty("TileInfoName", m_infoName = "TileInfo");
declareProperty("IntegerDigits", m_integerDigits = true);
declareProperty("CalibrationRun", m_calibRun = false);
- declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in TileDigitsMaker");
declareProperty("RndmEvtOverlay",m_rndmEvtOverlay = false,"Pileup and/or noise added by overlaying random events (default=false)");
declareProperty("UseCoolPulseShapes",m_useCoolPulseShapes = true,"Pulse shapes from database (default=true)");
declareProperty("MaskBadChannels",m_maskBadChannels = false,"Remove channels tagged bad (default=false)");
@@ -173,7 +172,6 @@ StatusCode TileDigitsMaker::initialize() {
if (m_tileNoise || m_tileCoherNoise || m_rndmEvtOverlay) {
ATH_CHECK( m_rndmSvc.retrieve());
- m_pHRengine = m_rndmSvc->GetEngine("Tile_DigitsMaker");
}
ATH_MSG_DEBUG( "Event Overlay: " << ((m_rndmEvtOverlay)?"true":"false"));
@@ -361,6 +359,13 @@ StatusCode TileDigitsMaker::execute() {
const EventContext& ctx = Gaudi::Hive::currentContext();
+ // Prepare RNG service
+ ATHRNG::RNGWrapper* rngWrapper = nullptr;
+ if (m_tileNoise || m_tileCoherNoise || m_rndmEvtOverlay) {
+ rngWrapper = m_rndmSvc->getEngine(this);
+ rngWrapper->setSeed( name(), ctx );
+ }
+
static bool first = (msgLvl(MSG::VERBOSE) && !m_rndmEvtOverlay );
if (first) {
ATH_MSG_VERBOSE( "Dumping 2G noise parameters");
@@ -802,13 +807,13 @@ StatusCode TileDigitsMaker::execute() {
//NOTE: ShootArray's inputs are : the engine, the size, the vector, the mean, the standard dev
for (int k = 0; k < m_nSamples; ++k) {
double * RndmVec = CorrRndmVec[k];
- RandGaussQ::shootArray(m_pHRengine, nchMax, RndmVec, 0.0, 1.0);
+ RandGaussQ::shootArray(*rngWrapper, nchMax, RndmVec, 0.0, 1.0);
}
if (m_calibRun) {
for (int k = 0; k < m_nSamples; ++k) {
double * RndmVecLo = CorrRndmVecLo[k];
- RandGaussQ::shootArray(m_pHRengine, nchMax, RndmVecLo, 0.0, 1.0);
+ RandGaussQ::shootArray(*rngWrapper, nchMax, RndmVecLo, 0.0, 1.0);
}
}
}
@@ -891,11 +896,11 @@ StatusCode TileDigitsMaker::execute() {
/* If tileNoise is requested, generate array of random numbers. */
if (tileNoiseLG) { // true if tileNoise is set or noise is needed for low gain in overlay
- RandGaussQ::shootArray(m_pHRengine, m_nSamples, Rndm, 0.0, 1.0);
- RandFlat::shootArray(m_pHRengine, 1, Rndm_dG, 0.0, 1.0);
+ RandGaussQ::shootArray(*rngWrapper, m_nSamples, Rndm, 0.0, 1.0);
+ RandFlat::shootArray(*rngWrapper, 1, Rndm_dG, 0.0, 1.0);
if (m_calibRun) {
- RandGaussQ::shootArray(m_pHRengine, m_nSamples, RndmLo, 0.0, 1.0);
- RandFlat::shootArray(m_pHRengine, 1, RndmLo_dG, 0.0, 1.0);
+ RandGaussQ::shootArray(*rngWrapper, m_nSamples, RndmLo, 0.0, 1.0);
+ RandFlat::shootArray(*rngWrapper, 1, RndmLo_dG, 0.0, 1.0);
}
}
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
index 8a2a56261508656b374e416529fef978b134a7a6..f42a18023d5222499c0642de261bc541ef471c76 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
@@ -34,7 +34,8 @@
#include "StoreGate/WriteHandle.h"
#include "AthenaKernel/errorcheck.h"
// For the Athena-based random numbers.
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+#include "AthenaKernel/RNGWrapper.h"
//CLHEP includes
#include <CLHEP/Random/Randomize.h>
@@ -59,8 +60,6 @@ TileHitToRawChannel::TileHitToRawChannel(std::string name, ISvcLocator* pSvcLoca
, m_tileThresh(false)
, m_threshHi(0.0)
, m_ampMaxHi(0.0)
- , m_atRndmGenSvc(0)
- , m_pHRengine(0)
{
m_rChUnit = TileRawChannelUnit::ADCcounts;
m_rChType = TileFragHash::Default;
@@ -103,9 +102,7 @@ StatusCode TileHitToRawChannel::initialize() {
ATH_CHECK( m_tileToolNoiseSample.retrieve() );
if (m_tileNoise) {
- static const bool CREATEIFNOTTHERE_RNDM(true);
- CHECK( service("AtRndmGenSvc", m_atRndmGenSvc, CREATEIFNOTTHERE_RNDM));
- m_pHRengine = m_atRndmGenSvc->GetEngine("Tile_DigitsMaker");
+ ATH_CHECK(m_atRndmGenSvc.retrieve());
}
m_cabling = TileCablingService::getInstance();
@@ -169,6 +166,9 @@ StatusCode TileHitToRawChannel::execute() {
ATH_MSG_DEBUG( "Executing TileHitToRawChannel" );
+ ATHRNG::RNGWrapper* rngWrapper = m_atRndmGenSvc->getEngine(this);
+ rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() );
+
// step1: read hits from TES
SG::ReadHandle<TileHitContainer> hitContainer(m_hitContainerKey);
ATH_CHECK( hitContainer.isValid() );
@@ -226,7 +226,7 @@ StatusCode TileHitToRawChannel::execute() {
// If tileNoise is requested, generate random numbers to give noise
if (m_tileNoise) {
- RandGaussQ::shootArray(m_pHRengine, nChMax, random, 0.0, 1.0);
+ RandGaussQ::shootArray(*rngWrapper, nChMax, random, 0.0, 1.0);
for (ch = 0; ch < nChMax; ++ch) {
adc_gain[ch] = TileID::HIGHGAIN;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.cxx
index 6d4dd7210bd9871ec9876d6f6abfb28af17294de..a4946a1d371578e53410b4829af9b1ca92910575 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitToTTL1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -40,7 +40,8 @@
#include "StoreGate/WriteHandle.h"
#include "AthenaKernel/errorcheck.h"
// For the Athena-based random numbers.
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+#include "AthenaKernel/RNGWrapper.h"
// Gaudi includes
#include "GaudiKernel/ISvcLocator.h"
@@ -74,15 +75,12 @@ TileHitToTTL1::TileHitToTTL1(std::string name, ISvcLocator* pSvcLocator)
, m_lastTower(0)
, m_tileNoise(false)
, m_tileThresh(false)
- , m_pHRengine(0)
- , m_rndmSvc ("AtRndmGenSvc", name)
{
m_infoName = "TileInfo";
m_TileTTL1Type = "Standard";
declareProperty("TileInfoName", m_infoName);
declareProperty("TileTTL1Type", m_TileTTL1Type);
- declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in TileHitToTTL1");
declareProperty("maskBadChannels", m_maskBadChannels = true);
}
@@ -113,9 +111,8 @@ StatusCode TileHitToTTL1::initialize() {
//=== get TileCondToolEmscale
CHECK( m_tileToolEmscale.retrieve() );
- CHECK( m_rndmSvc.retrieve() );
- m_pHRengine = m_rndmSvc->GetEngine("Tile_HitToTTL1");
-
+ //=== Get rndm number service
+ ATH_CHECK( m_rndmSvc.retrieve() );
m_cabling = TileCablingService::getInstance();
@@ -214,6 +211,10 @@ StatusCode TileHitToTTL1::execute() {
// declare array for random number generation for noise in samples.
double Rndm[16]; // Can't use variable size array
+ // Prepare RNG Service
+ ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
+ rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() );
+
/*........................................................................*/
// Get hit container from TES and create TTL1 and MBTS container
// Note that hit container has 256 collections (one for each drawer),
@@ -540,7 +541,7 @@ StatusCode TileHitToTTL1::execute() {
double ttL1Max = m_tileInfo->MBTSL1Max(MBTS_id);
if (m_tileNoise)
- RandGaussQ::shootArray(m_pHRengine, m_MBTSnSamples, Rndm);
+ RandGaussQ::shootArray(*rngWrapper, m_MBTSnSamples, Rndm);
for (int jsamp = 0; jsamp < m_MBTSnSamples; ++jsamp) {
MBTSAmp[jsamp] *= ttL1Calib; // convert pCb to mV
MBTSsamples[jsamp] = MBTSAmp[jsamp] + ttL1Ped;
@@ -596,7 +597,7 @@ StatusCode TileHitToTTL1::execute() {
} // end loop over samples
if (m_tileNoise)
- peakAmp += ttL1NoiseSigma * RandGaussQ::shoot(m_pHRengine);
+ peakAmp += ttL1NoiseSigma * RandGaussQ::shoot(*rngWrapper);
ttL1samples[0] = peakAmp;
if (m_tileThresh) {
if (ttL1samples[0] - ttL1Ped < ttL1Thresh)
@@ -622,7 +623,7 @@ StatusCode TileHitToTTL1::execute() {
double ttL1Max = m_tileInfo->TTL1Max(ttId[ieta]);
if (m_tileNoise)
- RandGaussQ::shootArray(m_pHRengine, m_nSamples, Rndm);
+ RandGaussQ::shootArray(*rngWrapper, m_nSamples, Rndm);
for (int jsamp = 0; jsamp < m_nSamples; ++jsamp) {
ttAmp[ieta][jsamp] *= ttL1Calib; // convert pCb to mV
ttL1samples[jsamp] = ttAmp[ieta][jsamp] + ttL1Ped;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
index b78f6245c41b7240f4e81bef79c608625b977c36..3ec21273efb0abf08fa410f2ff2f1c003c199a29 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
@@ -31,7 +31,9 @@
#include "AthenaKernel/ITriggerTime.h"
#include "AthenaKernel/errorcheck.h"
// For the Athena-based random numbers.
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+#include "AthenaKernel/RNGWrapper.h"
+#include "CLHEP/Random/RandomEngine.h"
// Gaudi includes
#include "GaudiKernel/SystemOfUnits.h"
@@ -69,8 +71,6 @@ TileHitVecToCntTool::TileHitVecToCntTool(const std::string& type,
, m_tileTBID(0)
, m_tileInfo(0)
, m_tileMgr(0)
- , m_pHRengine(0)
- , m_rndmSvc("AtRndmGenSvc",name)
, m_hits(0)
, m_hits_DigiHSTruth(0)
, m_mbtsOffset(0)
@@ -91,7 +91,6 @@ TileHitVecToCntTool::TileHitVecToCntTool(const std::string& type,
declareProperty("MaxHitTime", m_maxHitTime, "All sub-hits with time above m_maxHitTime will be ignored");
declareProperty("PhotostatWindow", m_photoStatisticsWindow, "Sum up energy in [-m_photoStatWindow,+m_photoStatWindow] and use it for photostatistics");
declareProperty("PhotostatType", m_photoElectronStatistics, "Method to apply photostatistics (default=2)");
- declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in TileHitVecToCnt");
declareProperty("SkipNoHit",m_skipNoHit, "Skip events with no Tile hits (default=false)");
declareProperty("RndmEvtOverlay",m_rndmEvtOverlay = false, "Pileup and/or noise added by overlaying random events (default=false)");
declareProperty("DoHSTruthReconstruction",m_doDigiTruth = true, "DigiTruth reconstruction");
@@ -104,8 +103,7 @@ StatusCode TileHitVecToCntTool::initialize() {
bool error = false;
- CHECK(m_rndmSvc.retrieve());
- m_pHRengine = m_rndmSvc->GetEngine("Tile_HitVecToCnt");
+ ATH_CHECK(m_rndmSvc.retrieve());
// retrieve Tile detector manager, TileID helper and TileInfo from det store
@@ -377,6 +375,9 @@ StatusCode TileHitVecToCntTool::prepareEvent(unsigned int /*nInputEvents*/) {
ATH_MSG_DEBUG("TileHitVecToCntTool prepareEvent finished");
+ ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
+ rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() );
+
return StatusCode::SUCCESS;
}
@@ -556,7 +557,7 @@ void TileHitVecToCntTool::processHitVectorForPileUp(const TileHitVector* inputHi
return;
}
-void TileHitVecToCntTool::processHitVectorWithoutPileUp(const TileHitVector* inputHits, int& nHit, double& eHitTot, TileHitNonConstContainer* &hitCont) {
+void TileHitVecToCntTool::processHitVectorWithoutPileUp(const TileHitVector* inputHits, int& nHit, double& eHitTot, TileHitNonConstContainer* &hitCont, CLHEP::HepRandomEngine * engine) {
TileHitVecConstIterator inpItr = inputHits->begin();
TileHitVecConstIterator end = inputHits->end();
@@ -673,7 +674,7 @@ void TileHitVecToCntTool::processHitVectorWithoutPileUp(const TileHitVector* inp
}
}
ATH_MSG_DEBUG("Minimal time in input event " << avtime);
- double shift = RandFlat::shoot(m_pHRengine, m_triggerTime, 0.0);
+ double shift = RandFlat::shoot(engine, m_triggerTime, 0.0);
ATH_MSG_DEBUG("Minimal time after random shift " << shift);
avtime -= shift; // subtracting negative shift value here
@@ -760,6 +761,9 @@ StatusCode TileHitVecToCntTool::processBunchXing(int bunchXing
ATH_MSG_DEBUG("Inside TileHitVecToCntTool processBunchXing" << bunchXing);
// setFilterPassed(true);
+ ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
+ CLHEP::HepRandomEngine * engine = *rngWrapper;
+
SubEventIterator iEvt(bSubEvents);
if (m_rndmEvtOverlay && bunchXing != 0) iEvt = eSubEvents; // in overlay skip all events except BC=0
@@ -789,7 +793,7 @@ StatusCode TileHitVecToCntTool::processBunchXing(int bunchXing
} else {
ATH_MSG_DEBUG(" New HitCont. TimeOffset=" << SubEvtTimOffset << ", size =" << inputHits->size());
this->processHitVectorForOverlay(inputHits, nHit, eHitTot);
- //if( m_doDigiTruth && iEvt == bSubEvents) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_signalHits);
+ //if( m_doDigiTruth && iEvt == bSubEvents) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_signalHits, engine);
}
} else if (m_pileUp) { // pileup code
bool isSignal = false;
@@ -805,8 +809,8 @@ StatusCode TileHitVecToCntTool::processBunchXing(int bunchXing
ATH_MSG_ERROR(" Tile Hit container not found for event key " << hitVectorName);
}
- this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits);
- if(m_doDigiTruth) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits_DigiHSTruth);
+ this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits, engine);
+ if(m_doDigiTruth) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits_DigiHSTruth, engine);
} // to pile-up or not
} // end of the loop over different input hitVectorNames (normal hits and MBTS hits)
@@ -831,6 +835,9 @@ StatusCode TileHitVecToCntTool::processAllSubEvents() {
int nHit(0);
double eHitTot(0.0);
+ ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
+ CLHEP::HepRandomEngine * engine = *rngWrapper;
+
std::vector<std::string>::const_iterator hitVecNamesItr = m_hitVectorNames.begin();
std::vector<std::string>::const_iterator hitVecNamesEnd = m_hitVectorNames.end();
for (; hitVecNamesItr != hitVecNamesEnd; ++hitVecNamesItr) {
@@ -860,7 +867,7 @@ StatusCode TileHitVecToCntTool::processAllSubEvents() {
const TileHitVector* inputHits = &(*(iCont->second));
ATH_MSG_DEBUG(" New HitCont. TimeOffset=" << SubEvtTimOffset << ", size =" << inputHits->size());
this->processHitVectorForOverlay(inputHits, nHit, eHitTot);
- if(m_doDigiTruth) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits_DigiHSTruth);
+ if(m_doDigiTruth) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits_DigiHSTruth, engine);
}
}
} else if (m_pileUp) { // pileup code
@@ -886,8 +893,8 @@ StatusCode TileHitVecToCntTool::processAllSubEvents() {
ATH_MSG_WARNING("Hit Vector "<< hitVectorName << " not found in StoreGate");
continue; // continue to the next hit vector
}
- this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits);
- if(m_doDigiTruth) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits_DigiHSTruth);
+ this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits, engine);
+ if(m_doDigiTruth) this->processHitVectorWithoutPileUp(inputHits, nHit, eHitTot, m_hits_DigiHSTruth, engine);
}
} // end of the loop over different input hitVectorNames (normal hits and MBTS hits)
@@ -960,6 +967,9 @@ StatusCode TileHitVecToCntTool::mergeEvent() {
//photoelectron statistics.
//loop over all hits in TileHitContainer and take energy deposited in certain period of time
//std::vector<std::string>::const_iterator hitVecNamesEnd = m_hitVectorNames.end();
+
+ ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
+ CLHEP::HepRandomEngine * engine = *rngWrapper;
TileHitNonConstContainer::iterator collIt_DigiHSTruth;
TileHitNonConstContainer::iterator endColl_DigiHSTruth;
@@ -990,7 +1000,7 @@ StatusCode TileHitVecToCntTool::mergeEvent() {
//channel_id = m_cabling->s2h_channel_id(pmt_id);
}
- double scaleFactor = applyPhotoStatistics(ehit, pmt_id);
+ double scaleFactor = applyPhotoStatistics(ehit, pmt_id, engine);
pHit->scale(scaleFactor);
if(m_doDigiTruth){
@@ -1071,7 +1081,7 @@ StatusCode TileHitVecToCntTool::finalize() {
}
-double TileHitVecToCntTool::applyPhotoStatistics(double energy, Identifier pmt_id) {
+double TileHitVecToCntTool::applyPhotoStatistics(double energy, Identifier pmt_id, CLHEP::HepRandomEngine * engine) {
// pmt_sample = 0-3 for normal cells 4 for inner MBTS, 5 for outer MBTS, 6 for E4'
int pmt_sample =
(m_tileTBID->is_tiletb(pmt_id)) ? TileID::SAMP_X + m_tileTBID->channel(pmt_id) : m_tileID->sample(pmt_id);
@@ -1081,19 +1091,19 @@ double TileHitVecToCntTool::applyPhotoStatistics(double energy, Identifier pmt_i
switch (m_photoElectronStatistics) {
case 2:
if (pe > 20.0) {
- RndmPois = std::max(0.0, RandGaussQ::shoot(m_pHRengine, pe, sqrt(pe))); // FIXME CLHEP::RandGaussZiggurat is faster and more accurate.
+ RndmPois = std::max(0.0, RandGaussQ::shoot(engine, pe, sqrt(pe))); // FIXME CLHEP::RandGaussZiggurat is faster and more accurate.
pe_scale = RndmPois / pe;
} else { // pe<=20
if (pe > 0.) {
double singleMEAN = 1.0; //Parameterization of monoelectron spectra
double singleSIGMA = 1.0;
- RndmPois = RandPoissonT::shoot(m_pHRengine, pe);
+ RndmPois = RandPoissonT::shoot(engine, pe);
if (RndmPois > 0) {
pe_scale = 0;
for (int i = 0; i < RndmPois; i++)
- pe_scale += 1 / (1.08332) * std::max(0., RandGaussQ::shoot(m_pHRengine, singleMEAN, singleSIGMA)); // FIXME CLHEP::RandGaussZiggurat is faster and more accurate.
+ pe_scale += 1 / (1.08332) * std::max(0., RandGaussQ::shoot(engine, singleMEAN, singleSIGMA)); // FIXME CLHEP::RandGaussZiggurat is faster and more accurate.
pe_scale /= RndmPois;
} else
@@ -1104,7 +1114,7 @@ double TileHitVecToCntTool::applyPhotoStatistics(double energy, Identifier pmt_i
case 0:
if (pe > 0.0) {
- RndmPois = RandPoissonT::shoot(m_pHRengine, pe);
+ RndmPois = RandPoissonT::shoot(engine, pe);
pe_scale = RndmPois / pe;
}
break;
@@ -1112,7 +1122,7 @@ double TileHitVecToCntTool::applyPhotoStatistics(double energy, Identifier pmt_i
case 1:
if (pe > 0.0) {
if (pe > 10.0) {
- RndmPois = std::max(0.0, RandGaussQ::shoot(m_pHRengine, pe, sqrt(pe))); // FIXME CLHEP::RandGaussZiggurat is faster and more accurate.
+ RndmPois = std::max(0.0, RandGaussQ::shoot(engine, pe, sqrt(pe))); // FIXME CLHEP::RandGaussZiggurat is faster and more accurate.
} else {
int nn = std::max(10, (int) (pe * 10.0));
double * ProbFunc = new double[nn];
@@ -1121,7 +1131,7 @@ double TileHitVecToCntTool::applyPhotoStatistics(double energy, Identifier pmt_i
ProbFunc[i] = ProbFunc[i - 1] * pe / i;
}
RandGeneral* RandG = new RandGeneral(ProbFunc, nn, 0);
- RndmPois = RandG->shoot(m_pHRengine) * nn;
+ RndmPois = RandG->shoot(engine) * nn;
//here RndmPois is continuously distributed random value obtained from Poisson
//distribution by approximation.
delete RandG;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
index ac75cea888b94fa26a1450a9f037a79a4bb54b1b..8c9fcd54db9288b92175460beeddc56e013808b4 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//****************************************************************************
@@ -36,8 +36,6 @@
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "AthenaKernel/errorcheck.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
-
TileMuonReceiverDecision::TileMuonReceiverDecision(std::string name, ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
diff --git a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
index c7c9dfec82dbb39f168c53839e7914fda11a1f27..d532b76cb6b57e8073221d0c8fd804da192509f3 100644
--- a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//***************************************************************************************
@@ -48,7 +48,9 @@
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "AthenaKernel/errorcheck.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+#include "AthenaKernel/RNGWrapper.h"
+
// external
#include <CLHEP/Random/Randomize.h>
@@ -76,8 +78,6 @@ TilePulseForTileMuonReceiver::TilePulseForTileMuonReceiver(std::string name, ISv
, m_nBinsPerX(0)
, m_binTime0(0)
, m_timeStep(0.0)
- , m_pHRengine(0)
- , m_rndmSvc("AtRndmGenSvc", name)
, m_MuRcvBuildTool("TileRawChannelBuilderMF")
, m_run2(true)
{
@@ -89,7 +89,6 @@ TilePulseForTileMuonReceiver::TilePulseForTileMuonReceiver(std::string name, ISv
declareProperty("UseCoolPulseShapes" , m_useCoolPulseShapes = false, "Pulse shapes from database (default=false)");
declareProperty("UseCoolNoise" , m_tileNoise = false, "Noise from database (default=false)");
declareProperty("UseCoolPedestal" , m_tilePedestal = false, "Pedestal from database (default=false)");
- declareProperty("RndmSvc" , m_rndmSvc, "Random Number Service used in TilePulseForTileMuonReceiver");
declareProperty("TileRawChannelBuilderMF" , m_MuRcvBuildTool, "The tool by default is the Matched Filter");
}
@@ -136,7 +135,7 @@ StatusCode TilePulseForTileMuonReceiver::initialize() {
<< " ADC saturation value: " << m_adcMax
<< " TileCal Threshold LOW GAIN: " << m_tileThresh);
- m_pHRengine = m_rndmSvc->GetEngine("Tile_PulseForTileMuonReceiver");
+ ATH_CHECK(m_rndmSvc.retrieve());
m_nShape = m_tileInfo->MuRcvNBins();
m_nBinsPerX = m_tileInfo->MuRcvBinsPerX();
@@ -263,6 +262,10 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
//
std::vector<float> digitsBuffer(m_nSamples);
+ // Prepare RNG service
+ ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this);
+ rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() );
+
/////////////////////////////////////////////////////////////////////////////////
// (a.0) iterate over collections in the HIT container: access 'ros' and 'drawer'
//
@@ -496,7 +499,7 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
// Generate an array to randomize the noise for each digit
//
- RandGaussQ::shootArray(m_pHRengine, m_nSamples, Rndm, 0.0, 1.0);
+ RandGaussQ::shootArray(*rngWrapper, m_nSamples, Rndm, 0.0, 1.0);
ATH_MSG_VERBOSE( "(D.02) Pulse digits [MeV]:"
<< " " << pDigitSamples[0]
@@ -531,7 +534,7 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
// Collecting noise from the database
//
if (m_tileNoise) {
- RandFlat::shootArray(m_pHRengine, 1, Rndm_dG, 0.0, 1.0);
+ RandFlat::shootArray(*rngWrapper, 1, Rndm_dG, 0.0, 1.0);
sigma_Hfn1 = m_tileToolNoiseSample->getHfn1(idhash, TMDBchan, TileID::LOWGAIN);
sigma_Hfn2 = m_tileToolNoiseSample->getHfn2(idhash, TMDBchan, TileID::LOWGAIN);
if (sigma_Hfn1 > 0 || sigma_Hfn2) {
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index d795f8d7d0114306fcd2f31170e551316c5da0bc..467e7d7e23b2e6f6c06d869fef2a42d6c609be6a 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -24,5 +24,5 @@ ciRefFileMap = {
's3126-22.0' : 'v3',
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v1',
- 'overlay-d1498-22.0' : 'v10',
+ 'overlay-d1498-22.0' : 'v11',
}
diff --git a/Tools/Tier0ChainTests/test/test_q220.sh b/Tools/Tier0ChainTests/test/test_q220.sh
index bd2d1be252bbd6dcc2a31b129c264445e01a0f6d..29b7b66fa0dc7a09059958e864774149aca6a5e5 100755
--- a/Tools/Tier0ChainTests/test/test_q220.sh
+++ b/Tools/Tier0ChainTests/test/test_q220.sh
@@ -8,7 +8,8 @@
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-Reco_tf.py --AMI=q220 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_cos.00251363.physics_IDCosmic.merge.RAW._lb0057._SFO-ALL._0001.1 --imf False
+#This test currently has the muon isolation reconstruction switched off. It should be switched back on at a later date.
+Reco_tf.py --AMI=q220 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False --preExec "r2e:from MuonRecExample.MuonRecFlags import muonRecFlags; muonRecFlags.doMuonIso.set_Value_and_Lock(False)"
echo "art-result: $?"
ArtPackage=$1
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigEgammaRec/CMakeLists.txt
index 27eefb6b34e88e81bf86392d18bd9477b40b47a5..13a3ced0d6e4dc30959224e2d00fb35bc8e9fd3a 100644
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/CMakeLists.txt
@@ -20,12 +20,14 @@ atlas_depends_on_subdirs( PUBLIC
Trigger/TrigSteer/TrigInterfaces
PRIVATE
Calorimeter/CaloEvent
+ Calorimeter/CaloUtils
Event/xAOD/xAODCaloEvent
Event/xAOD/xAODEgammaCnv
Event/xAOD/xAODEventShape
Event/xAOD/xAODTracking
PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
Reconstruction/egamma/egammaEvent
+ Reconstruction/egamma/egammaUtils
Trigger/TrigTools/TrigTimeAlgs )
# External dependencies:
@@ -36,13 +38,13 @@ atlas_add_library( TrigEgammaRecLib
src/*.cxx
PUBLIC_HEADERS TrigEgammaRec
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES xAODEgamma xAODPrimitives GaudiKernel RecoToolInterfaces egammaRecEvent TrigCaloEvent TrigParticle TrigSteeringEvent LumiBlockCompsLib TrigInterfacesLib EgammaAnalysisInterfacesLib TrigTimeAlgsLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent xAODCaloEvent xAODEventShape xAODTracking egammaEvent )
+ LINK_LIBRARIES xAODEgamma xAODPrimitives GaudiKernel CaloUtilsLib RecoToolInterfaces egammaRecEvent TrigCaloEvent TrigParticle TrigSteeringEvent LumiBlockCompsLib TrigInterfacesLib EgammaAnalysisInterfacesLib TrigTimeAlgsLib
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent xAODCaloEvent xAODEventShape xAODTracking egammaEvent egammaUtils)
atlas_add_component( TrigEgammaRec
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEgamma xAODPrimitives GaudiKernel LumiBlockCompsLib RecoToolInterfaces egammaRecEvent TrigCaloEvent TrigParticle TrigSteeringEvent TrigInterfacesLib CaloEvent xAODCaloEvent xAODEventShape xAODTracking EgammaAnalysisInterfacesLib egammaEvent TrigTimeAlgsLib TrigEgammaRecLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEgamma xAODPrimitives GaudiKernel CaloUtilsLib LumiBlockCompsLib RecoToolInterfaces egammaRecEvent TrigCaloEvent TrigParticle TrigSteeringEvent TrigInterfacesLib CaloEvent xAODCaloEvent xAODEventShape xAODTracking EgammaAnalysisInterfacesLib egammaEvent egammaUtils TrigTimeAlgsLib TrigEgammaRecLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h b/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h
index 5e86e07598dd278d6be45ca9247fa04215c94d38..1a049aed5d7b1b4bdce74615a3246925d7259784 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h
@@ -86,6 +86,8 @@ private:
ToolHandle<IEMTrackMatchBuilder> m_trackMatchBuilder;
ToolHandle<IEMConversionBuilder> m_conversionBuilder;
+
+
ToolHandle<IEMShowerBuilder> m_showerBuilder; // trigger specific
ToolHandle<IEMFourMomBuilder> m_fourMomBuilder; // trigger specific
ToolHandle<IEGammaAmbiguityTool> m_ambiguityTool;
@@ -112,12 +114,13 @@ private:
ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool;
// booleans to run specific parts of offline reconstruction
bool m_doConversions;
+ bool m_doBremCollection;
bool m_doTrackMatching;
bool m_doTrackIsolation;
bool m_doCaloCellIsolation;
bool m_doTopoIsolation;
bool m_useBremAssoc;
-
+
// Allows delete
EgammaRecContainer *m_eg_container;
// needed for monitoring to work
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaRecConfig.py b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaRecConfig.py
index 40a003b5ac769727addd93030118bfd6afaaa42d..1721caa5a02a8f94876f727f7900c43b6005f5d8 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaRecConfig.py
@@ -56,7 +56,7 @@ TrigEgammaRec = Factory(TrigEgammaRecConf.TrigEgammaRec, name="TrigEgammaRec",do
# Tools with non-default configuration
TrackMatchBuilderTool = TrigEMTrackMatchBuilder,
ShowerBuilderTool = TrigEMShowerBuilder,
-
+
# Set the isolation tools
TrackIsolationTool = TrigTrackIsolationTool,
CaloCellIsolationTool = TrigCaloIsolationTool,
@@ -75,7 +75,6 @@ TrigEgammaRec = Factory(TrigEgammaRecConf.TrigEgammaRec, name="TrigEgammaRec",do
PhotonPIDBuilder = TrigPhotonPIDBuilder,
# Tools with default configuration
-# VertexBuilderTool = EMVertexBuilder,
ConversionBuilderTool = EMConversionBuilder.copyPublic("TrigEMConversionBuilder"),
AmbiguityTool = EGammaAmbiguityTool.copyPublic("TrigEGammaAmbiguityTool"),
FourMomBuilderTool = EMFourMomBuilder.copyPublic("TrigEMFourMomBuilder"),
@@ -88,3 +87,4 @@ TrigEgammaRec = Factory(TrigEgammaRecConf.TrigEgammaRec, name="TrigEgammaRec",do
postInit = [configureTrigEgammaMonitoring],
)
+
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
index befd1e2ce4be958d9ec77d59a054e417441f498c..723459a24f27d63f24a66dace1fe31e23edd7bfc 100644
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
# vim:fenc=utf-8
#
-# Copyright @2016 Ryan Mackenzie White <ryan.white@cern.ch>
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
"""
@@ -36,9 +36,11 @@ PhotonPidTools()
# Following tools have TrigEgamma factories
from egammaTools.egammaToolsFactories import EMTrackMatchBuilder, EMFourMomBuilder, EMShowerBuilder
+from egammaTools import egammaToolsConf
from egammaTools.egammaToolsConf import EMPIDBuilder
from CaloClusterCorrection import CaloClusterCorrectionConf as Cccc
+from egammaTrackTools.egammaTrackToolsFactories import EMExtrapolationTools
TrigCaloFillRectangularCluster = PublicToolFactory( Cccc.CaloFillRectangularCluster,
name = "trigegamma_CaloFillRectangularCluster",
eta_size = 5,
@@ -118,8 +120,14 @@ TrigEMExtrapolationTools=EMExtrapolationTools.copyPublic(name="TrigEMExtrapolati
useCaching=False)
+def appendtoTrigEMTrackMatchBuilder(tool):
+ "add track to calo tool "
+ if not hasattr(tool,"EMExtrapolationTools"):
+ tool += EMExtrapolationTools()
+
TrigEMTrackMatchBuilder = EMTrackMatchBuilder.copyPublic(
name = "TrigEMTrackMatchBuilder",
+ postInit=[appendtoTrigEMTrackMatchBuilder],
broadDeltaEta = 0.2, #For offline 0.1
broadDeltaPhi = 0.2, #For offline 0.15
useScoring = False,
@@ -134,10 +142,13 @@ TrigEMShowerBuilder = EMShowerBuilder.copyPublic(
)
from TriggerMenu.egamma.EgammaSliceFlags import EgammaSliceFlags
+from egammaMVACalib.TrigEgammaMVACalibFactories import TrigElectronMVATool, TrigPhotonMVATool
+
mlog.info("MVA version version %s"%EgammaSliceFlags.calibMVAVersion() )
mlog.info("Cluster Correction version %s"%EgammaSliceFlags.clusterCorrectionVersion() )
EgammaSliceFlags.calibMVAVersion.set_On()
+
from TrigCaloRec.TrigCaloRecConf import TrigCaloClusterMaker
def configureTrigCaloClusterMonitoring(tool):
@@ -163,7 +174,6 @@ def configureClusterBuilder(slwAlg):
eta_Duplicate = 5,
phi_Duplicate = 5
)
- #mlog.info("TrigCaloClusterMaker adding slw tool %s"%trigslw.getFullName())
slwAlg += trigslw
slwAlg.ClusterMakerTools=[ trigslw.getFullName() ]
@@ -178,7 +188,6 @@ def configureClusterCorrections(slwAlg):
if hasattr(slwAlg,clName):
continue
for tool in make_CaloSwCorrections (cl,version=EgammaSliceFlags.clusterCorrectionVersion()):
- #mlog.info("Correction tool %s"%tool.getFullName())
slwAlg += tool
slwAlg.ClusterCorrectionTools += [tool.getFullName()]
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaTrackTools.py b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaTrackTools.py
new file mode 100644
index 0000000000000000000000000000000000000000..a5fe6863b36d92a8977f798b8746d99579ff985b
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaTrackTools.py
@@ -0,0 +1,112 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr, ToolSvc
+
+from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__PixelClusterOnTrackTool
+egTrigPixelClusterOnTrackTool = InDet__PixelClusterOnTrackTool("egTrigPixelClusterOnTrackTool",
+ DisableDistortions = False,
+ applyNNcorrection = False)
+ToolSvc += egTrigPixelClusterOnTrackTool
+
+from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__SCT_ClusterOnTrackTool
+egTrigSCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool ("egTrigSCT_ClusterOnTrackTool",
+ CorrectionStrategy = 0, # do correct position bias
+ ErrorStrategy = 2) # do use phi dependent errors
+ToolSvc += egTrigSCT_ClusterOnTrackTool
+
+
+
+from TrkRIO_OnTrackCreator.TrkRIO_OnTrackCreatorConf import Trk__RIO_OnTrackCreator
+egTrigRotCreator = Trk__RIO_OnTrackCreator(name = 'egTrigRotCreator',
+ ToolPixelCluster = egTrigPixelClusterOnTrackTool,
+ ToolSCT_Cluster = egTrigSCT_ClusterOnTrackTool,
+ Mode = 'indet')
+ToolSvc += egTrigRotCreator
+
+
+from TrkDetDescrSvc.AtlasTrackingGeometrySvc import AtlasTrackingGeometrySvc
+
+from TrkExRungeKuttaPropagator.TrkExRungeKuttaPropagatorConf import Trk__RungeKuttaPropagator as Propagator
+egTrigTrkPropagator = Propagator(name = 'egTrigTrkPropagator')
+egTrigTrkPropagator.AccuracyParameter = 0.0001
+ToolSvc += egTrigTrkPropagator
+
+from TrkExSTEP_Propagator.TrkExSTEP_PropagatorConf import Trk__STEP_Propagator as StepPropagator
+egTrigTrkStepPropagator = StepPropagator(name = 'egTrigTrkStepPropagator')
+ToolSvc += egTrigTrkStepPropagator
+
+from TrkExTools.TrkExToolsConf import Trk__Navigator
+egTrigTrkNavigator = Trk__Navigator(name = 'egTrigTrkNavigator')
+ToolSvc += egTrigTrkNavigator
+
+from TrkExTools.TrkExToolsConf import Trk__MaterialEffectsUpdator
+egTrigTrkMaterialUpdator = Trk__MaterialEffectsUpdator(name = "egTrigTrkMaterialEffectsUpdator")
+ToolSvc += egTrigTrkMaterialUpdator
+
+egTrigTrkSubPropagators = []
+egTrigTrkSubUpdators = []
+# -------------------- set it depending on the geometry ----------------------------------------------------
+# default for ID is (Rk,Mat)
+egTrigTrkSubPropagators += [ egTrigTrkPropagator.name() ]
+egTrigTrkSubUpdators += [ egTrigTrkMaterialUpdator.name() ]
+# default for Calo is (Rk,MatLandau)
+egTrigTrkSubPropagators += [ egTrigTrkPropagator.name() ]
+egTrigTrkSubUpdators += [ egTrigTrkMaterialUpdator.name() ]
+# default for MS is (STEP,Mat)
+egTrigTrkSubPropagators += [ egTrigTrkStepPropagator.name() ]
+egTrigTrkSubUpdators += [ egTrigTrkMaterialUpdator.name() ]
+# ----------------------------------------------------------------------------------------------------------
+
+from TrkExTools.TrkExToolsConf import Trk__Extrapolator
+egTrigTrkExtrapolator = Trk__Extrapolator(name = 'egTrigTrkExtrapolator',
+ Propagators = [ egTrigTrkPropagator, egTrigTrkStepPropagator ],
+ MaterialEffectsUpdators = [ egTrigTrkMaterialUpdator ],
+ Navigator = egTrigTrkNavigator,
+ SubPropagators = egTrigTrkSubPropagators,
+ SubMEUpdators = egTrigTrkSubUpdators)
+ToolSvc += egTrigTrkExtrapolator
+
+
+# Set up the GSF
+from TrkGaussianSumFilter.TrkGaussianSumFilterConf import Trk__GsfMaterialMixtureConvolution
+GSFTrigMaterialUpdator = Trk__GsfMaterialMixtureConvolution (name = 'GSFTrigMaterialUpdator')
+ToolSvc += GSFTrigMaterialUpdator
+# component Reduction
+from TrkGaussianSumFilter.TrkGaussianSumFilterConf import Trk__QuickCloseComponentsMultiStateMerger
+GSFTrigComponentReduction = Trk__QuickCloseComponentsMultiStateMerger (name = 'GSFTrigComponentReduction',
+ MaximumNumberOfComponents = 12)
+ToolSvc += GSFTrigComponentReduction
+
+from TrkMeasurementUpdator.TrkMeasurementUpdatorConf import Trk__KalmanUpdator as ConfiguredKalmanUpdator
+egTrigTrkUpdator = ConfiguredKalmanUpdator('egTrigTrkUpdator')
+ToolSvc += egTrigTrkUpdator
+
+from TrkGaussianSumFilter.TrkGaussianSumFilterConf import Trk__GsfMeasurementUpdator
+GSFTrigMeasurementUpdator = Trk__GsfMeasurementUpdator( name = 'GSFTrigMeasurementUpdator',
+ Updator = egTrigTrkUpdator )
+ToolSvc += GSFTrigMeasurementUpdator
+
+from TrkGaussianSumFilter.TrkGaussianSumFilterConf import Trk__GsfExtrapolator
+GSFTrigExtrapolator = Trk__GsfExtrapolator(name = 'GSFTrigExtrapolator',
+ Propagators = [ egTrigTrkPropagator ],
+ SearchLevelClosestParameters = 10,
+ StickyConfiguration = True,
+ Navigator = egTrigTrkNavigator,
+ GsfMaterialConvolution = GSFTrigMaterialUpdator,
+ ComponentMerger = GSFTrigComponentReduction,
+ SurfaceBasedMaterialEffects = False )
+ToolSvc += GSFTrigExtrapolator
+
+
+from TrkGaussianSumFilter.TrkGaussianSumFilterConf import Trk__GaussianSumFitter
+GSFTrigTrackFitter = Trk__GaussianSumFitter(name = 'GSFTrigTrackFitter',
+ ToolForExtrapolation = GSFTrigExtrapolator,
+ MeasurementUpdatorType = GSFTrigMeasurementUpdator,
+ ReintegrateOutliers = True,
+ MakePerigee = True,
+ RefitOnMeasurementBase = True,
+ DoHitSorting = True,
+ ValidationMode = False,
+ ToolForROTCreation = egTrigRotCreator)
+# --- end of fitter loading
+ToolSvc += GSFTrigTrackFitter
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
index 578aa0d87c3fe76507b6c895674f1528e8b1f85a..8b95163cef42217d4667e2e1e546c1264740c7e8 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -146,6 +146,8 @@ TrigEgammaRec::TrigEgammaRec(const std::string& name,ISvcLocator* pSvcLocator):
declareProperty("doTrackMatching",m_doTrackMatching = false, "run TrackMatchBuilder");
// Set flag for conversions
declareProperty("doConversions",m_doConversions = false, "run ConversionBuilder");
+ /** @brief run GSF refit */
+ declareProperty("doBremCollection", m_doBremCollection = false, "run BremCollection");
// Monitoring
typedef const DataVector<xAOD::Electron> xAODElectronDV_type;
@@ -469,59 +471,59 @@ HLT::ErrorCode TrigEgammaRec::hltInitialize() {
if (runIsoType.find(flavName) == runIsoType.end()) runIsoType.insert(flavName);
}
- // /** @brief Retrieve IsolationTools based on IsoTypes configured */
- // // BROKEN! WORTH FIXING, OR IS THIS FILE NOW OBSOLETE
- // if(m_doTrackIsolation){
- // if (!m_trackIsolationTool.empty() && runIsoType.find("ptcone") != runIsoType.end()){
- // ATH_MSG_DEBUG("Retrieve TrackIsolationTool");
-
- // if(m_trackIsolationTool.retrieve().isFailure()){
- // ATH_MSG_ERROR("Unable to retrieve " << m_trackIsolationTool);
- // return HLT::BAD_JOB_SETUP;
- // }
- // else {
- // ATH_MSG_DEBUG("Retrieved Tool "<<m_trackIsolationTool);
- // if (timerSvc()) m_timerIsoTool1 = addTimer("TrackIsolationTool");
- // }
- // }
- // } else {
- m_trackIsolationTool.disable();
- // }
-
- // if(m_doCaloCellIsolation){
- // if (!m_caloCellIsolationTool.empty() && runIsoType.find("etcone") != runIsoType.end()) {
- // ATH_MSG_DEBUG("Retrieve CaloIsolationTool is empty");
- // if(m_caloCellIsolationTool.retrieve().isFailure()){
- // ATH_MSG_ERROR("Unable to retrieve " << m_caloCellIsolationTool);
- // return HLT::BAD_JOB_SETUP;
- // }
- // else {
- // ATH_MSG_DEBUG("Retrieved Tool "<<m_caloCellIsolationTool);
- // if (timerSvc()) m_timerIsoTool2 = addTimer("CaloCellIsolationTool");
- // }
- // } else {
- // m_caloCellIsolationTool.disable();
- // }
- // } else {
- m_caloCellIsolationTool.disable();
- // }
- // if(m_doTopoIsolation){
- // if (!m_topoIsolationTool.empty() && runIsoType.find("topoetcone") != runIsoType.end()) {
- // ATH_MSG_DEBUG("Retrieve TopoIsolationTool is empty");
- // if(m_topoIsolationTool.retrieve().isFailure()){
- // ATH_MSG_ERROR("Unable to retrieve " << m_topoIsolationTool);
- // return HLT::BAD_JOB_SETUP;
- // }
- // else {
- // ATH_MSG_DEBUG("Retrieved Tool "<<m_topoIsolationTool);
- // if (timerSvc()) m_timerIsoTool3 = addTimer("topoIsolationTool");
- // }
- // } else {
- // m_topoIsolationTool.disable();
- // }
- // } else {
- m_topoIsolationTool.disable();
- // }
+ /** @brief Retrieve IsolationTools based on IsoTypes configured */
+ if(m_doTrackIsolation){
+ if (!m_trackIsolationTool.empty() && runIsoType.find("ptcone") != runIsoType.end()){
+ ATH_MSG_DEBUG("Retrieve TrackIsolationTool");
+
+ if(m_trackIsolationTool.retrieve().isFailure()){
+ ATH_MSG_ERROR("Unable to retrieve " << m_trackIsolationTool);
+ return HLT::BAD_JOB_SETUP;
+ }
+ else {
+ ATH_MSG_DEBUG("Retrieved Tool "<<m_trackIsolationTool);
+ if (timerSvc()) m_timerIsoTool1 = addTimer("TrackIsolationTool");
+ }
+ }
+ } else {
+ m_trackIsolationTool.disable();
+ }
+
+ if(m_doCaloCellIsolation){
+ if (!m_caloCellIsolationTool.empty() && runIsoType.find("etcone") != runIsoType.end()) {
+ ATH_MSG_DEBUG("Retrieve CaloIsolationTool is empty");
+ if(m_caloCellIsolationTool.retrieve().isFailure()){
+ ATH_MSG_ERROR("Unable to retrieve " << m_caloCellIsolationTool);
+ return HLT::BAD_JOB_SETUP;
+ }
+ else {
+ ATH_MSG_DEBUG("Retrieved Tool "<<m_caloCellIsolationTool);
+ if (timerSvc()) m_timerIsoTool2 = addTimer("CaloCellIsolationTool");
+ }
+ } else {
+ m_caloCellIsolationTool.disable();
+ }
+ } else {
+ m_caloCellIsolationTool.disable();
+ }
+ if(m_doTopoIsolation){
+ if (!m_topoIsolationTool.empty() && runIsoType.find("topoetcone") != runIsoType.end()) {
+ ATH_MSG_DEBUG("Retrieve TopoIsolationTool is empty");
+ if(m_topoIsolationTool.retrieve().isFailure()){
+ ATH_MSG_ERROR("Unable to retrieve " << m_topoIsolationTool);
+ return HLT::BAD_JOB_SETUP;
+ }
+ else {
+ ATH_MSG_DEBUG("Retrieved Tool "<<m_topoIsolationTool);
+ if (timerSvc()) m_timerIsoTool3 = addTimer("topoIsolationTool");
+ }
+ } else {
+ m_topoIsolationTool.disable();
+ }
+ } else {
+ m_topoIsolationTool.disable();
+ }
+ // <--
//print summary info
ATH_MSG_INFO("REGTEST: xAOD Reconstruction for Run2" );
ATH_MSG_INFO("REGTEST: Initialization completed successfully, tools initialized: " );
@@ -546,6 +548,7 @@ HLT::ErrorCode TrigEgammaRec::hltInitialize() {
ATH_MSG_DEBUG("REGTEST: Do Track Isolation: " << m_doTrackIsolation);
ATH_MSG_DEBUG("REGTEST: Do CaloCell Isolation: "<< m_doCaloCellIsolation);
ATH_MSG_DEBUG("REGTEST: Do TopoIsolation: " << m_doTopoIsolation);
+ ATH_MSG_DEBUG("REGTEST: run bremBuilding: " << m_doBremCollection);
ATH_MSG_DEBUG("REGTEST: Use BremAssoc: " << m_useBremAssoc);
ATH_MSG_INFO("REGTEST: ElectronContainerName: " << m_electronContainerName );
@@ -635,28 +638,30 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
}
- // bool topoClusTrue = false;
- // std::vector<const xAOD::CaloClusterContainer*> vectorClusterContainerTopo;
- // if(m_doTopoIsolation){
- // stat = getFeatures(inputTE, vectorClusterContainerTopo,m_topoClusterContName);
+ bool topoClusTrue = false;
+ std::vector<const xAOD::CaloClusterContainer*> vectorClusterContainerTopo;
+ if(m_doTopoIsolation){
+ stat = getFeatures(inputTE, vectorClusterContainerTopo,m_topoClusterContName);
- // if ( stat!= HLT::OK ) {
- // ATH_MSG_ERROR(" REGTEST: No CaloTopoClusterContainers retrieved for the trigger element");
- // //return HLT::OK; // If you did not get it, it is not a problem, continue!
- // }
+ // -> From here is broken?
+ if ( stat!= HLT::OK ) {
+ ATH_MSG_ERROR(" REGTEST: No CaloTopoClusterContainers retrieved for the trigger element");
+ //return HLT::OK; // If you did not get it, it is not a problem, continue!
+ }
- // //debug message
- // if ( msgLvl() <= MSG::VERBOSE){
- // msg() << MSG::VERBOSE << " REGTEST: Got " << vectorClusterContainerTopo.size()
- // << " CaloCTopoclusterContainers associated to the TE " << endmsg;
- // }
- // // Get the last ClusterContainer
- // if ( !vectorClusterContainerTopo.empty() ) {
- // const xAOD::CaloClusterContainer* clusContainerTopo = vectorClusterContainerTopo.back();
- // if (clusContainerTopo->size() > 0) topoClusTrue = true;
- // ATH_MSG_DEBUG("REGTEST: Number of topo containers : " << clusContainerTopo->size());
- // } // vector of Cluster Container empty?!
- // }
+ //debug message
+ if ( msgLvl() <= MSG::VERBOSE){
+ msg() << MSG::VERBOSE << " REGTEST: Got " << vectorClusterContainerTopo.size()
+ << " CaloCTopoclusterContainers associated to the TE " << endmsg;
+ }
+ // Get the last ClusterContainer
+ if ( !vectorClusterContainerTopo.empty() ) {
+ const xAOD::CaloClusterContainer* clusContainerTopo = vectorClusterContainerTopo.back();
+ if (clusContainerTopo->size() > 0) topoClusTrue = true;
+ ATH_MSG_DEBUG("REGTEST: Number of topo containers : " << clusContainerTopo->size());
+ } // vector of Cluster Container empty?!
+ }
+ // <-- up to here
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG
@@ -672,6 +677,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
std::string electronContSGKey="";
std::string electronKey="";
HLT::ErrorCode sc = getUniqueKey( m_electron_container, electronContSGKey, electronKey);
+ ATH_MSG_DEBUG("The electron container SG key created is: " << electronContSGKey);
if (sc != HLT::OK) {
msg() << MSG::DEBUG << "Could not retrieve the electron container key" << endmsg;
return sc;
@@ -700,7 +706,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
// Shower Shape & CaloCellContainer
const CaloCellContainer* pCaloCellContainer = 0;
- //const xAOD::CaloClusterContainer* pTopoClusterContainer = 0;
+ const xAOD::CaloClusterContainer* pTopoClusterContainer = 0;
// Get vector of pointers to all CaloCellContainers from TE
std::string clusCollKey="";
@@ -748,7 +754,57 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
if ( msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << "Running m_showerBuilder: " << m_showerBuilder << endmsg;
} //pCaloCellContainer
}
- //if(topoClusTrue) pTopoClusterContainer = vectorClusterContainerTopo.back();
+ if(topoClusTrue) pTopoClusterContainer = vectorClusterContainerTopo.back();
+ }
+
+
+ //********************************************************************************
+ xAOD::TrackParticleContainer *GSFTrigTrackParticles = new xAOD::TrackParticleContainer();
+ if (m_doBremCollection){
+
+ ATH_MSG_DEBUG("In m_doBremCollection");
+ ATH_MSG_DEBUG(" REGTEST: Got " << vectorClusterContainer.size() << " CaloClusterContainers associated to the TE ");
+ if (vectorClusterContainer.size() != 1){
+ ATH_MSG_ERROR("REGTEST: Size of vectorClusterContainer is not 1, it is: "<< vectorClusterContainer.size());
+ return HLT::NAV_ERROR;
+ }
+
+ // Get the last ClusterContainer
+ const xAOD::CaloClusterContainer* clusContainer = vectorClusterContainer.back();
+ if(!clusContainer){
+ return HLT::OK;
+ }
+
+ ATH_MSG_DEBUG (clusContainer->size() << " calo clusters in container");
+
+
+ std::vector<const xAOD::TrackParticleContainer*> vectorTrackParticleContainer;
+ stat = getFeatures(inputTE, vectorTrackParticleContainer);
+
+ if (stat != HLT::OK) {
+ ATH_MSG_DEBUG(" REGTEST: no TrackParticleContainer from TE, m_doBremCollection ");
+ return HLT::NAV_ERROR;
+ }
+
+ const xAOD::TrackParticleContainer *tracks = vectorTrackParticleContainer.back();
+ if (!tracks || tracks->size()<1){
+ return HLT::OK;
+ }
+ for (const xAOD::TrackParticle *trk:*tracks) {
+ ATH_MSG_DEBUG("track pt is: " << trk->pt());
+ }
+
+
+
+ for (const xAOD::TrackParticle *trk:*GSFTrigTrackParticles) {
+ ATH_MSG_DEBUG("GSFTrigTrackParticles pt is: " << trk->pt());
+ }
+
+ if (HLT::OK != attachFeature( outputTE, GSFTrigTrackParticles, "GSFTrigTrackParticles") ){
+ ATH_MSG_ERROR("REGTEST: trigger xAOD::TrackParticleContainer for GSF attach to TE and record into StoreGate failed");
+ return HLT::NAV_ERROR;
+ }
+
}
//**********************************************************************
@@ -775,8 +831,11 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
<< " REGTEST: empty TrackParticleContainer from TE, m_trackMatchBuilder: " << m_trackMatchBuilder << endmsg;
} else {
- // Get the pointer to last TrackParticleContainer
- pTrackParticleContainer = vectorTrackParticleContainer.back();
+ // Get the pointer to last TrackParticleContainer
+ if(m_doBremCollection){
+ pTrackParticleContainer = GSFTrigTrackParticles;
+ }
+ else pTrackParticleContainer = vectorTrackParticleContainer.back();
m_doTrackMatching = true;
if(!pTrackParticleContainer){
m_doTrackMatching = false;
@@ -796,6 +855,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
float leadTrkpt=0.0;
const xAOD::TrackParticle *leadTrk=NULL;
for (const xAOD::TrackParticle *trk:*pTrackParticleContainer) {
+ ATH_MSG_DEBUG("In track matching, track pt: " << trk->pt());
if(trk->pt() > leadTrkpt) {
leadTrkpt = trk->pt();
leadTrk=trk;
@@ -894,7 +954,10 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
}
ElementLinkVector<xAOD::TrackParticleContainer> trackLinks;
- stat=getFeaturesLinks< xAOD::TrackParticleContainer, xAOD::TrackParticleContainer > (inputTE, trackLinks, "");
+ if(m_doBremCollection){
+ stat=getFeaturesLinks< xAOD::TrackParticleContainer, xAOD::TrackParticleContainer > (outputTE, trackLinks, "");
+ }
+ else stat=getFeaturesLinks< xAOD::TrackParticleContainer, xAOD::TrackParticleContainer > (inputTE, trackLinks, "");
if ( stat != HLT::OK ) {
ATH_MSG_ERROR("REGTEST: No TrackParticleLinks retrieved for the trigger element");
//May need to add ERROR codes for online debugging
@@ -1082,53 +1145,61 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
// Isolation
//
// Calo Isolation types
-
- // THIS IS NOW BROKEN. IS IT WORTH FIXING, OR WILL THIS BECOME OBSOLETE IN 22.0?
-
- // if(m_doCaloCellIsolation || m_doTopoIsolation){
- // if (timerSvc()) m_timerIsoTool2->start(); //timer
- // std::map<std::string,CaloIsoHelp>::iterator itc = m_egCaloIso.begin(), itcE = m_egCaloIso.end();
- // for (; itc != itcE; itc++) {
- // CaloIsoHelp isoH = itc->second;
- // std::string flav = itc->first;
- // bool bsc = false;
- // if (flav == "etcone" && pCaloCellContainer)
- // bsc = m_caloCellIsolationTool->decorateParticle_caloCellIso(*eg, isoH.help.isoTypes, isoH.CorrList, pCaloCellContainer);
- // /*else if (flav == "topoetcone" )
- // // Add check for topoclusters (when available);
- // //bsc = m_topoIsolationTool->decorateParticle_topoClusterIso(*eg, isoH.help.isoTypes, isoH.CorrList, pTopoClusterContainer);*/
- // if (!bsc && flav=="etcone")
- // ATH_MSG_WARNING("Call to CaloIsolationTool failed for flavour " << flav);
- // }
- // ATH_MSG_DEBUG(" REGTEST: etcone20 = " << getIsolation_etcone20(eg));
- // ATH_MSG_DEBUG(" REGTEST: etcone30 = " << getIsolation_etcone30(eg));
- // ATH_MSG_DEBUG(" REGTEST: etcone40 = " << getIsolation_etcone40(eg));
- // if (timerSvc()) m_timerIsoTool2->stop(); //timer
- // }
- // if(m_doTrackIsolation){
- // ATH_MSG_DEBUG("Running TrackIsolationTool for Electrons");
-
- // if (timerSvc()) m_timerIsoTool1->start(); //timer
- // if(m_egTrackIso.size() != 0) {
- // // Track Isolation types
- // std::map<std::string,TrackIsoHelp>::iterator itt = m_egTrackIso.begin(), ittE = m_egTrackIso.end();
- // for (; itt != ittE; itt++) {
- // TrackIsoHelp isoH = itt->second;
- // std::string flav = itt->first;
- // const std::set<const xAOD::TrackParticle*> tracksToExclude = xAOD::EgammaHelpers::getTrackParticles(eg, m_useBremAssoc); // For GSF this may need to be property
- // // Need the decorate methods from IsolationTool
- // bool bsc = m_trackIsolationTool->decorateParticle(*eg, isoH.help.isoTypes, isoH.CorrList, &leadTrkVtx, &tracksToExclude,pTrackParticleContainer);
- // if (!bsc)
- // ATH_MSG_WARNING("Call to TrackIsolationTool failed for flavour " << flav);
- // }
- // ATH_MSG_DEBUG(" REGTEST: ptcone20 = " << getIsolation_ptcone20(eg));
- // ATH_MSG_DEBUG(" REGTEST: ptcone30 = " << getIsolation_ptcone30(eg));
- // ATH_MSG_DEBUG(" REGTEST: ptcone40 = " << getIsolation_ptcone40(eg));
-
- // }
- // if (timerSvc()) m_timerIsoTool1->stop(); //timer
- // }
+ if(m_doCaloCellIsolation || m_doTopoIsolation){
+ if (timerSvc()) m_timerIsoTool2->start(); //timer
+ std::map<std::string,CaloIsoHelp>::iterator itc = m_egCaloIso.begin(), itcE = m_egCaloIso.end();
+ for (; itc != itcE; itc++) {
+ CaloIsoHelp isoH = itc->second;
+ std::string flav = itc->first;
+ bool bsc = false;
+ bool tbsc = false;
+ xAOD::CaloIsolation CaloIsoResult;
+ xAOD::CaloIsolation TopoIsoResult;
+ if (flav == "etcone" && pCaloCellContainer) {
+ bsc = m_caloCellIsolationTool->caloCellIsolation(CaloIsoResult, *eg, isoH.help.isoTypes, isoH.CorrList, pCaloCellContainer);
+ } else if (flav == "topoetcone" && topoClusTrue) {
+ // Add check for topoclusters (when available);
+ tbsc = m_topoIsolationTool->caloTopoClusterIsolation(TopoIsoResult, *eg, isoH.help.isoTypes, isoH.CorrList, pTopoClusterContainer);
+ }
+ if (!bsc && m_doCaloCellIsolation && flav=="etcone") {
+ ATH_MSG_WARNING("Call to CaloIsolationTool failed for flavour " << flav);
+ }
+ if (!tbsc && m_doTopoIsolation && flav =="topoetcone") {
+ ATH_MSG_WARNING("Call to CaloTopoIsolationTool failed for flavour " << flav);
+ }
+
+ ATH_MSG_DEBUG(" REGTEST: etcone " << flav << " = " << CaloIsoResult.etcones[std::distance(m_egCaloIso.begin(), itc)]);
+ ATH_MSG_DEBUG(" REGTEST: topoetcone40 " << flav << " = " << TopoIsoResult.etcones[std::distance(m_egCaloIso.begin(), itc)]);
+
+ }
+ if (timerSvc()) m_timerIsoTool2->stop(); //timer
+ }
+ if(m_doTrackIsolation){
+ ATH_MSG_DEBUG("Running TrackIsolationTool for Electrons");
+
+ if (timerSvc()) m_timerIsoTool1->start(); //timer
+ if(m_egTrackIso.size() != 0) {
+ // Track Isolation types
+ std::map<std::string,TrackIsoHelp>::iterator itt = m_egTrackIso.begin(), ittE = m_egTrackIso.end();
+ xAOD::TrackIsolation isoresult;
+ for (; itt != ittE; itt++) {
+ TrackIsoHelp isoH = itt->second;
+ std::string flav = itt->first;
+ const std::set<const xAOD::TrackParticle*> tracksToExclude = xAOD::EgammaHelpers::getTrackParticles(eg, m_useBremAssoc); // For GSF this may need to be property
+ // Need the decorate methods from IsolationTool
+ bool bsc = m_trackIsolationTool->trackIsolation(isoresult, *eg, isoH.help.isoTypes, isoH.CorrList, &leadTrkVtx, &tracksToExclude,pTrackParticleContainer);
+ if (!bsc)
+ ATH_MSG_WARNING("Call to TrackIsolationTool failed for flavour " << flav);
+ }
+ ATH_MSG_DEBUG(" REGTEST: ptcone20 = " << isoresult.ptcones[0]);
+ ATH_MSG_DEBUG(" REGTEST: ptcone30 = " << isoresult.ptcones[1]);
+ ATH_MSG_DEBUG(" REGTEST: ptcone40 = " << isoresult.ptcones[2]);
+
+ if (timerSvc()) m_timerIsoTool1->stop(); //timer
+ }
+ }
+ //
// PID
ATH_MSG_DEBUG("about to run execute(eg) for PID");
if (timerSvc()) m_timerPIDTool1->start(); //timer
@@ -1169,35 +1240,35 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE,
// Isolation
- // BROKEN. WORTH FIXING, OR IS THIS FILE MOVING?
- // if(m_doCaloCellIsolation || m_doTopoIsolation){
- // if (timerSvc()) m_timerIsoTool2->start(); //timer
- // std::map<std::string,CaloIsoHelp>::iterator itc = m_egCaloIso.begin(), itcE = m_egCaloIso.end();
- // for (; itc != itcE; itc++) {
- // CaloIsoHelp isoH = itc->second;
- // std::string flav = itc->first;
- // bool bsc = false;
- // bool tbsc = false;
- // if (flav == "etcone" && pCaloCellContainer)
- // bsc = m_caloCellIsolationTool->decorateParticle_caloCellIso(*eg, isoH.help.isoTypes, isoH.CorrList, pCaloCellContainer);
- // else if (flav == "topoetcone" && topoClusTrue)
- // // Add check for topoclusters (when available);
- // tbsc = m_topoIsolationTool->decorateParticle_topoClusterIso(*eg, isoH.help.isoTypes, isoH.CorrList, pTopoClusterContainer);
- // if (!bsc && m_doCaloCellIsolation && flav=="etcone")
- // ATH_MSG_WARNING("Call to CaloIsolationTool failed for flavour " << flav);
- // if (!tbsc && m_doTopoIsolation && flav =="topoetcone")
- // ATH_MSG_WARNING("Call to CaloTopoIsolationTool failed for flavour " << flav);
- // }
- // ATH_MSG_DEBUG(" REGTEST: etcone20 = " << getIsolation_etcone20(eg));
- // ATH_MSG_DEBUG(" REGTEST: etcone30 = " << getIsolation_etcone30(eg));
- // ATH_MSG_DEBUG(" REGTEST: etcone40 = " << getIsolation_etcone40(eg));
- // ATH_MSG_DEBUG(" REGTEST: topoetcone20 = " << getIsolation_topoetcone20(eg));
- // ATH_MSG_DEBUG(" REGTEST: topoetcone30 = " << getIsolation_topoetcone30(eg));
- // ATH_MSG_DEBUG(" REGTEST: topoetcone40 = " << getIsolation_topoetcone40(eg));
-
- // if (timerSvc()) m_timerIsoTool2->stop(); //timer
- // }
-
+ if(m_doCaloCellIsolation || m_doTopoIsolation){
+ if (timerSvc()) m_timerIsoTool2->start(); //timer
+ std::map<std::string,CaloIsoHelp>::iterator itc = m_egCaloIso.begin(), itcE = m_egCaloIso.end();
+ for (; itc != itcE; itc++) {
+ CaloIsoHelp isoH = itc->second;
+ std::string flav = itc->first;
+ bool bsc = false;
+ bool tbsc = false;
+ xAOD::CaloIsolation CaloIsoResult;
+ xAOD::CaloIsolation TopoIsoResult;
+ if (flav == "etcone" && pCaloCellContainer){
+ bsc = m_caloCellIsolationTool->caloCellIsolation(CaloIsoResult, *eg, isoH.help.isoTypes, isoH.CorrList, pCaloCellContainer);
+ } else if (flav == "topoetcone" && topoClusTrue) {
+ // Add check for topoclusters (when available);
+ tbsc = m_topoIsolationTool->caloTopoClusterIsolation(TopoIsoResult, *eg, isoH.help.isoTypes, isoH.CorrList, pTopoClusterContainer);
+ }
+ if (!bsc && m_doCaloCellIsolation && flav=="etcone") {
+ ATH_MSG_WARNING("Call to CaloIsolationTool failed for flavour " << flav);
+ }
+ if (!tbsc && m_doTopoIsolation && flav =="topoetcone") {
+ ATH_MSG_WARNING("Call to CaloTopoIsolationTool failed for flavour " << flav);
+ }
+ ATH_MSG_DEBUG(" REGTEST: etcone " << flav << " = " << CaloIsoResult.etcones[std::distance(m_egCaloIso.begin(), itc)]);
+ ATH_MSG_DEBUG(" REGTEST: topoetcone40 " << flav << " = " << TopoIsoResult.etcones[std::distance(m_egCaloIso.begin(), itc)]);
+ }
+
+ if (timerSvc()) m_timerIsoTool2->stop(); //timer
+ }
+
// Particle ID
if (timerSvc()) m_timerPIDTool3->start(); //timer
if( m_photonPIDBuilder->execute(ctx, eg)){
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt
index 8e60a3038f7a97d9fa84988805446e3948591add..ec07e72ecc6437029c8ec9b59e02660fcae8b858 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt
@@ -17,6 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
Reconstruction/Jet/JetEDM
Reconstruction/Jet/JetInterface
Reconstruction/Jet/JetRec
+ Reconstruction/Jet/JetRecTools
Trigger/TrigEvent/TrigCaloEvent
Trigger/TrigEvent/TrigNavStructure
Trigger/TrigEvent/TrigParticle
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NegativeEnergyRejectionTool.h b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NonPositiveEnergyRejectionTool.h
similarity index 72%
rename from Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NegativeEnergyRejectionTool.h
rename to Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NonPositiveEnergyRejectionTool.h
index e8a4f11838ed64d609fed0ddb7527cf3025a51b0..719ce2933ae7c9f31c2e7abf27ecb09307067325 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NegativeEnergyRejectionTool.h
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NonPositiveEnergyRejectionTool.h
@@ -9,21 +9,21 @@
// P Sherwood March 2018
-/// \class NegativeEnergyRejectionTool
+/// \class NonPositiveEnergyRejectionTool
///
/// Tool to select IParticles.
#include "TrigHLTJetRec/IIParticleRejectionTool.h"
#include "AsgTools/AsgTool.h"
-class NegativeEnergyRejectionTool :
+class NonPositiveEnergyRejectionTool :
public asg::AsgTool, virtual public IIParticleRejectionTool{
- ASG_TOOL_CLASS(NegativeEnergyRejectionTool, IIParticleRejectionTool)
+ ASG_TOOL_CLASS(NonPositiveEnergyRejectionTool, IIParticleRejectionTool)
public:
- NegativeEnergyRejectionTool(const std::string& name);
- virtual ~NegativeEnergyRejectionTool() override {}
+ NonPositiveEnergyRejectionTool(const std::string& name);
+ virtual ~NonPositiveEnergyRejectionTool() override {}
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
@@ -33,7 +33,6 @@ class NegativeEnergyRejectionTool :
virtual std::size_t rejected() const override;
private:
- bool m_skipNegativeEnergy{true};
std::size_t m_tested{0};
std::size_t m_rejected{0};
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h
index 31528c321137a192e4f2ff7d658c8112a41bdea1..473e371a60b81f82ef5019606c2b2723dcf82030 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h
@@ -8,6 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrigInterfaces/FexAlgo.h"
+#include "JetRecTools/JetConstituentModSequence.h"
class TrigHLTSoftKiller : public HLT::FexAlgo
{
@@ -22,9 +23,11 @@ class TrigHLTSoftKiller : public HLT::FexAlgo
HLT::ErrorCode hltFinalize();
private:
- // TODO Add SoftKiller ToolHandle and related here
- std::string m_outputCollectionLabel;
+ ToolHandle<IJetConstituentModifier> m_skWeightTool;
+ ToolHandle<IJetExecuteTool> m_skclustModSeqTool;
+ std::string m_outputCollectionLabel;
+ std::string m_clusterCalib;
};
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py b/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py
index bfdbbf2ba168cad28f98627419d871647c9236f6..46246ad5243050656bc997f9cd6659ec3f186c59 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py
@@ -12,7 +12,8 @@ from GaudiKernel.Constants import (VERBOSE,
import TrigHLTJetRecConf
from TrigHLTJetRec.TrigHLTJetRecConf import (IParticleNullRejectionTool,
- IParticlePtEtaRejectionTool,)
+ IParticlePtEtaRejectionTool,
+ NonPositiveEnergyRejectionTool)
# from JetRec.JetRecConf import JetRecTool
# from JetRec.JetRecConf import (JetFromPseudojetMT,)
@@ -1103,6 +1104,31 @@ def _getIParticleNullRejectionTool(toolname, **kwds):
return rejecter
+def _getNonPositiveEnergyRejectionTool(toolname, **kwds):
+
+ # set up a tool to select all pseudo jets
+ # declare jtm as global as this function body may modify it
+ # with the += operator
+ global jtm
+
+ # Build a new list of jet inputs. original: mygetters = [jtm.lcget]
+ try:
+ rejecter = getattr(jtm, toolname)
+ except AttributeError:
+ # Add the PseudoJetSelectorAll to the JetTool Manager,
+ # which pushes it to the ToolSvc in __iadd__
+ # This is done in the same as PseudoJetGetter is added in
+ # JetRecStandardTools.py.
+ # The 'Label' must be one of the values found in JetContainerInfo.h
+ rejecter = NonPositiveEnergyRejectionTool(
+ name=toolname, **kwds)
+ jtm += rejecter
+ rejecter = getattr(jtm, toolname)
+ print 'TrigHLTJetRecConfig._getNonPositiveEnergyRectionTool '\
+ 'Added rejecter "%s" to jtm' % toolname
+
+ return rejecter
+
def _getIParticlePtEtaRejectionTool(toolname, **kwds):
@@ -1164,8 +1190,8 @@ class TrigHLTJetRecFromCluster(TrigHLTJetRecConf.TrigHLTJetRecFromCluster):
# self.iIParticleSelector = _getIParticleSelectorAll(
# 'iIParticleSelectorAll')
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
secondary_label = ''
# FTK specific: do we want FTK? Set label to GhostTrack.
@@ -1245,8 +1271,8 @@ class TrigHLTJetRecGroomer(TrigHLTJetRecConf.TrigHLTJetRecGroomer):
# 3/18 IParticle selection moved to TriggerJetBuildTool
# self.iIParticleSelector = _getIParticleSelectorAll(
# 'iParticleSelectorAll')
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
# Groomer builds jets from clusters and then grooms them
@@ -1263,7 +1289,7 @@ class TrigHLTJetRecGroomer(TrigHLTJetRecConf.TrigHLTJetRecGroomer):
do_minimalist_setup=do_minimalist_setup,
iParticleRejectionTool=iIParticleRejecter,
name=name+'notrim',
- do_substructure=do_substructure,
+ do_substructure=False, #do_substructure,
OutputLevel=OutputLevel,
)
@@ -1310,15 +1336,14 @@ class TrigHLTJetRecFromJet(TrigHLTJetRecConf.TrigHLTJetRecFromJet):
TrigHLTJetRecConf.TrigHLTJetRecFromJet.__init__(self, name=name)
self.OutputLevel = OutputLevel
- self.OutputLevel = OutputLevel
self.cluster_calib = cluster_calib
# self.pseudoJetGetter = _getTriggerPseudoJetGetter(cluster_calib)
name = 'iIParticleEtaPtRejecter_%d_%d' % (int(10 * etaMaxCut),
int(ptMinCut))
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
concrete_type = 'Jet'
@@ -1375,8 +1400,8 @@ class TrigHLTJetRecFromTriggerTower(
# int(ptMinCut)),
# **{'etaMax': etaMaxCut, 'ptMin': ptMinCut})
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
@@ -1534,6 +1559,8 @@ class TrigHLTEnergyDensity(TrigHLTJetRecConf.TrigHLTEnergyDensity):
self.energyDensity = 0
+from JetRecTools.JetRecToolsConf import (JetConstituentModSequence, SoftKillerWeightTool, ClusterAtEMScaleTool, VoronoiWeightTool)
+
class TrigHLTSoftKiller(TrigHLTJetRecConf.TrigHLTSoftKiller):
"""Supply a specific grid configuration for SoftKiller"""
@@ -1549,12 +1576,43 @@ class TrigHLTSoftKiller(TrigHLTJetRecConf.TrigHLTSoftKiller):
TrigHLTJetRecConf.TrigHLTSoftKiller.__init__(self,name=name)
self.OutputLevel = OutputLevel
- self.output_collection_label = output_collection_label
+ self.output_collection_label = output_collection_label+ '_' + name + '_'+cluster_calib
- # TODO create and configure offline SoftKiller tool here, pass it to our tool
# Use cluster_calib, sk_grid_param_eta, and sk_grid_param_phi to configure the offline tool
print "SK: %s, %f, %f"%(cluster_calib,sk_grid_param_eta,sk_grid_param_phi)
+ # Temp hardcode enum value as this is code that will be dropped
+ xaodtype_calocluster = 1
+
+ modifiers = []
+ # We only want an EM tool if we are working with EM clusters
+ # The tool should be used before calling SoftKiller (prepend to list)
+ if cluster_calib == "EM":
+ emTool = ClusterAtEMScaleTool('emTool_'+name+'_'+cluster_calib, InputType=xaodtype_calocluster)
+ jtm.add(emTool)
+ self.emTool = emTool
+ modifiers.append(self.emTool)
+
+ global jtm
+ skTool = SoftKillerWeightTool( name+cluster_calib, SKGridSize=0.6, isCaloSplit=False, SKRapMin=0, SKRapMax=2.5, InputType=xaodtype_calocluster)
+ jtm.add(skTool)
+ self.skWeightTool = skTool
+
+ voronoiTool = VoronoiWeightTool('voronoiTool'+name+'_'+cluster_calib, doSpread = False, nSigma = 0, InputType=xaodtype_calocluster)
+ jtm.add(voronoiTool)
+ self.voronoiTool = voronoiTool
+ modifiers += [self.voronoiTool, self.skWeightTool]
+
+ skclustModSeq = JetConstituentModSequence('ClustModifSequence_'+name+'_'+cluster_calib,
+ InputContainer = "CaloCalTopoClusters",
+ OutputContainer = self.output_collection_label,
+ InputType=xaodtype_calocluster,
+ Trigger = True,
+ Modifiers = modifiers
+ )
+ jtm.add(skclustModSeq)
+ self.skclustModSeqTool = skclustModSeq
+
print "SK clusters from clusters"
# Track Moment helper class
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx
deleted file mode 100644
index 40d1c344acb0ffa8b382ecca2ea13669c962a075..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "TrigHLTJetRec/NegativeEnergyRejectionTool.h"
-
-
-NegativeEnergyRejectionTool::NegativeEnergyRejectionTool(const std::string& name):
- AsgTool(name) {
-}
-
-StatusCode NegativeEnergyRejectionTool::initialize() {
- ATH_MSG_INFO("Initializing " << name() << ".");
- return StatusCode::SUCCESS;
-}
-
-
-bool NegativeEnergyRejectionTool::operator()(const xAOD::IParticle* ip) {
- ATH_MSG_DEBUG("Entering operator()()...");
-
- ++m_tested;
-
- bool null = (ip == 0);
- bool negativeE = m_skipNegativeEnergy && ip->e() <= 0.0;
- if (null || negativeE){
- ++m_rejected;
- return true;
- }
- return false;
-}
-
-
-StatusCode NegativeEnergyRejectionTool::finalize() {
- ATH_MSG_INFO("Finalizing " << name() << ".");
- return StatusCode::SUCCESS;
-}
-
-
-std::size_t NegativeEnergyRejectionTool::tested() const {return m_tested;}
-std::size_t NegativeEnergyRejectionTool::rejected() const {return m_rejected;}
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NonPositiveEnergyRejectionTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NonPositiveEnergyRejectionTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..c48cda14d0ca1092185327cf595737923374842e
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NonPositiveEnergyRejectionTool.cxx
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigHLTJetRec/NonPositiveEnergyRejectionTool.h"
+
+
+NonPositiveEnergyRejectionTool::NonPositiveEnergyRejectionTool(const std::string& name):
+ AsgTool(name) {
+}
+
+StatusCode NonPositiveEnergyRejectionTool::initialize() {
+ ATH_MSG_INFO("Initializing " << name() << ".");
+ return StatusCode::SUCCESS;
+}
+
+
+bool NonPositiveEnergyRejectionTool::operator()(const xAOD::IParticle* ip) {
+ ATH_MSG_DEBUG("Entering operator()()...");
+
+ ++m_tested;
+
+ bool null = (ip == 0);
+ bool positiveE = ip->e() > FLT_MIN;
+ if (null || !positiveE){
+ ++m_rejected;
+ return true;
+ }
+ return false;
+}
+
+
+StatusCode NonPositiveEnergyRejectionTool::finalize() {
+ ATH_MSG_INFO("Finalizing " << name() << ".");
+ return StatusCode::SUCCESS;
+}
+
+
+std::size_t NonPositiveEnergyRejectionTool::tested() const {return m_tested;}
+std::size_t NonPositiveEnergyRejectionTool::rejected() const {return m_rejected;}
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx
index 99c57591b6baeb6b47b96bf5acb553cc4757fc1e..6b8018cbe53fd52256e851de9995232ea283ec6e 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx
@@ -90,7 +90,7 @@ TrigHLTJetRecGroomer::build(fastjet::ClusterSequence*& cs,
ATH_MSG_DEBUG("Ungroomed/groomed jet number " << iJet << " has constituents of " << ungroomedJets->at(iJet)->numConstituents() << "/" << trimmedJets->at(iJet)->numConstituents() << ", pT ratio is " << orig_pt << "/" << trim_pt << " = " << ratio << " , constscale ratio is " << orig_const_pt << "/" << trim_const_pt << " = " << ratio_const << " , emscale ratio is " << orig_em_pt << "/" << trim_em_pt << " = " << ratio_em);
}
- */
+ */
// Get rid of the intermediate (ungroomed) jets
auto ungroomedStore = ungroomedJets->getStore();
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx
index 76bfb4d56c46ef2107ca4b3253150c8333597e97..afa60b0044d74a9efdbbe7cc25be9a54f77f3071 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx
@@ -8,11 +8,13 @@
#include "TrigHLTJetRec/TrigHLTSoftKiller.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
+#include "xAODBase/IParticleContainer.h"
TrigHLTSoftKiller::TrigHLTSoftKiller(const std::string& name, ISvcLocator* pSvcLocator)
: HLT::FexAlgo(name, pSvcLocator)
{
declareProperty( "output_collection_label", m_outputCollectionLabel);
+ declareProperty("skclustModSeqTool",m_skclustModSeqTool);
}
TrigHLTSoftKiller::~TrigHLTSoftKiller()
@@ -23,7 +25,15 @@ HLT::ErrorCode TrigHLTSoftKiller::hltInitialize()
ATH_MSG_INFO("Initializing " << name() << "...");
- // TODO Retrieve any needed ToolHandles here, like the SoftKiller tool
+ StatusCode sc = m_skclustModSeqTool.retrieve();
+
+ if (sc.isSuccess())
+ ATH_MSG_INFO("Retrieved skclustModSeqTool: " << m_skclustModSeqTool->name());
+ else
+ {
+ ATH_MSG_ERROR("Failed to retrieve the skclustModSeqTool: " << m_skclustModSeqTool->name());
+ return HLT::ERROR;
+ }
ATH_MSG_INFO("Initialization successful");
@@ -47,12 +57,12 @@ HLT::ErrorCode TrigHLTSoftKiller::hltExecute(const HLT::TriggerElement* inputTE,
ATH_MSG_DEBUG("inputTE->getId(): " << inputTE->getId());
// Get the input container
- const xAOD::CaloClusterContainer* clusters = nullptr;
- HLT::ErrorCode status = getFeature(inputTE,clusters);
+ const xAOD::CaloClusterContainer* inputclusters = nullptr;
+ HLT::ErrorCode status = getFeature(inputTE,inputclusters);
if (status == HLT::OK)
{
- if (clusters != nullptr)
- ATH_MSG_DEBUG("Retrieved input cluster container of size " << clusters->size());
+ if (inputclusters != nullptr)
+ ATH_MSG_DEBUG("Retrieved input cluster container of size " << inputclusters->size());
else
{
ATH_MSG_ERROR("Retrieved NULL input cluster container");
@@ -65,19 +75,47 @@ HLT::ErrorCode TrigHLTSoftKiller::hltExecute(const HLT::TriggerElement* inputTE,
return HLT::ERROR;
}
+ JetConstituentModSequence *skclustModSeqTool = const_cast<JetConstituentModSequence*>(dynamic_cast<const JetConstituentModSequence*>(&*m_skclustModSeqTool));
+ const xAOD::IParticleContainer* IP_inputclusters = dynamic_cast<const xAOD::IParticleContainer*> (inputclusters);
+ skclustModSeqTool->setInputClusterCollection(IP_inputclusters);
+ //skclustModSeqTool->setInputClusterCollection(inputclusters);
+ int process_status = skclustModSeqTool->execute();
+ const xAOD::CaloClusterContainer* outputclusters = dynamic_cast<const xAOD::CaloClusterContainer*>(skclustModSeqTool->getOutputClusterCollection());
+
+ if (process_status == 0)
+ {
+ if (outputclusters != nullptr)
+ ATH_MSG_DEBUG("Processed cluster container of size " << outputclusters->size());
+ else
+ {
+ ATH_MSG_ERROR("SoftKillerWeightTool returned NULL input cluster container");
+ return HLT::ERROR;
+ }
+ }
+ else
+ {
+ ATH_MSG_ERROR("Failed to retrieve processed cluster container");
+ return HLT::ERROR;
+ }
+
+ ////////// FOR DEBUGGING PURPOSES
+ //SG::AuxElement::ConstAccessor<float> weightAcc("PUWeight"); // Handle for PU weighting here
+ //for (size_t icl = 0; icl < outputclusters->size(); ++icl)
+ // if (weightAcc(*(outputclusters->at(icl))) < 1.e-6)
+ // ATH_MSG_INFO("Cluster SK weight: " << weightAcc(*(outputclusters->at(icl))) << ", pT = " << outputclusters->at(icl)->pt());
-
- // Apply SoftKiller and store the output in clustersSK
- const xAOD::CaloClusterContainer* clustersSK = clusters; // TODO change this to the SK cluster output
- // TODO add SK here
-
+ ATH_MSG_DEBUG("writing results");
// Write the resulting container
+ auto auxStore = outputclusters->getStore();
std::string key = "";
- status = recordAndAttachFeature(outputTE,clustersSK,key,m_outputCollectionLabel);
+ status = recordAndAttachFeature(outputTE,outputclusters,key,m_outputCollectionLabel);
if (status == HLT::OK)
+ {
ATH_MSG_DEBUG("Attached SK cluster container to output TE");
+ delete auxStore;
+ }
else
ATH_MSG_ERROR("Failed to attach SK cluster container to output TE, status " << status);
return status;
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
index 547893ebbfa1952701514f0796bb6d8749ace510..b07dae3b28f8f95757f120b4df5a0c7aa7e8330b 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
@@ -23,18 +23,17 @@
#include "TrigHLTJetRec/TriggerJetBuildTool.h"
#include "TrigHLTJetRec/TriggerJetGroomerTool.h"
-
#include "TrigHLTJetRec/IParticleNullRejectionTool.h"
#include "TrigHLTJetRec/IParticlePtEtaRejectionTool.h"
#include "TrigHLTJetRec/EMTopoRejectionTool.h"
#include "TrigHLTJetRec/PFlowRejectionTool.h"
-#include "TrigHLTJetRec/NegativeEnergyRejectionTool.h"
+#include "TrigHLTJetRec/NonPositiveEnergyRejectionTool.h"
DECLARE_COMPONENT(IParticleNullRejectionTool)
DECLARE_COMPONENT(IParticlePtEtaRejectionTool)
DECLARE_COMPONENT(EMTopoRejectionTool)
DECLARE_COMPONENT(PFlowRejectionTool)
-DECLARE_COMPONENT(NegativeEnergyRejectionTool)
+DECLARE_COMPONENT(NonPositiveEnergyRejectionTool)
DECLARE_COMPONENT( TrigHLTJetRecFromCluster )
DECLARE_COMPONENT( TrigHLTJetRecFromJet )
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx
index 42ea4e63556ab3fadf64fb2b6bc80b8ef8f4326f..9b288cf02da0b22b5372f19fbe02e2d015213201 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx
@@ -92,7 +92,7 @@ StatusCode PEBInfoWriterAlg::execute(const EventContext& eventContext) const {
// Link to new decision
newd->setObjectLink("roi", roiEL);
newd->setObjectLink("view", viewEL);
- linkToPrevious(newd, decisionInput().key(), counter);
+ linkToPrevious(newd, previousDecision);
ATH_MSG_DEBUG("REGTEST: View = " << (*viewEL));
ATH_MSG_DEBUG("REGTEST: RoI = eta/phi = " << (*roiEL)->eta() << "/" << (*roiEL)->phi());
diff --git a/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
index 083e0420bd214b9e37a42c77435cb047f5e675d4..c3c71b0df561f13849977389cc0519c09f136074 100644
--- a/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
@@ -6,7 +6,7 @@
atlas_subdir( TrigConfData )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( )
+atlas_depends_on_subdirs( CxxUtils )
# External dependencies:
find_package( Boost REQUIRED )
@@ -16,3 +16,8 @@ atlas_add_library ( TrigConfData TrigConfData/*.h src/*.cxx
PUBLIC_HEADERS TrigConfData
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} )
+
+atlas_add_test( ConstIter SOURCES test/itertest.cxx
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfData
+ POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..b6f30c083c08bb1f1a2c77907f453831c0e82e27
--- /dev/null
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigConfiguration/TrigConfData
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/ConstIter.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/ConstIter.h
index a0938698d930476255f18f3eb8ce3ff1ba0e3fbc..9d5cbbee6f3086000b9eea13138ce01abfaa5bd8 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/ConstIter.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/ConstIter.h
@@ -12,6 +12,8 @@
* @brief Forward iterator to traverse the main components of the trigger configuration
*/
+#include "CxxUtils/checker_macros.h"
+
#include <functional>
namespace TrigConf {
@@ -55,6 +57,7 @@ namespace TrigConf {
m_buf(buf),
m_offset(offset),
m_data(),
+ m_valid(false),
m_f(f),
m_bufIt(buf.begin())
{}
@@ -77,21 +80,26 @@ namespace TrigConf {
ConstIter & operator++() {
++m_offset;
++m_bufIt;
+ m_valid = false;
return *this;
}
/** Dereference operator
* Creates object of type @c T from the current object in the container on the fly using the creation function @c m_f
*/
- const T & operator*() const {
- m_data = m_f(*m_bufIt);
+ const T & operator*() const {
+ if( ! m_valid ) {
+ m_data = m_f(*m_bufIt);
+ m_valid = true;
+ }
return m_data;
}
private:
const V & m_buf; //!< Const reference to the underlying data container
std::size_t m_offset; //!< Current position of the iterator
- mutable T m_data; //!< Holder of the transformed data
+ mutable T m_data ATLAS_THREAD_SAFE; //!< Holder of the transformed data
+ mutable bool m_valid ATLAS_THREAD_SAFE; //!< indicates if data got transformed for current position
std::function<T(const typename V::value_type &)> m_f; //!< Function to turn a single datum from the container into the output type
typename V::const_iterator m_bufIt; //!< Iterator over the container
diff --git a/Trigger/TrigConfiguration/TrigConfData/test/itertest.cxx b/Trigger/TrigConfiguration/TrigConfData/test/itertest.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..42124d91293ce6f43a45a8ea2e708cbdabd9cd46
--- /dev/null
+++ b/Trigger/TrigConfiguration/TrigConfData/test/itertest.cxx
@@ -0,0 +1,128 @@
+#include "TrigConfData/ConstIter.h"
+
+#include <vector>
+#include <iostream>
+
+using namespace std;
+
+class TestCollection {
+public:
+
+ TestCollection(const vector<vector<int>> & vi) :
+ m_data(vi)
+ {}
+ ~TestCollection() {}
+
+ using const_iterator = TrigConf::ConstIter< vector<vector<int>>, vector<int> >;
+
+ const_iterator begin() const {
+ return {m_data, 0};
+ }
+ const_iterator end() const {
+ return {m_data, m_data.size()};
+ }
+
+ private:
+ vector<vector<int>> m_data;
+
+ };
+
+
+bool inner_loop ( int, const std::vector<int> & v,
+ const std::vector<int> & refV
+ )
+{
+ bool allGood = true;
+ unsigned int refIdx(0);
+ for(int ii : v) {
+ bool match = (ii == refV[refIdx++]);
+ allGood &= match;
+ cout << " inner_loop " << ii << " -> " << (match ? "ok" : "mismatch ======> FAIL") << endl;
+ }
+ return allGood;
+}
+
+bool test1 ( const TrigConf::ConstIter< vector<vector<int>>, std::vector<int>>& it,
+ const std::vector<int> & refV )
+{
+ bool allGood = true;
+ cout << "In test1 with reference : ";
+ for( int i: refV ) cout << i << " ";
+ cout << endl;
+
+ unsigned int refIdx(0);
+ for ( int i : *it) {
+ bool match = i == refV[refIdx++];
+ cout << " outer loop " << i << " -> " << (match ? "ok" : "mismatch =========> FAIL") << endl;
+ allGood &= match;
+ allGood &= inner_loop (i, *it, refV);
+ }
+ return allGood;
+}
+
+bool test2 ( const TrigConf::ConstIter< vector<vector<int>>, std::vector<int>>& it,
+ const std::vector<int> & refV )
+{
+ bool allGood = true;
+ cout << "In test2 with reference : ";
+ for( int i: refV ) cout << i << " ";
+ cout << endl;
+
+ unsigned int size = refV.size();
+
+ unsigned int refIdx(0);
+ auto end = (*it).end(); // create end first, so at least begin is pointing to a valid iterator in the following loop
+ for ( vector<int>::const_iterator ii = (*it).begin(); ii != end; ++ii) {
+
+ int v = *ii;
+ if ( refIdx>=size ) {
+ cout << "Not stopping correctly, begin() and end() pointing to different collections. ===> FAIL" << endl;
+ allGood = false;
+ break;
+ }
+ bool match = (v == refV[refIdx++]);
+ cout << " loop " << v << " -> " << (match ? "ok" : "mismatch =========> FAIL") << endl;
+ allGood &= match;
+ }
+ return allGood;
+}
+
+
+int main() {
+
+ bool successTest1 ( true );
+ bool successTest2 ( true );
+ bool successTest3 ( true );
+ bool success ( true );
+
+ vector<vector<int>> v = { {1, 2, 3, 4},
+ {5, 6},
+ {7, 8, 9, 10, 11}};
+
+ // test 1
+ auto iter1 = TrigConf::ConstIter< vector<vector<int>>, vector<int> > { v, 0 };
+ successTest1 &= test1( iter1, { 1, 2, 3, 4});
+ successTest1 &= test1(++iter1, { 5, 6});
+ successTest1 &= test1(++iter1, { 7, 8, 9, 10, 11});
+
+ // test 2
+ auto iter2 = TrigConf::ConstIter< vector<vector<int>>, vector<int> > { v, 0 };
+ successTest2 = test2( iter2, v[0] );
+
+ // test 3
+ cout << "In test3" << endl;
+ const TestCollection c(v);
+ unsigned int idx(0);
+ for( auto x : c ) {
+ successTest3 &= inner_loop (0, x, v[idx++]);
+ }
+
+ cout << "Test iterator validity duration different loops ... " << ( successTest1 ? "passed" : "failed" ) << endl;
+ cout << "Test iterator validity duration same loop ... " << ( successTest2 ? "passed" : "failed" ) << endl;
+ cout << "Test iterator validity in range-based loop ... " << ( successTest3 ? "passed" : "failed" ) << endl;
+
+ success &= successTest1;
+ success &= successTest2;
+ success &= successTest3;
+ return success ? 0 : 1;
+}
diff --git a/Trigger/TrigDataAccess/TrigDataAccessMonitoring/TrigDataAccessMonitoring/MonROBDataProviderSvc.h b/Trigger/TrigDataAccess/TrigDataAccessMonitoring/TrigDataAccessMonitoring/MonROBDataProviderSvc.h
index 1a0794746da280fb9f4080e728ef95761f0c4f13..355f9299c8dd8999db3eb7d45d3ef443b8bc661e 100644
--- a/Trigger/TrigDataAccess/TrigDataAccessMonitoring/TrigDataAccessMonitoring/MonROBDataProviderSvc.h
+++ b/Trigger/TrigDataAccess/TrigDataAccessMonitoring/TrigDataAccessMonitoring/MonROBDataProviderSvc.h
@@ -57,7 +57,7 @@ public:
/// Add ROBFragments to cache for given ROB ids, ROB fragments may be retrieved with DataCollector
using ROBDataProviderSvc::addROBData;
virtual void addROBData(const std::vector<uint32_t>& robIds,
- const std::string callerName="UNKNOWN") override;
+ const std::string_view callerName="UNKNOWN") override;
/// Add a given LVL1/LVL2 ROBFragment to cache
using ROBDataProviderSvc::setNextEvent;
@@ -70,7 +70,7 @@ public:
using ROBDataProviderSvc::getROBData;
virtual void getROBData(const std::vector<uint32_t>& robIds,
std::vector<const ROBF*>& robFragments,
- const std::string callerName="UNKNOWN") override;
+ const std::string_view callerName="UNKNOWN") override;
/// Retrieve the whole event.
using ROBDataProviderSvc::getEvent;
diff --git a/Trigger/TrigDataAccess/TrigDataAccessMonitoring/src/MonROBDataProviderSvc.cxx b/Trigger/TrigDataAccess/TrigDataAccessMonitoring/src/MonROBDataProviderSvc.cxx
index a4edba585d3ad913c3e420566fe77bdb92cc7962..898bec780b57d0efb99198bc3fcfe2f87edae90f 100644
--- a/Trigger/TrigDataAccess/TrigDataAccessMonitoring/src/MonROBDataProviderSvc.cxx
+++ b/Trigger/TrigDataAccess/TrigDataAccessMonitoring/src/MonROBDataProviderSvc.cxx
@@ -174,7 +174,7 @@ StatusCode MonROBDataProviderSvc::queryInterface(const InterfaceID& riid, void**
}
/// addROBData (no effect in offline, all ROBS were already read in from full event)
-void MonROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, const std::string callerName)
+void MonROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, const std::string_view callerName)
{
// for offline running all requested ROBs should be found in cache
ROBDataProviderSvc::addROBData(robIds,callerName);
@@ -208,7 +208,7 @@ void MonROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, cons
if ( p_robMonCollection ) {
// caller name
std::string caller_name("UNKNOWN");
- if (callerName != "UNKNOWN") {
+ if (callerName != caller_name) {
caller_name = callerName;
} else {
IAlgorithm* alg(0);
@@ -363,7 +363,7 @@ void MonROBDataProviderSvc::setNextEvent(const RawEvent* re)
/** return ROBData for ROBID
*/
-void MonROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments, std::string callerName)
+void MonROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments, std::string_view callerName)
{
ROBDataProviderSvc::getROBData(robIds,robFragments, callerName);
return ;
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/TrigROBDataProviderSvc/ITrigROBDataProviderSvc.h b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/TrigROBDataProviderSvc/ITrigROBDataProviderSvc.h
index 4d4cd640ef4ad4c1bf07de9b34061f5d6d420bce..a961547179ef1d4917ca3780d3ac68b2f0684049 100755
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/TrigROBDataProviderSvc/ITrigROBDataProviderSvc.h
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/TrigROBDataProviderSvc/ITrigROBDataProviderSvc.h
@@ -10,6 +10,7 @@
#include <vector>
#include <map>
#include <string>
+#include <string_view>
// Declaration of the interface ID ( interface id, major version, minor version)
static const InterfaceID IID_ITrigROBDataProviderSvc("ITrigROBDataProviderSvc", 2 , 0);
@@ -52,14 +53,14 @@ public:
/// Collect all data for an event from the ROS and put them into the cache
/// Return value: number of ROBs which were retrieved to complete the event
/// Optinonally the name of the caller of this method can be specified for cost monitoring
- virtual int collectCompleteEventData(const std::string callerName="UNKNOWN") = 0;
+ virtual int collectCompleteEventData(const std::string_view callerName="UNKNOWN") = 0;
//-------------------------------------
// Methods useful for (cost) monitoring
//-------------------------------------
/// set the name of the program which uses the ROBDataProviderSvc
- virtual void setCallerName(const std::string) = 0;
+ virtual void setCallerName(const std::string_view) = 0;
/// get the name of the program which is presently registered in the ROBDataProviderSvc
virtual std::string getCallerName() = 0;
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx
index 5ccb3971b321a56bc26064c343dbb21a3ee88703..222554bcfb899b3b7dd8e9074ecc45be1d14aab8 100755
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx
@@ -427,7 +427,7 @@ StatusCode TrigROBDataProviderSvc::queryInterface(const InterfaceID& riid, void*
- in offline only check that given ROB ids are in the map, issue an
error if not
*/
-void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, const std::string callerName)
+void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, const std::string_view callerName)
{
//-------------------
// remove empty calls
@@ -844,7 +844,7 @@ void TrigROBDataProviderSvc::setNextEvent(const RawEvent* re)
/** return ROBData for ROBID
*/
-void TrigROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments, std::string callerName)
+void TrigROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments, std::string_view callerName)
{
//--------------------
@@ -1096,7 +1096,7 @@ std::string TrigROBDataProviderSvc::dumpROBcache() const {
/// Collect all data for an event from the ROS and put them into the cache
/// Return value: number of ROBs which were retrieved to complete event
-int TrigROBDataProviderSvc::collectCompleteEventData(const std::string callerName) {
+int TrigROBDataProviderSvc::collectCompleteEventData(const std::string_view callerName) {
// return if call was already issued
if (m_isEventComplete) return 0;
@@ -1216,17 +1216,17 @@ int TrigROBDataProviderSvc::collectCompleteEventData(const std::string callerNam
} // end int collectCompleteEventData(...)
int TrigROBDataProviderSvc::collectCompleteEventData(const EventContext&,
- const std::string callerName)
+ const std::string_view callerName)
{
return collectCompleteEventData (callerName);
}
/// set the name of the program which uses the ROBDataProviderSvc
-void TrigROBDataProviderSvc::setCallerName(std::string callerName)
+void TrigROBDataProviderSvc::setCallerName(std::string_view callerName)
{
// caller name of this method
std::string caller_name("UNKNOWN");
- if (callerName != "UNKNOWN") {
+ if (callerName != caller_name) {
caller_name = callerName;
}else{
IAlgorithm* alg(0);
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.h b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.h
index 675b042d79cb2158dd44cc4078b15d782661e21e..8eccb1f80408d4873b89976e762af540ce2676f5 100755
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.h
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.h
@@ -80,7 +80,7 @@ public:
/// Add ROBFragments to cache for given ROB ids, ROB fragments may be retrieved with DataCollector
using ROBDataProviderSvc::addROBData;
virtual void addROBData(const std::vector<uint32_t>& robIds,
- const std::string callerName="UNKNOWN") override;
+ const std::string_view callerName="UNKNOWN") override;
/// Add a given LVL1 ROBFragment to cache
using ROBDataProviderSvc::setNextEvent;
@@ -94,7 +94,7 @@ public:
using ROBDataProviderSvc::getROBData;
virtual void getROBData(const std::vector<uint32_t>& robIds,
std::vector<const ROBF*>& robFragments,
- const std::string callerName="UNKNOWN") override;
+ const std::string_view callerName="UNKNOWN") override;
/// Retrieve the whole event.
using ROBDataProviderSvc::getEvent;
@@ -123,11 +123,11 @@ public:
/// Collect all data for an event from the ROS and put them into the cache
/// Return value: number of ROBs which were retrieved to complete the event
- virtual int collectCompleteEventData(const std::string callerName="UNKNOWN") override;
- virtual int collectCompleteEventData(const EventContext&, const std::string callerName="UNKNOWN") override;
+ virtual int collectCompleteEventData(const std::string_view callerName="UNKNOWN") override;
+ virtual int collectCompleteEventData(const EventContext&, const std::string_view callerName="UNKNOWN") override;
/// set the name of the program which uses the ROBDataProviderSvc
- virtual void setCallerName(const std::string) override;
+ virtual void setCallerName(const std::string_view) override;
/// get the name of the program which is presently registered in the ROBDataProviderSvc
virtual std::string getCallerName() override { return m_callerName; };
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx
index 07523ce449b62696e97b8d7341bddde3c7ff6210..5762978e5f9daef931ed7530080cb2d878a0eba9 100644
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx
@@ -178,14 +178,14 @@ void TrigROBDataProviderSvc_RTT::FillEvent(){
}
}
-void TrigROBDataProviderSvc_RTT::setCallerName(std::string callerName)
+void TrigROBDataProviderSvc_RTT::setCallerName(std::string_view callerName)
{
return TrigROBDataProviderSvc::setCallerName(callerName);
}
-void TrigROBDataProviderSvc_RTT::addROBData(const std::vector<uint32_t>& robIds, std::string callerName)
+void TrigROBDataProviderSvc_RTT::addROBData(const std::vector<uint32_t>& robIds, std::string_view callerName)
{
//call the base class method
TrigROBDataProviderSvc:: addROBData(robIds, callerName);
@@ -234,7 +234,7 @@ void TrigROBDataProviderSvc_RTT::addROBData(const std::vector<uint32_t>& robIds,
void TrigROBDataProviderSvc_RTT::getROBData(const std::vector<uint32_t>& robIds, std::vector<const ROBF*>& robFragments,
- const std::string callerName)
+ const std::string_view callerName)
{
//call the base class method
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.h b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.h
index d197e49b15e35ed9cc9609642cad5e3ba885310c..912731206e739c4f358797cea4e93e88d40d04a0 100644
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.h
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.h
@@ -64,18 +64,18 @@ class TrigROBDataProviderSvc_RTT : public TrigROBDataProviderSvc,
void FillEvent();
/// set the name of the program which uses the ROBDataProviderSvc
- virtual void setCallerName(const std::string) override;
+ virtual void setCallerName(const std::string_view) override;
//declare ROBdata // inherited from base class
using ROBDataProviderSvc::addROBData;
virtual void addROBData(const std::vector<uint32_t>& robIds,
- const std::string callerName="UNKNOWN") override;
+ const std::string_view callerName="UNKNOWN") override;
/// Retrieve ROBFragments for given ROB ids from cache
using ROBDataProviderSvc::getROBData;
virtual void getROBData(const std::vector<uint32_t>& robIds,
std::vector<const ROBF*>& robFragments,
- const std::string callerName="UNKNOWN") override;
+ const std::string_view callerName="UNKNOWN") override;
/// Add a given LVL1 ROBFragment to cache
using ROBDataProviderSvc::setNextEvent;
@@ -96,9 +96,9 @@ class TrigROBDataProviderSvc_RTT : public TrigROBDataProviderSvc,
/// Collect all data for an event from the ROS and put them into the cache
/// Return value: number of ROBs which were retrieved to complete the event
/// Optinonally the name of the caller of this method can be specified for cost monitoring
- virtual int collectCompleteEventData(const std::string callerName="UNKNOWN") override
+ virtual int collectCompleteEventData(const std::string_view callerName="UNKNOWN") override
{ return TrigROBDataProviderSvc::collectCompleteEventData (callerName); }
- virtual int collectCompleteEventData(const EventContext& ctx, const std::string callerName="UNKNOWN") override
+ virtual int collectCompleteEventData(const EventContext& ctx, const std::string_view callerName="UNKNOWN") override
{ return TrigROBDataProviderSvc::collectCompleteEventData (ctx, callerName); }
virtual bool isMissingPrefetching() override { return 0;};// m_missingPrefetchingPerEvent; };
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
index b5d7bcf9eb119224617abc759c0c677095712bd5..bb07fa0e5b2299df1ac8044d0b1a7e3f34f6e70a 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
@@ -55,7 +55,7 @@ StatusCode TrigL2CaloHypoAlgMT::execute( const EventContext& context ) const {
// loop over previous decisions
size_t counter=0;
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
//get RoI
auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
@@ -82,7 +82,7 @@ StatusCode TrigL2CaloHypoAlgMT::execute( const EventContext& context ) const {
}
d->setObjectLink( "roi", roiELInfo.link );
- TrigCompositeUtils::linkToPrevious( d, decisionInput().key(), counter );
+ TrigCompositeUtils::linkToPrevious( d, previousDecision );
ATH_MSG_DEBUG( "Added view, roi, cluster, previous decision to new decision " << counter << " for view " << (*viewELInfo.link)->name() );
counter++;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx
index df1a85c30c1c68339e76f4b2dc28a9d605f828fb..981fb5a24e11e4f127aebe4da913acb67b3d6ca3 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx
@@ -74,7 +74,7 @@ StatusCode TrigMufastHypoAlg::execute( const EventContext& context ) const
std::vector<TrigMufastHypoTool::MuonClusterInfo> toolInput;
// loop over previous decisions
size_t counter=0;
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
//get RoI
auto roiInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
auto roiEL = roiInfo.link;
@@ -104,7 +104,7 @@ StatusCode TrigMufastHypoAlg::execute( const EventContext& context ) const
newd->setObjectLink( "feature", muonEL );
newd->setObjectLink( "roi", roiEL );
newd->setObjectLink( "view", viewEL );
- TrigCompositeUtils::linkToPrevious( newd, decisionInput().key(), counter );
+ TrigCompositeUtils::linkToPrevious( newd, previousDecision );
ATH_MSG_DEBUG("REGTEST: " << m_muFastKey.key() << " pT = " << (*muonEL)->pt() << " GeV");
ATH_MSG_DEBUG("REGTEST: " << m_muFastKey.key() << " eta/phi = " << (*muonEL)->eta() << "/" << (*muonEL)->phi());
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx
index 166b8cc483c8ab247a085e858032d80f0a35d3eb..f5bed116b9ab0bea0f912e6282747cdc8f6b2b4b 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx
@@ -68,7 +68,7 @@ StatusCode TrigMuisoHypoAlg::execute( const EventContext& context) const
std::vector<TrigMuisoHypoTool::MuisoInfo> toolInput;
size_t counter = 0; // view counter
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
// get View
auto viewEL = previousDecision->objectLink< ViewContainer >( "view" );
ATH_CHECK( viewEL.isValid() );
@@ -90,7 +90,7 @@ StatusCode TrigMuisoHypoAlg::execute( const EventContext& context) const
newd->setObjectLink( "feature", muonEL );
newd->setObjectLink( "view", viewEL );
- TrigCompositeUtils::linkToPrevious( newd, decisionInput().key(), counter );
+ TrigCompositeUtils::linkToPrevious( newd, previousDecision );
ATH_MSG_DEBUG("REGTEST: " << m_muIsoKey.key() << " pT = " << (*muonEL)->pt() << " GeV");
ATH_MSG_DEBUG("REGTEST: " << m_muIsoKey.key() << " eta/phi = " << (*muonEL)->eta() << "/" << (*muonEL)->phi());
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx
index 2de33a5573a324d8f670f4bdea892072ebab46ea..be33078a44f834b44c49da8b4f49d8f23c8a9dac 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx
@@ -75,7 +75,7 @@ StatusCode TrigMuonEFCombinerHypoAlg::execute( const EventContext& context ) con
size_t counter = 0; // view counter
// loop over previous decisions
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
// get RoIs
auto roiInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
auto roiEL = roiInfo.link;
@@ -110,7 +110,7 @@ StatusCode TrigMuonEFCombinerHypoAlg::execute( const EventContext& context ) con
newd -> setObjectLink( "feature", muonEL );
newd -> setObjectLink( "roi", roiEL );
newd -> setObjectLink( "view", viewEL );
- TrigCompositeUtils::linkToPrevious( newd, decisionInput().key(), counter );
+ TrigCompositeUtils::linkToPrevious( newd, previousDecision );
ATH_MSG_DEBUG("REGTEST: " << m_muonKey.key() << " pT = " << (*muonEL)->pt() << " GeV");
ATH_MSG_DEBUG("REGTEST: " << m_muonKey.key() << " eta/phi = " << (*muonEL)->eta() << "/" << (*muonEL)->phi());
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx
index 40bed09b2bdb1d0eb84992dc87921cdb034e2981..e91f559945aa6c79683b76631d26dfcff65ee58d 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx
@@ -75,7 +75,7 @@ StatusCode TrigMuonEFMSonlyHypoAlg::execute( const EventContext& context ) const
size_t counter = 0; // view counter
// loop over previous decisions
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for (const auto previousDecision: *previousDecisionsHandle ) {
// get RoIs
auto roiInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
auto roiEL = roiInfo.link;
@@ -110,7 +110,7 @@ StatusCode TrigMuonEFMSonlyHypoAlg::execute( const EventContext& context ) const
newd -> setObjectLink( "feature", muonEL );
newd -> setObjectLink( "roi", roiEL );
newd -> setObjectLink( "view", viewEL );
- TrigCompositeUtils::linkToPrevious( newd, decisionInput().key(), counter );
+ TrigCompositeUtils::linkToPrevious( newd, previousDecision );
ATH_MSG_DEBUG("REGTEST: " << m_muonKey.key() << " pT = " << (*muonEL)->pt() << " GeV");
ATH_MSG_DEBUG("REGTEST: " << m_muonKey.key() << " eta/phi = " << (*muonEL)->eta() << "/" << (*muonEL)->phi());
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx
index f1a59c2d650f44df95cce2e388063571332486e2..8c991854a1f48c3a2075db21876a3cad6e0308a6 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx
@@ -71,7 +71,7 @@ StatusCode TrigMuonEFTrackIsolationHypoAlg::execute( const EventContext& context
std::vector<TrigMuonEFTrackIsolationHypoTool::EFIsolationMuonInfo> toolInput;
size_t counter = 0;
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
// get RoIs
auto roiInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
auto roiEL = roiInfo.link;
@@ -105,7 +105,7 @@ StatusCode TrigMuonEFTrackIsolationHypoAlg::execute( const EventContext& context
newd -> setObjectLink( "roi", roiEL );
newd -> setObjectLink( "view", viewEL );
- TrigCompositeUtils::linkToPrevious( newd, decisionInput().key(), counter );
+ TrigCompositeUtils::linkToPrevious( newd, previousDecision );
ATH_MSG_DEBUG("REGTEST: " << m_muonKey.key() << " pT = " << (*muonEL)->pt() << " GeV");
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx
index ea94c0bc76ea8c65a4da78deed9d86e2719b15eb..95ecf0836b6f7269388bf510baebeeaf6523f1f4 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx
@@ -75,7 +75,7 @@ StatusCode TrigmuCombHypoAlg::execute(const EventContext& context) const
// loop over previous decisions
size_t counter = 0;
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
// get L2MuonSA Feature
TrigCompositeUtils::LinkInfo<xAOD::L2StandAloneMuonContainer> linkInfo =
TrigCompositeUtils::findLink<xAOD::L2StandAloneMuonContainer>(previousDecision, "feature");
@@ -104,7 +104,7 @@ StatusCode TrigmuCombHypoAlg::execute(const EventContext& context) const
// set objectLink
newd->setObjectLink( "feature", muCombEL );
- TrigCompositeUtils::linkToPrevious( newd, decisionInput().key(), counter);
+ TrigCompositeUtils::linkToPrevious( newd, previousDecision);
// DEBUG
auto muFastInfo = (*muCombEL)->muSATrack();
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
index e03f9bac680661df8d8eea2d74fe26b943e1beae..f709144b2293813c1308ea1657607e9af3e2fe12 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
@@ -52,7 +52,7 @@ StatusCode TrigTauCaloHypoAlgMT::execute( const EventContext& context ) const {
// loop over previous decisions
size_t counter=0;
- for ( auto previousDecision: *previousDecisionsHandle ) {
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
//get RoI
auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
ATH_CHECK( roiELInfo.isValid() );
@@ -70,15 +70,15 @@ StatusCode TrigTauCaloHypoAlgMT::execute( const EventContext& context ) const {
toolInput.emplace_back( d, roi, clusterHandle.cptr(), previousDecision );
- {
- auto el = ViewHelper::makeLink( *(viewELInfo.link), clusterHandle, 0 );
+ {
+ auto el = ViewHelper::makeLink( *(viewELInfo.link), clusterHandle, 0 );
ATH_CHECK( el.isValid() );
d->setObjectLink( "feature", el );
}
- d->setObjectLink( "roi", roiELInfo.link );
- TrigCompositeUtils::linkToPrevious( d, decisionInput().key(), counter );
- ATH_MSG_DEBUG( "Added view, roi, cluster, previous decision to new decision " << counter << " for view " << (*viewELInfo.link)->name() );
- counter++;
+ d->setObjectLink( "roi", roiELInfo.link );
+ TrigCompositeUtils::linkToPrevious( d, previousDecision );
+ ATH_MSG_DEBUG( "Added view, roi, cluster, previous decision to new decision " << counter << " for view " << (*viewELInfo.link)->name() );
+ counter++;
}
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
index af6652a753b7716b1fb7d3387660e968afe0c61c..78b3633c0722a67eca6f7d7eadcb2dec5bbc8b8b 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
@@ -894,8 +894,6 @@ def TrigJetMonitoringTool():
# from TrigHLTMonitoring.HLTMonFlags import HLTMonFlags
# HLTMonFlags.doEgamma.set_Value_and_Lock(False)
- ToolSvc += HLTJetMon;
-
# Set up the trigger configuration tool:
#ToolSvc += CfgMgr.TrigConf__xAODConfigTool( "xAODConfigTool",
#OutputLevel = 2 )
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
index f72f8f21b16729e9981b021606b7afc0a7101ac9..1bbd5cdcd5b27a4eefb764e885e34a61c1702660 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
@@ -55,7 +55,6 @@ namespace TrigCompositeUtils {
/**
* @brief Creates and right away records the DecisionContainer using the provided WriteHandle.
**/
-
void createAndStore( SG::WriteHandle<DecisionContainer>& handle );
/**
@@ -94,6 +93,12 @@ Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std:
**/
void insertDecisionIDs( const Decision* src, Decision* dest );
+ /**
+ * @brief Appends the decision IDs of src to the dest decision object
+ * @warning Performing merging of IDs and solving the duples (via set)
+ **/
+ void insertDecisionIDs( const DecisionIDContainer& src, Decision* dest );
+
/**
* @brief Make unique list of decision IDs of dest Decision object
* @warning Use vector->set->vector
@@ -109,14 +114,17 @@ Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std:
/**
* @brief Another variant of the above method to access DecisionIDs stored in
- the Decision object, returns const accessor
+ * the Decision object, returns const accessor
+ * @warning Operates on the underlying xAOD vector form rather than the DecisionContainer set form
**/
- const std::vector<int>& decisionIDs( const Decision* d );
+ const std::vector<DecisionID>& decisionIDs( const Decision* d );
/**
- * @brief Another variant of the above method to access DecisionIDs stored in the Decision object, returns read/write accessor
+ * @brief Another variant of the above method to access DecisionIDs stored in
+ * the Decision object, returns read/write accessor
+ * @warning Operates on the underlying xAOD vector form rather than the DecisionContainer set form
**/
- std::vector<int>& decisionIDs( Decision* d );
+ std::vector<DecisionID>& decisionIDs( Decision* d );
/**
@@ -135,19 +143,24 @@ Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std:
bool passed( DecisionID id, const DecisionIDContainer& );
/**
- * @brief Links to the previous object
+ * @brief Links to the previous object, location of previous 'seed' decision supplied by hand
**/
void linkToPrevious(Decision* d, const std::string& previousCollectionKey, size_t previousIndex);
/**
- * @brief checks if there is a link to previous object
+ * @brief Links to the previous object, 'seed' decision provided explicitly.
+ **/
+ void linkToPrevious(Decision* d, const Decision* dOld);
+
+ /**
+ * @brief checks if there is at least one 'seed' link to previous object
**/
bool hasLinkToPrevious(const Decision* d);
/**
- * @brief returns link to previous decision object
+ * @brief returns links to previous decision object 'seed'
**/
- ElementLinkVector<DecisionContainer> getLinkToPrevious(const Decision*);
+ const ElementLinkVector<DecisionContainer> getLinkToPrevious(const Decision*);
/**
* @brief copy all links from src to dest TC objects
@@ -180,6 +193,24 @@ Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std:
std::string m_name;
};
+ /**
+ * @brief Prerequisite object usable with @see filter allowing to find TC having a link to an object collection of name
+ **/
+ class HasObjectCollection {
+ public:
+ /**
+ * @brief constructor specifying the link name
+ **/
+ HasObjectCollection(const std::string& name): m_name(name) {}
+ /**
+ * @brief checks if the arg TC has link collection of name specified at construction
+ * @warning method for internal consumption within @see find function
+ **/
+ bool operator()(const xAOD::TrigComposite* ) const;
+ private:
+ std::string m_name;
+ };
+
/**
* @brief collects all TC linked back to the start TC
@@ -196,7 +227,7 @@ Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std:
: source{0} {}
LinkInfo(const xAOD::TrigComposite *s, const ElementLink<T>& l)
: source{s}, link{l} {}
-
+
bool isValid() const {
return source && link.isValid(); }
/**
@@ -204,7 +235,7 @@ Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std:
*/
operator StatusCode () {
return (isValid() ? StatusCode::SUCCESS : StatusCode::FAILURE); }
-
+
const xAOD::TrigComposite *source;
ElementLink<T> link;
};
@@ -217,25 +248,7 @@ Decision* newDecisionIn( DecisionContainer* dc, const Decision* dOld, const std:
*/
template<typename T>
LinkInfo<T>
- findLink(const xAOD::TrigComposite* start, const std::string& linkName) {
- auto source = find(start, HasObject(linkName) );
- //
- if ( not source ){
- auto seeds = getLinkToPrevious(start);
- // std::cout<<"Looking for seeds: found " <<seeds.size()<<std::endl;
- for (auto seed: seeds){
- const xAOD::TrigComposite* dec = *seed;//deference
- LinkInfo<T> link= findLink<T>( dec, linkName );
- // return the first found
- if (link.isValid()) return link;
- }
- return LinkInfo<T>(); // invalid link
- }
-
- //std::cout<<"Found source for "<<linkName<<std::endl;
-
- return LinkInfo<T>( source, source->objectLink<T>( linkName ) );
- }
+ findLink(const xAOD::TrigComposite* start, const std::string& linkName);
/**
* Prints the TC including the linked seeds
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
index 4f47a25430580aa651fe7c37ec81ea204ddb3015..198d9a223faeee541fedc427b7ad896877fe4efd 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
@@ -36,5 +36,23 @@ namespace TrigCompositeUtils {
return handle;
}
+ template<typename T>
+ LinkInfo<T>
+ findLink(const xAOD::TrigComposite* start, const std::string& linkName) {
+ auto source = find(start, HasObject(linkName) );
+ //
+ if ( not source ){
+ auto seeds = getLinkToPrevious(start);
+ for (auto seed: seeds){
+ const xAOD::TrigComposite* dec = *seed;//deference
+ LinkInfo<T> link= findLink<T>( dec, linkName );
+ // return the first found
+ if (link.isValid()) return link;
+ }
+ return LinkInfo<T>(); // invalid link
+ }
+
+ return LinkInfo<T>( source, source->objectLink<T>( linkName ) );
+ }
}
diff --git a/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref b/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref
index 4336ef8e73c8cd36b427b307f184f51fe89d7639..0efaa06a2d0d91f617cc1585a5565f79113cb83c 100644
--- a/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref
+++ b/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref
@@ -1,7 +1,7 @@
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Thu Dec 27 22:27:34 2018
+ Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
+ running on pc-tbed-pub-24.cern.ch on Wed Feb 20 14:16:00 2019
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
EventLoopMgr WARNING Unable to locate service "EventSelector"
@@ -9,18 +9,18 @@ EventLoopMgr WARNING No events will be processed from external input.
HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-ClassIDSvc INFO getRegistryEntries: read 10811 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7561 CLIDRegistry entries for module ALL
Context: s: 0 e: 0
Current context: s: 0 e: 0
ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
initialize SG::WriteHandleKey<DecisionContainer> whkT
call createAndStore( whkT ) with default context, twice
StoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key arbitrary and clid 1333228823
- Pre-existing valid DataProxy @0x1a48360 found in Store for key arbitrary with clid 1333228823
-StoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1a458a0
- recorded with key arbitrary of type xAOD::TrigCompositeContainer (CLID 1333228823) in DataObject @0x1a42ea0
-VarHandle(Store... ERROR Control/StoreGate/src/VarHandleBase.cxx:733 (FUNC): code 0: recordObject failed
- FATAL Control/StoreGate/StoreGate/WriteHandle.icc:887 (FUNC): code 0: this->record(std::move(data))
+ Pre-existing valid DataProxy @0xf666d0 found in Store for key arbitrary with clid 1333228823
+StoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0xf64f10
+ recorded with key arbitrary of type xAOD::TrigCompositeContainer (CLID 1333228823) in DataObject @0xf66810
+VarHandle(Store... ERROR /build1/atnight/localbuilds/nightlies/master/athena/Control/StoreGate/src/VarHandleBase.cxx:733 (FUNC): code 0: recordObject failed
+ FATAL /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-11T2351/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/src/Control/StoreGate/StoreGate/WriteHandle.icc:887 (FUNC): code 0: this->record(std::move(data))
handle name "arbitrary" isPresent 1 isValid 1
handle name "arbitrary" isPresent 1 isValid 0
@@ -44,32 +44,33 @@ Call setObjectLink with a bad ElementLink that has no corresponding collection.
xAOD::TrigComposite_v1::setObjectLink ERROR link is not valid
New decision d3b with name & context
-d3b: TrigComposite_v1 'd3b' link: name, key, index, CLID
-self, 1042135810, 3, 1333228823
-testlink, 1042135810, 1, 1333228823
-
+d3b: TrigComposite_v1 name:'d3b'
+ N Lnks:2
+ Link Name:self, Key:1042135810, Index:3, CLID:1333228823
+ Link Name:testlink, Key:1042135810, Index:1, CLID:1333228823
el2 1042135810 1
-d3: TrigComposite_v1 '' link: name, key, index, CLID
-self, 1042135810, 2, 1333228823
-seed, 1042135810, 1, 1333228823
-
-d4: TrigComposite_v1 '' link: name, key, index, CLID
-self, 1042135810, 4, 1333228823
-seed, 1042135810, 1, 1333228823
-
+d3: TrigComposite_v1 name:''
+ N Lnks:2
+ Link Name:self, Key:1042135810, Index:2, CLID:1333228823
+ Link Name:seed__COLL, Key:1042135810, Index:1, CLID:1333228823
+ N Decisions: '2
+ 95, 99,
+d4: TrigComposite_v1 name:''
+ N Lnks:2
+ Link Name:self, Key:1042135810, Index:4, CLID:1333228823
+ Link Name:seed__COLL, Key:1042135810, Index:1, CLID:1333228823
el: key 1042135810 index 1
create d5
set link
-d5: TrigComposite_v1 'd5' link: name, key, index, CLID
-self, 1042135810, 5, 1333228823
-feature, 1042135810, 1, 1333228823
-
+d5: TrigComposite_v1 name:'d5'
+ N Lnks:2
+ Link Name:self, Key:1042135810, Index:5, CLID:1333228823
+ Link Name:feature, Key:1042135810, Index:1, CLID:1333228823
create d6
-d6: TrigComposite_v1 'd6' link: name, key, index, CLID
-self, 1042135810, 6, 1333228823
-feature, 1042135810, 1, 1333228823
-seed, 1042135810, 5, 1333228823
-
+d6: TrigComposite_v1 name:'d6'
+ N Lnks:2
+ Link Name:self, Key:1042135810, Index:6, CLID:1333228823
+ Link Name:seed__COLL, Key:1042135810, Index:5, CLID:1333228823
get d5 feature link
get d6 feature link
compare feature links
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
index 02488db94d84359d669f5d1ac3bc075fe5ea2606..a99a873cd1228fab6297cdee6687c8d40cb1488e 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
@@ -10,7 +10,7 @@
using namespace TrigCompositeUtils;
ComboHypo::ComboHypo(const std::string& name, ISvcLocator* pSvcLocator)
- : ::AthReentrantAlgorithm(name, pSvcLocator)
+: ::AthReentrantAlgorithm(name, pSvcLocator)
{}
ComboHypo::~ComboHypo()
@@ -34,8 +34,8 @@ StatusCode ComboHypo::initialize() {
// find max inputs size
auto maxMultEl = std::max_element( m_multiplicitiesReqMap.begin(), m_multiplicitiesReqMap.end(),
- []( MultiplicityReqMap::value_type a, MultiplicityReqMap::value_type b ){
- return a.second.size() < b.second.size(); } );
+ []( MultiplicityReqMap::value_type a, MultiplicityReqMap::value_type b ){
+ return a.second.size() < b.second.size(); } );
const size_t maxMult = maxMultEl->second.size();
@@ -64,7 +64,7 @@ StatusCode ComboHypo::finalize() {
StatusCode ComboHypo::copyDecisions( const DecisionIDContainer& passing, const EventContext& context ) const {
-
+
ATH_MSG_DEBUG( "Copying "<<passing.size()<<" positive decisions to outputs");
for ( size_t input_counter = 0; input_counter < m_inputs.size(); ++input_counter ) {
@@ -74,51 +74,47 @@ StatusCode ComboHypo::copyDecisions( const DecisionIDContainer& passing, const E
auto inputHandle = SG::makeHandle( m_inputs[input_counter], context );
if ( inputHandle.isValid() ) {
- const DecisionContainer* inputs = inputHandle.cptr();
- const size_t sz = inputs->size();
- for ( size_t i = 0; i < sz; ++i ) {
- const Decision *inputDecision = inputs->at(i);
- DecisionIDContainer inputDecisionIDs;
- decisionIDs( inputDecision, inputDecisionIDs );
-
- // from all poitive decision in the input only the ones that survived counting are passed over
- DecisionIDContainer common;
- std::set_intersection( inputDecisionIDs.begin(), inputDecisionIDs.end(), passing.begin(), passing.end(),
- std::inserter( common, common.end() ) );
-
-
- Decision* newDec = newDecisionIn( outDecisions );
- linkToPrevious( newDec, inputHandle.key(), i );
- ATH_MSG_DEBUG("New decision has "<< (TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( newDec, "initialRoI")).isValid()
- <<" valid initialRoI and "<< TrigCompositeUtils::getLinkToPrevious(newDec).size() <<" previous decisions");
-
- for ( auto id: common ) {
- addDecisionID( id, newDec );
- }
-
- // add View?
- if ( inputDecision->hasObjectLink( "view" ) ) {
- auto viewEL = inputDecision->objectLink< ViewContainer >( "view" );
- CHECK( viewEL.isValid() );
- newDec->setObjectLink( "view", viewEL );
- }
+ for (const Decision* inputDecision: *inputHandle) {
+
+ DecisionIDContainer inputDecisionIDs;
+ decisionIDs( inputDecision, inputDecisionIDs );
+
+ // from all poitive decision in the input only the ones that survived counting are passed over
+ DecisionIDContainer common;
+ std::set_intersection( inputDecisionIDs.begin(), inputDecisionIDs.end(), passing.begin(), passing.end(),
+ std::inserter( common, common.end() ) );
+
+ Decision* newDec = newDecisionIn( outDecisions );
+ linkToPrevious( newDec, inputDecision );
+ ATH_MSG_DEBUG("New decision has "<< (TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( newDec, "initialRoI")).isValid()
+ << " valid initialRoI and "<< TrigCompositeUtils::getLinkToPrevious(newDec).size() <<" previous decisions");
+
+ insertDecisionIDs( common, newDec );
+
+ // add View?
+ if ( inputDecision->hasObjectLink( "view" ) ) {
+ auto viewEL = inputDecision->objectLink< ViewContainer >( "view" );
+ CHECK( viewEL.isValid() );
+ newDec->setObjectLink( "view", viewEL );
+ }
}
}
// debug printout:
- if ( msgLvl(MSG::DEBUG)) {
+ if ( msgLvl(MSG::DEBUG) ) {
ATH_MSG_DEBUG(outputHandle.key() <<" with "<< outputHandle->size() <<" decisions:");
for (auto outdecision: *outputHandle){
- TrigCompositeUtils::DecisionIDContainer objDecisions;
- TrigCompositeUtils::decisionIDs( outdecision, objDecisions );
- ATH_MSG_DEBUG("Number of positive decisions for this output: " << objDecisions.size() );
- for ( TrigCompositeUtils::DecisionID id : objDecisions ) {
- ATH_MSG_DEBUG( " --- decision " << HLT::Identifier( id ) );
- }
+ TrigCompositeUtils::DecisionIDContainer objDecisions;
+ TrigCompositeUtils::decisionIDs( outdecision, objDecisions );
+ ATH_MSG_DEBUG("Number of positive decisions for this output: " << objDecisions.size() );
+ for ( TrigCompositeUtils::DecisionID id : objDecisions ) {
+ ATH_MSG_DEBUG( " --- decision " << HLT::Identifier( id ) );
+ }
}
}
}
+
return StatusCode::SUCCESS;
}
@@ -129,11 +125,11 @@ void ComboHypo::fillDecisionsMap( std::vector< MultiplicityMap >& dmap, const E
ATH_MSG_DEBUG( "Found implicit RH from " << inputHandle.key() <<" with "<< inputHandle->size() << " elements:" );
MultiplicityMap thisInputDmap;
for ( const Decision* decision : *inputHandle.cptr() ) {
- ATH_MSG_DEBUG( "Decision with "<< decisionIDs( decision ).size() << " chains passed:" );
- for ( DecisionID id: decisionIDs( decision ) ) {
- ATH_MSG_DEBUG( " +++ " << HLT::Identifier( id ) );
- thisInputDmap[id] ++;
- }
+ ATH_MSG_DEBUG( "Decision with "<< decisionIDs( decision ).size() << " chains passed:" );
+ for ( DecisionID id: decisionIDs( decision ) ) {
+ ATH_MSG_DEBUG( " +++ " << HLT::Identifier( id ) );
+ thisInputDmap[id] ++;
+ }
}
dmap[i]= thisInputDmap;
}
@@ -143,7 +139,6 @@ void ComboHypo::fillDecisionsMap( std::vector< MultiplicityMap >& dmap, const E
}
}
-
//debug
ATH_MSG_DEBUG( "Decision map filled :" );
int i=0;
@@ -158,7 +153,7 @@ void ComboHypo::fillDecisionsMap( std::vector< MultiplicityMap >& dmap, const E
StatusCode ComboHypo::execute(const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
-
+
DecisionIDContainer passing;
// this map is filled with the count of positive decisions from each input
@@ -175,8 +170,8 @@ StatusCode ComboHypo::execute(const EventContext& context ) const {
const int observedMultiplicity = dmap[ inputContainerIndex ][ requiredDecisionID ];
ATH_MSG_DEBUG( "Required multiplicity " << requiredMultiplicity << " for chain " << m.first<< ": observed multiplicity " << observedMultiplicity << " in container " << inputContainerIndex );
if ( observedMultiplicity < requiredMultiplicity ) {
- overallDecision = false;
- break;
+ overallDecision = false;
+ break;
}
}
ATH_MSG_DEBUG( "Chain " << m.first << ( overallDecision ? " is accepted" : " is rejected") );
@@ -186,7 +181,6 @@ StatusCode ComboHypo::execute(const EventContext& context ) const {
}
ATH_CHECK( copyDecisions( passing, context ) );
-
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
index 6406db2a9d765067c5e7028e807cfa471418ff70..ae9f403eb8cf864fc9e352e4a2e7c6edc3a34be1 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
@@ -10,7 +10,7 @@ using namespace TrigCompositeUtils;
InputMakerBase::InputMakerBase( const std::string& name, ISvcLocator* pSvcLocator )
- : ::AthReentrantAlgorithm( name, pSvcLocator ) {}
+: ::AthReentrantAlgorithm( name, pSvcLocator ) {}
InputMakerBase::~InputMakerBase() {}
@@ -65,55 +65,66 @@ StatusCode InputMakerBase::decisionInputToOutput(const EventContext& context, st
}
ATH_MSG_DEBUG( "Running on input "<< inputKey.key()<<" with " << inputHandle->size() << " elements" );
- // create the output container
+ // We have an input container with >= 1 Decision objects. Create an output container with the same index.
TrigCompositeUtils::createAndStore(outputHandles[outputIndex]);
auto outDecisions = outputHandles[outputIndex].ptr();
- //map all RoIs that are stored in this input container
- std::vector <ElementLink<TrigRoiDescriptorCollection> > RoIsFromDecision;
-
+ // If using m_mergeOutputs, then collate all RoIs that are stored in this input container
+ ElementLinkVector<TrigRoiDescriptorCollection> RoIsFromDecision;
+
// loop over decisions retrieved from this input
size_t input_counter =0;
size_t output_counter =0;
-
- for ( auto decision : *inputHandle){
- ATH_MSG_DEBUG( "Input Decision "<<input_counter <<" has " <<TrigCompositeUtils::getLinkToPrevious(decision).size()<<" previous links");
- TrigCompositeUtils::Decision* newDec;
- bool addDecision=false;
- int roi_counter=0;
+ for (const TrigCompositeUtils::Decision* inputDecision : *inputHandle){
+ ATH_MSG_DEBUG( "Input Decision "<<input_counter <<" has " <<TrigCompositeUtils::getLinkToPrevious(inputDecision).size()<<" previous links");
+ TrigCompositeUtils::Decision* newDec = nullptr;
+ bool addDecision = false;
+ ElementLink<TrigRoiDescriptorCollection> roiEL = ElementLink<TrigRoiDescriptorCollection>();
+
if (m_mergeOutputs){
- auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( decision, m_roisLink.value());
- CHECK( roiELInfo.isValid() );
- auto roiEL = roiELInfo.link;
- auto roiIt=find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL);
- addDecision = (roiIt == RoIsFromDecision.end());
- if (addDecision) {
- RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
- const TrigRoiDescriptor* roi = *roiEL;
- ATH_MSG_DEBUG( "Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
- roi_counter = roiIt-RoIsFromDecision.begin();
- }
- } else
- addDecision=true;
+ // Get RoI from this input decision
+ const auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value());
+ CHECK( roiELInfo.isValid() );
+ roiEL = roiELInfo.link;
+ const auto roiIt = std::find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL);
+ addDecision = (roiIt == RoIsFromDecision.end());
+ // addDecision is positive here if we have *not* before encountered this RoI within this input collection.
+ if (addDecision) {
+ RoIsFromDecision.push_back(roiEL); // To keep track of which we have used
+ ATH_MSG_DEBUG( "Found RoI:" << **roiEL <<" FS="<< (*roiEL)->isFullscan());
+ }
+ } else { // Not merging, keep a 1-to-1 mapping of Decisions in Input & Output containers
+ addDecision=true;
+ }
if ( addDecision ){
- newDec = TrigCompositeUtils::newDecisionIn( outDecisions );
- output_counter++;
- }
- else{
- newDec = outDecisions[outputIndex][roi_counter];
+ // Create a new Decision in the Output container to mirror one in the Input container
+ newDec = TrigCompositeUtils::newDecisionIn( outDecisions );
+ output_counter++;
+ } else{
+ // addDecision can only be false if m_mergeOutputs was true and roiEL was found within RoIsFromDecision
+ // Re-use a Decision already added to the Output container
+ const auto roiIt = std::find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL);
+ if (roiIt == RoIsFromDecision.end()) {
+ ATH_MSG_ERROR("Logic error in decisionInputToOutput. Cannot find existing RoI.");
+ return StatusCode::FAILURE;
+ }
+ const size_t roiCounter = std::distance( RoIsFromDecision.begin(), roiIt );
+ newDec = outDecisions[outputIndex][roiCounter];
}
-
- TrigCompositeUtils::linkToPrevious( newDec, inputKey.key(), input_counter );
- TrigCompositeUtils::insertDecisionIDs( decision, newDec );
+
+ TrigCompositeUtils::linkToPrevious( newDec, inputDecision ); // Link inputDecision object as the 'seed' of newDec
+ TrigCompositeUtils::insertDecisionIDs( inputDecision, newDec ); // Copy decision IDs from inputDecision into newDec
ATH_MSG_DEBUG("New decision has "<< (TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( newDec, m_roisLink.value())).isValid() <<" valid "<<m_roisLink.value() <<" and "<< TrigCompositeUtils::getLinkToPrevious(newDec).size() <<" previous decisions");
- input_counter++;
+ input_counter++;
} // loop over input decisions
ATH_MSG_DEBUG( "Filled output key " << decisionOutputs()[ outputIndex ].key() <<" of size "<<outDecisions->size() <<" at index "<< outputIndex);
- outputIndex++;
+ for (auto i : *outDecisions) msg() << i << " ";
+ msg() << endmsg;
+ outputIndex++;
} // end of first loop over input keys
return StatusCode::SUCCESS;
@@ -176,4 +187,4 @@ size_t InputMakerBase::countInputHandles( const EventContext& context ) const {
-
+
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
index a527412adc03f363ff443842de31fcee677b423f..e396a41734d7d451beda37ea95c45a0bbca81b4f 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
@@ -12,10 +12,11 @@ using TrigCompositeUtils::DecisionContainer;
using TrigCompositeUtils::Decision;
using TrigCompositeUtils::linkToPrevious;
using TrigCompositeUtils::getLinkToPrevious;
+using TrigCompositeUtils::findLink;
InputMakerForRoI:: InputMakerForRoI( const std::string& name,
- ISvcLocator* pSvcLocator )
- : InputMakerBase( name, pSvcLocator ) {}
+ ISvcLocator* pSvcLocator )
+: InputMakerBase( name, pSvcLocator ) {}
InputMakerForRoI::~ InputMakerForRoI() {}
@@ -38,12 +39,12 @@ StatusCode InputMakerForRoI::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
// call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled
- std::vector< SG::WriteHandle<TrigCompositeUtils::DecisionContainer> > outputHandles;
+ std::vector< SG::WriteHandle<DecisionContainer> > outputHandles;
ATH_CHECK (decisionInputToOutput(context, outputHandles));
// Prepare Outputs
std::unique_ptr< TrigRoiDescriptorCollection > oneRoIColl( new TrigRoiDescriptorCollection() );
-
+
// use also this: ElementLinkVector<xAOD::MuonRoIContainer> getMuonRoILinks = obj->objectCollectionLinks<xAOD::MuonRoIContainer>("ManyMuonRoIs");
std::vector <ElementLink<TrigRoiDescriptorCollection> > RoIsFromDecision; // used to check for duplicate features linked to different inputHandles
@@ -61,24 +62,23 @@ StatusCode InputMakerForRoI::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Got output "<< outputHandle.key()<<" with " << outputHandle->size() << " elements" );
// loop over output decisions in container of outputHandle, follow link to inputDecision
for ( auto outputDecision : *outputHandle){
- ElementLinkVector<DecisionContainer> inputLinks = TrigCompositeUtils::getLinkToPrevious(outputDecision);
+ ElementLinkVector<DecisionContainer> inputLinks = getLinkToPrevious(outputDecision);
for (auto input: inputLinks){
- const Decision* inputDecision = *input;
- auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value() );
- auto roiEL = roiELInfo.link;
- ATH_CHECK( roiEL.isValid() );
-
- // avoid adding the same feature multiple times: check if not in container, if not add it
- if ( find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL)
- == RoIsFromDecision.end() ){
- RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
- const TrigRoiDescriptor* roi = *roiEL;
- ATH_MSG_DEBUG("Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
- //make a new one:
- TrigRoiDescriptor* newroi= new TrigRoiDescriptor(*roi); //use copy constructor
- oneRoIColl->push_back(newroi);
- ATH_MSG_DEBUG("Added RoI:" <<*newroi<<" FS="<<newroi->isFullscan());
- }
+ const Decision* inputDecision = *input;
+ auto roiELInfo = findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value() );
+ auto roiEL = roiELInfo.link;
+ ATH_CHECK( roiEL.isValid() );
+
+ // avoid adding the same feature multiple times: check if not in container, if not add it
+ if ( find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL) == RoIsFromDecision.end() ) {
+ RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
+ const TrigRoiDescriptor* roi = *roiEL;
+ ATH_MSG_DEBUG("Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
+ //make a new one:
+ TrigRoiDescriptor* newroi= new TrigRoiDescriptor(*roi); //use copy constructor
+ oneRoIColl->push_back(newroi);
+ ATH_MSG_DEBUG("Added RoI:" <<*newroi<<" FS="<<newroi->isFullscan());
+ }
} // loop over previous input links
} // loop over decisions
} // loop over output keys
diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
index dc97402c08734eb7ba704aa50bc48b3c313c4c35..33aa17f46550e97d04f34761a9bbe26ad9b24eda 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
@@ -7,6 +7,15 @@
#include "GaudiKernel/Property.h"
+using TrigCompositeUtils::DecisionContainer;
+using TrigCompositeUtils::Decision;
+using TrigCompositeUtils::DecisionIDContainer;
+using TrigCompositeUtils::DecisionID;
+using TrigCompositeUtils::decisionIDs;
+using TrigCompositeUtils::insertDecisionIDs;
+using TrigCompositeUtils::createAndStore;
+using TrigCompositeUtils::newDecisionIn;
+
RoRSeqFilter::RoRSeqFilter( const std::string& name,
ISvcLocator* pSvcLocator ) :
::AthAlgorithm( name, pSvcLocator )
@@ -87,34 +96,35 @@ StatusCode RoRSeqFilter::execute() {
if ( m_mergeInputs ) {
ATH_MSG_DEBUG( "Recording " << m_outputKeys[ 0 ].key() );
- TrigCompositeUtils::createAndStore(outputHandles[0]);
- TrigCompositeUtils::DecisionContainer* output = outputHandles[0].ptr();
+ createAndStore(outputHandles[0]);
+ DecisionContainer* output = outputHandles[0].ptr();
for ( auto inputKey: m_inputKeys ) {
auto inputHandle = SG::makeHandle( inputKey );
if( inputHandle.isValid() )
- passCounter += copyPassing( *inputHandle, inputKey.key(), *output );
+ passCounter += copyPassing( *inputHandle, *output );
}
outputIndex++;
- } else {
+ } else { // Not merging inputs
for ( auto inputKey: m_inputKeys ) {
// already made handles, so this code could be simplified to a loop over inputHandles.
auto inputHandle = SG::makeHandle( inputKey );
if( not inputHandle.isValid() ) {
- ATH_MSG_DEBUG( "InputHandle "<< inputKey.key() <<" not present" );
+ ATH_MSG_DEBUG( "InputHandle "<< inputKey.key() <<" not present" );
} else if ( inputHandle->empty() ) {
- ATH_MSG_DEBUG( "InputHandle "<< inputKey.key() <<" contains all rejected decisions, skipping" );
+ ATH_MSG_DEBUG( "InputHandle "<< inputKey.key() <<" contains all rejected decisions, skipping" );
} else {
- ATH_MSG_DEBUG( "Checking inputHandle "<< inputKey.key() <<" with " << inputHandle->size() <<" elements");
- TrigCompositeUtils::createAndStore(outputHandles[outputIndex]);
- TrigCompositeUtils::DecisionContainer* output = outputHandles[outputIndex].ptr();
- passCounter += copyPassing( *inputHandle, inputKey.key(), *output );
- ATH_MSG_DEBUG( "Recorded output key " << m_outputKeys[ outputIndex ].key() <<" of size "<<output->size() <<" at index "<< outputIndex);
+ ATH_MSG_DEBUG( "Checking inputHandle "<< inputKey.key() <<" with " << inputHandle->size() <<" elements");
+ createAndStore(outputHandles[outputIndex]);
+ DecisionContainer* output = outputHandles[outputIndex].ptr();
+ passCounter += copyPassing( *inputHandle, *output );
+ ATH_MSG_DEBUG( "Recorded output key " << m_outputKeys[ outputIndex ].key() <<" of size "<<output->size() <<" at index "<< outputIndex);
}
outputIndex++; // Keep the mapping of inputKey<->outputKey correct
}
+
}
setFilterPassed( passCounter != 0 );
@@ -127,33 +137,36 @@ StatusCode RoRSeqFilter::execute() {
return StatusCode::SUCCESS;
}
-size_t RoRSeqFilter::copyPassing( const TrigCompositeUtils::DecisionContainer& input,
- const std::string& inputKey,
- TrigCompositeUtils::DecisionContainer& output ) const {
+size_t RoRSeqFilter::copyPassing( const DecisionContainer& input,
+ DecisionContainer& output ) const {
size_t passCounter = 0;
ATH_MSG_DEBUG( "Input size " << input.size() );
for (size_t i = 0; i < input.size(); ++i) {
- const TrigCompositeUtils::Decision* inputDecision = input.at(i);
+ const Decision* inputDecision = input.at(i);
- TrigCompositeUtils::DecisionIDContainer objDecisions;
- TrigCompositeUtils::decisionIDs( inputDecision, objDecisions );
+ DecisionIDContainer objDecisions;
+ decisionIDs( inputDecision, objDecisions );
ATH_MSG_DEBUG("Number of positive decisions for this input: " << objDecisions.size() );
- for ( TrigCompositeUtils::DecisionID id : objDecisions ) {
+ for ( DecisionID id : objDecisions ) {
ATH_MSG_DEBUG( " -- Positive decision " << HLT::Identifier( id ) );
}
- std::vector<TrigCompositeUtils::DecisionID> intersection;
+ DecisionIDContainer intersection;
std::set_intersection( m_chains.begin(), m_chains.end(),
objDecisions.begin(), objDecisions.end(),
- std::back_inserter( intersection ) );
+ std::inserter(intersection, intersection.end()) );
if ( not intersection.empty() ) {
- TrigCompositeUtils::Decision* decisionCopy = TrigCompositeUtils::newDecisionIn( &output, name() );
- *decisionCopy = *inputDecision; // copies auxdata from one auxstore to the other
- // future improvement: could use newDecisionIn(&output,input,name which internally does the linkToPrevious, then no longer need to pass the key
- TrigCompositeUtils::linkToPrevious(decisionCopy, inputKey, i); // Update seed
+ // This sets up the 'self' link & the 'seed' link (seeds from inputDecision)
+ Decision* decisionCopy = newDecisionIn( &output, inputDecision, name() );
+
+ // Copy accross only the DecisionIDs which have passed through this Filter for this Decision object.
+ // WARNING: Still need to 100% confirm if the correct set to propagate forward is objDecisions or intersection.
+ // Tim M changing this from objDecisions (all IDs) -> intersection (only passed IDs) Feb 19
+ insertDecisionIDs(intersection, decisionCopy);
+
passCounter ++;
ATH_MSG_DEBUG("Input satisfied at least one active chain");
} else {
diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h
index ee6a6dd2f9fbf02a472f854ee4c31b9c938eee8f..6e572e48d7fc85a9a70ca09f87976dc0c11f973f 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h
@@ -79,17 +79,15 @@ class RoRSeqFilter
/**
* @brief Applies generic filter to input container, keeping only the decision objects with at least
* one affirmative decision from the previous Stage. Considering only decisions from chains utilising this filter.
- * @param input Reference to input container of decision objects.
* @param inputKey Storegate key of input, needed to link newly created decision objects to their parents.
* @param output Writeable output container to store copies of decision objects which pass the filter.
* @return The number of decision objects which passed the filter.
*
- * Produced a deep-copy of all Decision objects in the input container which possess a positive decision from
+ * Produced a selective copy of all Decision objects in the input container which possess a positive decision from
* at least one of the chains which this filter algorithm is configured for. This new object is linked to its
* parent and stored in the output collection. It will form the starting point for the next Step.
**/
size_t copyPassing( const TrigCompositeUtils::DecisionContainer& input,
- const std::string& inputKey,
TrigCompositeUtils::DecisionContainer& output) const;
};
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx b/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx
index 581958e813a97f4db2c9337ecf1aaa93d00b65d3..8a8e92a003e73c29d862c742b47937dc4ac9ae57 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx
@@ -10,10 +10,8 @@
#include "StoreGate/WriteHandle.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-
-
-static const SG::AuxElement::Accessor< std::vector< int > > readWriteAccessor( "decisions" );
-static const SG::AuxElement::ConstAccessor< std::vector<int> > readOnlyAccessor( "decisions" );
+static const SG::AuxElement::Accessor< std::vector<TrigCompositeUtils::DecisionID> > readWriteAccessor("decisions");
+static const SG::AuxElement::ConstAccessor< std::vector<TrigCompositeUtils::DecisionID> > readOnlyAccessor("decisions");
namespace TrigCompositeUtils {
@@ -36,7 +34,6 @@ namespace TrigCompositeUtils {
Decision* newDecisionIn ( DecisionContainer* dc, const std::string& name, const EventContext& ctx ) {
Decision * x = new Decision;
dc->push_back( x );
- readWriteAccessor( *x ).size(); // fake operation just to make the decisions decoration
size_t index = dc->size() - 1;
// make self link, useful to copy for seed link in a successor, but requires that DecisionContainer is already recorded in SG.
ElementLink<DecisionContainer> el(*dc, index, ctx);
@@ -51,68 +48,63 @@ namespace TrigCompositeUtils {
}
Decision* newDecisionIn ( DecisionContainer* dc, const Decision* dOld, const std::string& name, const EventContext& ctx ) {
- Decision* dNew = newDecisionIn( dc, name, ctx);
- if ( dOld->hasObjectLink("roi" ) ){
- dNew->copyLinkFrom(dOld,"roi");
- }
- else if ( dOld->hasObjectLink("initialRoI") ){
- dNew->copyLinkFrom(dOld,"initialRoI","roi");
- }
- if ( dOld->hasObjectLink("view" ) ){
- dNew->copyLinkFrom(dOld,"view");
- }
- if ( dOld->hasObjectLink("feature" ) ){
- dNew->copyLinkFrom(dOld,"feature");
- }
- if ( dOld->hasObjectLink("self" ) ){
- dNew->copyLinkFrom(dOld,"self","seed"); // make use of self-link
- }
- return dNew;
+ Decision* dNew = newDecisionIn( dc, name, ctx); // Sets up 'self' link of dNew
+ linkToPrevious(dNew, dOld); // Sets up link to 'seed' collection, points to 'self' link of dOld
+ return dNew;
}
void addDecisionID( DecisionID id, Decision* d ) {
- std::vector<int>& decisions = readWriteAccessor( *d );
- if ( decisions.size() == 0 or decisions.back() != static_cast<int>(id) )
+ std::vector<DecisionID>& decisions = readWriteAccessor( *d );
+ if ( decisions.size() == 0 or decisions.back() != id)
decisions.push_back( id );
}
void decisionIDs( const Decision* d, DecisionIDContainer& destination ) {
- const std::vector<int>& decisions = readOnlyAccessor( *d );
+ const std::vector<DecisionID>& decisions = readOnlyAccessor( *d );
destination.insert( decisions.begin(), decisions.end() );
}
- const std::vector<int>& decisionIDs( const Decision* d ) {
+ const std::vector<DecisionID>& decisionIDs( const Decision* d ) {
return readOnlyAccessor( *d );
}
- std::vector<int>& decisionIDs( Decision* d ) {
+ std::vector<DecisionID>& decisionIDs( Decision* d ) {
return readWriteAccessor( *d );
}
- void insertDecisionIDs( const Decision* src, Decision* dest ){
- DecisionIDContainer ids;
- decisionIDs( src, ids );
- decisionIDs( dest, ids );
- decisionIDs( dest ).clear();
- decisionIDs( dest ).insert( decisionIDs(dest).end(), ids.begin(), ids.end() );
+ void insertDecisionIDs(const Decision* src, Decision* dest ){
+ DecisionIDContainer srcIds;
+ decisionIDs( src, srcIds ); // Now stored in a set
+ insertDecisionIDs( srcIds, dest);
+ }
+
+ void insertDecisionIDs( const DecisionIDContainer& src, Decision* dest ) {
+ DecisionIDContainer collateIDs;
+ // Decision are xAOD objects backed by a std::vector
+ // Here we use a std::set to de-duplicate IDs from src and dest before setting dest
+ decisionIDs( dest, collateIDs ); // Set operation 1. Get from dest
+ collateIDs.insert( src.begin(), src.end() ); // Set operation 2. Get from src
+ decisionIDs( dest ).clear(); // Clear target
+ // Copy from set to (ordered) vector
+ decisionIDs( dest ).insert( decisionIDs(dest).end(), src.begin(), src.end() );
}
- void uniqueDecisionIDs( Decision* dest){
- DecisionIDContainer ids;
- decisionIDs( dest, ids );
- decisionIDs( dest ).clear();
- decisionIDs( dest ).insert( decisionIDs(dest).end(), ids.begin(), ids.end() );
+ void uniqueDecisionIDs(Decision* dest) {
+ // Re-use above insertDecisionIDs method.
+ // This implicitly performs de-duplication
+ return insertDecisionIDs(dest, dest);
}
bool allFailed( const Decision* d ) {
- const std::vector<int>& decisions = readOnlyAccessor( *d );
+ const std::vector<DecisionID>& decisions = readOnlyAccessor( *d );
return decisions.empty();
}
bool isAnyIDPassing( const Decision* d, const DecisionIDContainer& required ) {
- for ( auto id : readOnlyAccessor( *d ) ) {
- if ( required.count( id ) > 0 )
- return true;
+ for ( DecisionID id : readOnlyAccessor( *d ) ) {
+ if ( required.count( id ) > 0 ) {
+ return true;
+ }
}
return false;
}
@@ -122,29 +114,29 @@ namespace TrigCompositeUtils {
}
void linkToPrevious( Decision* d, const std::string& previousCollectionKey, size_t previousIndex ) {
- ElementLinkVector<DecisionContainer> seeds;
- ElementLink<DecisionContainer> new_seed= ElementLink<DecisionContainer>( previousCollectionKey, previousIndex );
- // do we need this link to self link?
- if ( (*new_seed)->hasObjectLink("self" ) )
- seeds.push_back( (*new_seed)->objectLink<DecisionContainer>("self")); // make use of self-link
- else
- seeds.push_back(ElementLink<DecisionContainer>( previousCollectionKey, previousIndex ));
-
- if (hasLinkToPrevious(d) ){
- ElementLinkVector<DecisionContainer> oldseeds = d->objectCollectionLinks<DecisionContainer>( "seed" );
- seeds.reserve( seeds.size() + oldseeds.size() );
- std::move( oldseeds.begin(), oldseeds.end(), std::back_inserter( seeds ) );
+ ElementLink<DecisionContainer> seed = ElementLink<DecisionContainer>( previousCollectionKey, previousIndex );
+ if (!seed.isValid()) {
+ throw GaudiException("Invalid Decision Link key or index provided", "TrigCompositeUtils::linkToPrevious", StatusCode::FAILURE);
+ } else {
+ d->addObjectCollectionLink("seed", seed);
}
+ }
- d->addObjectCollectionLinks("seed", seeds);
-
+ void linkToPrevious( Decision* d, const Decision* dOld) {
+ if ( dOld && dOld->hasObjectLink("self") ) {
+ // Internally de-dupes the "seed" collection of links
+ d->addObjectCollectionLink("seed", dOld->objectLink<DecisionContainer>("self"));
+ } else {
+ throw GaudiException("Using linkToPrevious with a previous decision requires that decision to have its 'self' link set",
+ "TrigCompositeUtils::linkToPrevious", StatusCode::FAILURE);
+ }
}
bool hasLinkToPrevious( const Decision* d ) {
- return d->hasObjectLink( "seed" );
+ return d->hasObjectCollectionLinks( "seed" );
}
- ElementLinkVector <DecisionContainer> getLinkToPrevious( const Decision* d ) {
+ const ElementLinkVector<DecisionContainer> getLinkToPrevious( const Decision* d ) {
return d->objectCollectionLinks<DecisionContainer>( "seed" );
}
@@ -155,23 +147,35 @@ namespace TrigCompositeUtils {
- const xAOD::TrigComposite* find( const xAOD::TrigComposite* start, const std::function<bool( const xAOD::TrigComposite* )>& filter ) {
+ const Decision* find( const Decision* start, const std::function<bool( const Decision* )>& filter ) {
if ( filter( start ) ) return start;
- if ( start->hasObjectLink( "seed" ) ) {
- return find( start->object<xAOD::TrigComposite>( "seed" ), filter );
+ if ( hasLinkToPrevious(start) ) {
+ const ElementLinkVector<DecisionContainer> seeds = getLinkToPrevious(start);
+ for (const ElementLink<DecisionContainer>& seedEL : seeds) {
+ const Decision* result = find( *seedEL, filter );
+ if (result) return result;
+ }
}
- else return nullptr;
+
+ return nullptr;
}
- bool HasObject::operator()( const xAOD::TrigComposite* composite ) const {
+ bool HasObject::operator()( const Decision* composite ) const {
return composite->hasObjectLink( m_name );
}
- bool recursiveGetObjectLinks( const xAOD::TrigComposite* start, ElementLinkVector<xAOD::TrigCompositeContainer>& linkVector ){
+ bool HasObjectCollection::operator()( const Decision* composite ) const {
+ return composite->hasObjectCollectionLinks( m_name );
+ }
+
+ bool recursiveGetObjectLinks( const Decision* start, ElementLinkVector<DecisionContainer>& linkVector ){
//recursively find in the seeds
- if ( start->hasObjectLink( "seed" ) ) {
- return recursiveGetObjectLinks( start->object<xAOD::TrigComposite>( "seed" ), linkVector );
+ if ( hasLinkToPrevious(start) ) {
+ const ElementLinkVector<DecisionContainer> seeds = getLinkToPrevious(start);
+ for (const ElementLink<DecisionContainer>& seedEL : seeds) {
+ recursiveGetObjectLinks( *seedEL, linkVector );
+ }
}
int isComposite=0;
@@ -183,7 +187,7 @@ namespace TrigCompositeUtils {
// ElementLink<xAOD::TrigComposite> test;
// test = start->objectLink( "childProxies" );
- ElementLinkVector<xAOD::TrigCompositeContainer> links = start->objectCollectionLinks<xAOD::TrigCompositeContainer>( "childProxies" );
+ ElementLinkVector<DecisionContainer> links = start->objectCollectionLinks<DecisionContainer>( "childProxies" );
linkVector.reserve( linkVector.size() + links.size() );
std::move( links.begin(), links.end(), std::back_inserter( linkVector ) );
@@ -191,13 +195,13 @@ namespace TrigCompositeUtils {
return true;
}
- std::string dump( const xAOD::TrigComposite* tc, std::function< std::string( const xAOD::TrigComposite* )> printerFnc ) {
+ std::string dump( const Decision* tc, std::function< std::string( const Decision* )> printerFnc ) {
std::string ret;
ret += printerFnc( tc );
- if ( tc->hasObjectLink("seed") ) {
- const xAOD::TrigComposite* seedTc = tc->object<xAOD::TrigComposite>( "seed" );
- if ( seedTc ) {
- ret += " -> " + dump( seedTc, printerFnc );
+ if ( hasLinkToPrevious(tc) ) {
+ const ElementLinkVector<DecisionContainer> seeds = getLinkToPrevious(tc);
+ for (const ElementLink<DecisionContainer>& seedEL : seeds) {
+ ret += " -> " + dump( *seedEL, printerFnc );
}
}
return ret;
diff --git a/Trigger/TrigSteer/DecisionHandling/test/TrigCompositeUtils_test.cxx b/Trigger/TrigSteer/DecisionHandling/test/TrigCompositeUtils_test.cxx
index 48940d6b33693bfa6b19b953d486a2fb675cc546..b2ef8139eb0987f54752253cd08413db790aec9d 100644
--- a/Trigger/TrigSteer/DecisionHandling/test/TrigCompositeUtils_test.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/test/TrigCompositeUtils_test.cxx
@@ -13,12 +13,12 @@
#include "TestTools/expect.h"
#include "DecisionHandling/TrigCompositeUtils.h"
#include "xAODTrigger/TrigCompositeAuxContainer.h"
+#include "CxxUtils/checker_macros.h"
-bool xAOD::TrigComposite::s_throwOnCopyError = true;
-
-int main() {
+int main ATLAS_NOT_THREAD_SAFE () {
using namespace TrigCompositeUtils;
+ xAOD::TrigComposite::s_throwOnCopyError = true;
errorcheck::ReportMessage::hideFunctionNames (true);
@@ -131,10 +131,10 @@ int main() {
addDecisionID( 95, d3 );
addDecisionID( 99, d3 );
addDecisionID( 99, d3 );
- auto storedDecisions = d3->getDetail<std::vector<int>>( "decisions" );
+ auto storedDecisions = d3->getDetail<std::vector<DecisionID>>( "decisions" );
VALUE ( storedDecisions.size() ) EXPECTED ( 2 );
- VALUE ( ( int )storedDecisions.front() ) EXPECTED ( 95 );
- VALUE ( ( int )storedDecisions.back() ) EXPECTED ( 99 );
+ VALUE ( ( DecisionID )storedDecisions.front() ) EXPECTED ( 95 );
+ VALUE ( ( DecisionID )storedDecisions.back() ) EXPECTED ( 99 );
// Make an EL with an invalid (zero) hash key and try to add it to a Decision
auto data1 = std::make_unique<DecisionContainer>() ;
@@ -152,10 +152,12 @@ int main() {
VALUE ( d3->setObjectLink( "bad", badEL2 ) ) EXPECTED ( false );
// this fails, and cerr output also expected
- // Make, store and retrieve a "seed" link
+ // Make, store and retrieve a "seed" link within a collection
ElementLink<DecisionContainer> el( *dc, 1 );
- assert( d3->setObjectLink( "seed", el ) );
- ElementLink<DecisionContainer > resEl = d3->objectLink<DecisionContainer>("seed");
+ assert( d3->addObjectCollectionLink( "seed", el ) );
+ ElementLinkVector<DecisionContainer > resElVector = d3->objectCollectionLinks<DecisionContainer>("seed");
+ assert( resElVector.size() == 1 );
+ ElementLink<DecisionContainer> resEl = resElVector.front();
VALUE( resEl.index() ) EXPECTED ( el.index() );
VALUE( resEl.key() ) EXPECTED ( el.key() );
@@ -163,14 +165,16 @@ int main() {
std::cout << std::endl;
std::cout << "New decision d3b with name & context " << std::endl;
auto d3b = newDecisionIn( dc, "d3b", ctx );
- // Make, store and retrieve a "seed" link, with context
+ // Make, store and retrieve a "testLink" link, with context
ElementLink<DecisionContainer> el2( *dc, 1, ctx );
assert ( d3b->setObjectLink( "testlink", el2 ) );
std::cout << "d3b: " << *d3b << std::endl;
std::cout << "el2 " << el2.key() << " " << el2.index() << std::endl;
ElementLink<DecisionContainer > resEl2 = d3b->objectLink<DecisionContainer>("testlink");
+ const Decision* res2 = d3b->object<Decision>("testlink");
VALUE( resEl2.index() ) EXPECTED ( el2.index() );
VALUE( resEl2.key() ) EXPECTED ( el2.key() );
+ VALUE( *resEl2.cptr() ) EXPECTED ( res2 );
// check copyLinks (copies all)
auto d4 = newDecisionIn( dc );
@@ -178,7 +182,8 @@ int main() {
std::cout << "d3: " << *d3 << std::endl;
std::cout << "d4: " << *d4 << std::endl;
std::cout << "el: key " << el.key() << " index " << el.index() << std::endl;
- ElementLink<DecisionContainer > resElCopied = d4->objectLink<DecisionContainer>("seed");
+ ElementLinkVector<DecisionContainer > resElCopiedVector = d4->objectCollectionLinks<DecisionContainer>("seed");
+ ElementLink<DecisionContainer> resElCopied = resElCopiedVector.front();
VALUE ( resElCopied.index() ) EXPECTED ( el.index() );
VALUE ( resElCopied.key() ) EXPECTED ( el.key() );
@@ -194,15 +199,19 @@ int main() {
std::cout << "get d5 feature link " << std::endl;
ElementLink<DecisionContainer > d5feature = d5->objectLink<DecisionContainer>("feature");
std::cout << "get d6 feature link " << std::endl;
- ElementLink<DecisionContainer > d6feature = d6->objectLink<DecisionContainer>("feature");
+ // We have to get this recursivly
+ LinkInfo<DecisionContainer> linkInfo = findLink<DecisionContainer>(d6, "feature");
+ VALUE ( linkInfo.isValid() ) EXPECTED ( true );
+ ElementLink<DecisionContainer > d6feature = linkInfo.link;
std::cout << "compare feature links " << std::endl;
VALUE ( d5feature.index() ) EXPECTED ( d6feature.index() );
VALUE ( d5feature.key() ) EXPECTED ( d6feature.key() );
std::cout << "get self and seed links " << std::endl;
auto d5self = d5->objectLink<DecisionContainer>("self");
- auto d6seed = d6->objectLink<DecisionContainer>("seed");
- VALUE ( d5self.index() ) EXPECTED ( d6seed.index() );
- VALUE ( d5self.key() ) EXPECTED ( d6seed.key() );
+ auto d6seedVector = getLinkToPrevious(d6);
+ auto d6seed = d6seedVector.front();
+ VALUE ( d5self.index() ) EXPECTED ( d6seed.index() );
+ VALUE ( d5self.key() ) EXPECTED ( d6seed.key() );
return 0;
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
index 3929467e0389e801badc70d4508103ae34c6f7a5..f952bea82082e2181e2d1cc13b2378b38eca0346 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
@@ -13,7 +13,7 @@
using namespace TrigCompositeUtils;
EventViewCreatorAlgorithm::EventViewCreatorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
- : InputMakerBase( name, pSvcLocator ) {}
+: InputMakerBase( name, pSvcLocator ) {}
EventViewCreatorAlgorithm::~EventViewCreatorAlgorithm(){}
@@ -31,7 +31,7 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
// create the output decisions, similar to inputs (copy basic links)
std::vector< SG::WriteHandle<TrigCompositeUtils::DecisionContainer> > outputHandles;
ATH_CHECK (decisionInputToOutput(context, outputHandles));
-
+
// make the views
auto viewsHandle = SG::makeHandle( m_viewsKey );
auto viewVector1 = std::make_unique< ViewContainer >();
@@ -46,7 +46,7 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
unsigned int conditionsRun = context.getExtension<Atlas::ExtendedEventContext>().conditionsRun();
//map all RoIs that are stored
- std::vector <ElementLink<TrigRoiDescriptorCollection> > RoIsFromDecision;
+ ElementLinkVector<TrigRoiDescriptorCollection> RoIsFromDecision;
// loop over decisions
for (auto outputHandle: outputHandles) {
@@ -63,39 +63,40 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
// loop over output decisions in container of outputHandle, follow link to inputDecision
for ( auto outputDecision : *outputHandle){
ElementLinkVector<DecisionContainer> inputLinks = getLinkToPrevious(outputDecision);
+ ATH_MSG_DEBUG( "Got inputLinks with " << inputLinks.size() << " elements" );
// loop over input links as predecessors
for (auto input: inputLinks){
- const Decision* inputDecision = *input;
- // find the RoI
- auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value() );
- auto roiEL = roiELInfo.link;
- ATH_CHECK( roiEL.isValid() );
- // check if already found
- auto roiIt=find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL);
- if ( roiIt == RoIsFromDecision.end() ){
- RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
- const TrigRoiDescriptor* roi = *roiEL;
- ATH_MSG_DEBUG("Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
- ATH_MSG_DEBUG( "Positive decisions on RoI, preparing view" );
-
- // make the view
- ATH_MSG_DEBUG( "Making the View" );
- auto newView = ViewHelper::makeView( name()+"_view", viewCounter++, m_viewFallThrough ); //pointer to the view
- viewVector->push_back( newView );
- contexts.emplace_back( context );
- contexts.back().setExtension( Atlas::ExtendedEventContext( viewVector->back(), conditionsRun, roi ) );
-
- // link decision to this view
- outputDecision->setObjectLink( "view", ElementLink< ViewContainer >(m_viewsKey.key(), viewVector->size()-1 ));//adding view to TC
- ATH_MSG_DEBUG( "Adding new view to new decision; storing view in viewVector component " << viewVector->size()-1 );
- ATH_CHECK( linkViewToParent( inputDecision, viewVector->back() ) );
- ATH_CHECK( placeRoIInView( roi, viewVector->back(), contexts.back() ) );
- }
- else {
- int iview = roiIt-RoIsFromDecision.begin();
- outputDecision->setObjectLink( "view", ElementLink< ViewContainer >(m_viewsKey.key(), iview ) ); //adding view to TC
- ATH_MSG_DEBUG( "Adding already mapped view " << iview << " in ViewVector , to new decision");
- }
+ const Decision* inputDecision = *input;
+ // find the RoI
+ auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value() );
+ auto roiEL = roiELInfo.link;
+ ATH_CHECK( roiEL.isValid() );
+ // check if already found
+ auto roiIt=find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL);
+ if ( roiIt == RoIsFromDecision.end() ){
+ RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
+ const TrigRoiDescriptor* roi = *roiEL;
+ ATH_MSG_DEBUG("Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
+ ATH_MSG_DEBUG("Positive decisions on RoI, preparing view" );
+
+ // make the view
+ ATH_MSG_DEBUG( "Making the View" );
+ auto newView = ViewHelper::makeView( name()+"_view", viewCounter++, m_viewFallThrough ); //pointer to the view
+ viewVector->push_back( newView );
+ contexts.emplace_back( context );
+ contexts.back().setExtension( Atlas::ExtendedEventContext( viewVector->back(), conditionsRun, roi ) );
+
+ // link decision to this view
+ outputDecision->setObjectLink( "view", ElementLink< ViewContainer >(m_viewsKey.key(), viewVector->size()-1 ));//adding view to TC
+ ATH_MSG_DEBUG( "Adding new view to new decision; storing view in viewVector component " << viewVector->size()-1 );
+ ATH_CHECK( linkViewToParent( inputDecision, viewVector->back() ) );
+ ATH_CHECK( placeRoIInView( roi, viewVector->back(), contexts.back() ) );
+ }
+ else {
+ int iview = roiIt - RoIsFromDecision.begin();
+ outputDecision->setObjectLink( "view", ElementLink< ViewContainer >(m_viewsKey.key(), iview ) ); //adding view to TC
+ ATH_MSG_DEBUG( "Adding already mapped view " << iview << " in ViewVector , to new decision");
+ }
}// loop over previous inputs
} // loop over decisions
}// loop over output keys
@@ -105,9 +106,9 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
ATH_MSG_DEBUG( "Launching execution in " << viewVector->size() << " views" );
ATH_CHECK( ViewHelper::ScheduleViews( viewVector, // Vector containing views
- m_viewNodeName, // CF node to attach views to
- context, // Source context
- m_scheduler.get() ) );
+ m_viewNodeName, // CF node to attach views to
+ context, // Source context
+ m_scheduler.get() ) );
// report number of views, stored already when container was created
// auto viewsHandle = SG::makeHandle( m_viewsKey );
@@ -132,8 +133,8 @@ StatusCode EventViewCreatorAlgorithm::linkViewToParent( const TrigCompositeUtils
if ( m_requireParentView ) {
ATH_MSG_ERROR( "Parent view not linked because it could not be found" );
ATH_MSG_ERROR( TrigCompositeUtils::dump( inputDecision, [](const xAOD::TrigComposite* tc){
- return "TC " + tc->name() + ( tc->hasObjectLink("view") ? " has view " : " has no view " );
- } ) );
+ return "TC " + tc->name() + ( tc->hasObjectLink("view") ? " has view " : " has no view " );
+ } ) );
return StatusCode::FAILURE;
}
@@ -146,7 +147,7 @@ StatusCode EventViewCreatorAlgorithm::placeRoIInView( const TrigRoiDescriptor* r
auto oneRoIColl = std::make_unique< ConstDataVector<TrigRoiDescriptorCollection> >();
oneRoIColl->clear( SG::VIEW_ELEMENTS ); //Don't delete the RoIs
oneRoIColl->push_back( roi );
-
+
//store the RoI in the view
auto handle = SG::makeHandle( m_inViewRoIs, context );
ATH_CHECK( handle.setProxyDict( view ) );
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
index 1ceea268c68aaa247ed22f88dc113a53a8941236..3c78e43548369302a7c24e16b155cb710c5c3561 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
@@ -4,6 +4,31 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+class InDetCacheNames:
+ Pixel_ClusterKey = "PixelTrigClustersCache"
+ SCT_ClusterKey = "SCT_ClustersCache"
+ SpacePointCachePix = "PixelSpacePointCache"
+ SpacePointCacheSCT = "SctSpacePointCache"
+ SCTRDOCacheKey = "SctRDOCache"
+ PixRDOCacheKey = "PixRDOCache"
+
+def InDetIDCCacheCreatorCfg():
+ #Create IdentifiableCaches
+ acc = ComponentAccumulator()
+ from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__CacheCreator
+ InDetCacheCreatorTrig = InDet__CacheCreator(name = "InDetCacheCreatorTrig",
+ Pixel_ClusterKey = InDetCacheNames.Pixel_ClusterKey,
+ SCT_ClusterKey = InDetCacheNames.SCT_ClusterKey,
+ SpacePointCachePix = InDetCacheNames.SpacePointCachePix,
+ SpacePointCacheSCT = InDetCacheNames.SpacePointCacheSCT,
+ SCTRDOCacheKey = InDetCacheNames.SCTRDOCacheKey,
+ PixRDOCacheKey = InDetCacheNames.PixRDOCacheKey)
+
+ acc.addEventAlgo( InDetCacheCreatorTrig )
+ return acc
+
+
+
#Set up ID GeoModel
def InDetGMConfig( flags ):
acc = ComponentAccumulator()
@@ -203,17 +228,6 @@ def TrigInDetConfig( flags, roisKey="EMRoIs" ):
acc.merge(TrigInDetCondConfig(flags))
from InDetRecExample.InDetKeys import InDetKeys
- #Create IdentifiableCaches
- from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__CacheCreator
- InDetCacheCreatorTrigViews = InDet__CacheCreator(name = "InDetCacheCreatorTrigViews",
- Pixel_ClusterKey = "PixelTrigClustersCache",
- SCT_ClusterKey = "SCT_ClustersCache",
- SpacePointCachePix = "PixelSpacePointCache",
- SpacePointCacheSCT = "SctSpacePointCache",
- SCTRDOCacheKey = "SctRDOCache",
- PixRDOCacheKey = "PixRDOCache",)
-
- acc.addCondAlgo( InDetCacheCreatorTrigViews )
#Only add raw data decoders if we're running over raw data
isMC = flags.Input.isMC
@@ -238,7 +252,7 @@ def TrigInDetConfig( flags, roisKey="EMRoIs" ):
#OutputLevel = INFO)
InDetPixelRawDataProvider.isRoI_Seeded = True
InDetPixelRawDataProvider.RoIs = roisKey
- InDetPixelRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.PixRDOCacheKey
+ InDetPixelRawDataProvider.RDOCacheKey = InDetCacheNames.PixRDOCacheKey
acc.addEventAlgo(InDetPixelRawDataProvider)
@@ -262,7 +276,7 @@ def TrigInDetConfig( flags, roisKey="EMRoIs" ):
#OutputLevel = INFO)
InDetSCTRawDataProvider.isRoI_Seeded = True
InDetSCTRawDataProvider.RoIs = roisKey
- InDetSCTRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.SCTRDOCacheKey
+ InDetSCTRawDataProvider.RDOCacheKey = InDetCacheNames.SCTRDOCacheKey
acc.addEventAlgo(InDetSCTRawDataProvider)
@@ -337,7 +351,7 @@ def TrigInDetConfig( flags, roisKey="EMRoIs" ):
ClustersName = "PixelTrigClusters",)# OutputLevel = INFO)
InDetPixelClusterization.isRoI_Seeded = True
InDetPixelClusterization.RoIs = roisKey
- InDetPixelClusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.Pixel_ClusterKey
+ InDetPixelClusterization.ClusterContainerCacheKey = InDetCacheNames.Pixel_ClusterKey
acc.addEventAlgo(InDetPixelClusterization)
@@ -382,7 +396,7 @@ def TrigInDetConfig( flags, roisKey="EMRoIs" ):
conditionsTool = InDetSCT_ConditionsSummaryToolWithoutFlagged)
InDetSCT_Clusterization.isRoI_Seeded = True
InDetSCT_Clusterization.RoIs = roisKey
- InDetSCT_Clusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.SCT_ClusterKey
+ InDetSCT_Clusterization.ClusterContainerCacheKey = InDetCacheNames.SCT_ClusterKey
acc.addEventAlgo(InDetSCT_Clusterization)
@@ -405,8 +419,8 @@ def TrigInDetConfig( flags, roisKey="EMRoIs" ):
ProcessPixels = DetFlags.haveRIO.pixel_on(),
ProcessSCTs = DetFlags.haveRIO.SCT_on(),
ProcessOverlaps = DetFlags.haveRIO.SCT_on(),
- SpacePointCacheSCT = InDetCacheCreatorTrigViews.SpacePointCacheSCT,
- SpacePointCachePix = InDetCacheCreatorTrigViews.SpacePointCachePix,)
+ SpacePointCacheSCT = InDetCacheNames.SpacePointCacheSCT,
+ SpacePointCachePix = InDetCacheNames.SpacePointCachePix,)
#OutputLevel=INFO)
acc.addEventAlgo(InDetSiTrackerSpacePointFinder)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
index 30c1091e46c9481cdfc1ab234d52f3d3f880a9fc..690e08dc747dca06fdbb0542ccbdd645ce3443a6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
@@ -2,13 +2,16 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
#
-def makeInDetAlgs():
+def makeInDetAlgs( whichSignature='' ):
+ #If signature specified add suffix to the algorithms
+ signature = "_" + whichSignature if whichSignature else ''
+
eventAlgs = []
viewAlgs = []
from InDetRecExample.InDetKeys import InDetKeys
#Create IdentifiableCaches
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__CacheCreator
- InDetCacheCreatorTrigViews = InDet__CacheCreator(name = "InDetCacheCreatorTrigViews",
+ InDetCacheCreatorTrigViews = InDet__CacheCreator(name = "InDetCacheCreatorTrigViews" + signature,
Pixel_ClusterKey = "PixelTrigClustersCache",
SCT_ClusterKey = "SCT_ClustersCache",
SpacePointCachePix = "PixelSpacePointCache",
@@ -27,11 +30,11 @@ def makeInDetAlgs():
#Pixel
from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRodDecoder
- InDetPixelRodDecoder = PixelRodDecoder(name = "InDetPixelRodDecoder")
+ InDetPixelRodDecoder = PixelRodDecoder(name = "InDetPixelRodDecoder" + signature)
ToolSvc += InDetPixelRodDecoder
from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProviderTool
- InDetPixelRawDataProviderTool = PixelRawDataProviderTool(name = "InDetPixelRawDataProviderTool",
+ InDetPixelRawDataProviderTool = PixelRawDataProviderTool(name = "InDetPixelRawDataProviderTool" + signature,
Decoder = InDetPixelRodDecoder)
ToolSvc += InDetPixelRawDataProviderTool
@@ -41,7 +44,7 @@ def makeInDetAlgs():
# load the PixelRawDataProvider
from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProvider
- InDetPixelRawDataProvider = PixelRawDataProvider(name = "InDetPixelRawDataProvider",
+ InDetPixelRawDataProvider = PixelRawDataProvider(name = "InDetPixelRawDataProvider"+ signature,
RDOKey = InDetKeys.PixelRDOs(),
ProviderTool = InDetPixelRawDataProviderTool,)
#OutputLevel = INFO)
@@ -58,12 +61,12 @@ def makeInDetAlgs():
#SCT
from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCT_RodDecoder
- InDetSCTRodDecoder = SCT_RodDecoder(name = "InDetSCTRodDecoder",)
+ InDetSCTRodDecoder = SCT_RodDecoder(name = "InDetSCTRodDecoder" + signature)
# OutputLevel = INFO)
ToolSvc += InDetSCTRodDecoder
from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTRawDataProviderTool
- InDetSCTRawDataProviderTool = SCTRawDataProviderTool(name = "InDetSCTRawDataProviderTool",
+ InDetSCTRawDataProviderTool = SCTRawDataProviderTool(name = "InDetSCTRawDataProviderTool" + signature,
Decoder = InDetSCTRodDecoder)
ToolSvc += InDetSCTRawDataProviderTool
if (InDetFlags.doPrintConfigurables()):
@@ -71,7 +74,7 @@ def makeInDetAlgs():
# load the SCTRawDataProvider
from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTRawDataProvider
- InDetSCTRawDataProvider = SCTRawDataProvider(name = "InDetSCTRawDataProvider",
+ InDetSCTRawDataProvider = SCTRawDataProvider(name = "InDetSCTRawDataProvider" + signature,
RDOKey = InDetKeys.SCT_RDOs(),
ProviderTool = InDetSCTRawDataProviderTool, )
#OutputLevel = INFO)
@@ -83,7 +86,7 @@ def makeInDetAlgs():
# load the SCTEventFlagWriter
from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTEventFlagWriter
- InDetSCTEventFlagWriter = SCTEventFlagWriter(name = "InDetSCTEventFlagWriter")
+ InDetSCTEventFlagWriter = SCTEventFlagWriter(name = "InDetSCTEventFlagWriter"+ signature)
viewAlgs.append(InDetSCTEventFlagWriter)
@@ -94,23 +97,23 @@ def makeInDetAlgs():
ServiceMgr += InDetTRTCalDbSvc
from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummarySvc
- InDetTRTStrawStatusSummarySvc = TRT_StrawStatusSummarySvc(name = "InDetTRTStrawStatusSummarySvc")
+ InDetTRTStrawStatusSummarySvc = TRT_StrawStatusSummarySvc(name = "InDetTRTStrawStatusSummarySvc" + signature)
ServiceMgr += InDetTRTStrawStatusSummarySvc
from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRT_RodDecoder
- InDetTRTRodDecoder = TRT_RodDecoder(name = "InDetTRTRodDecoder",
+ InDetTRTRodDecoder = TRT_RodDecoder(name = "InDetTRTRodDecoder" + signature,
LoadCompressTableDB = True)#(globalflags.DataSource() != 'geant4'))
ToolSvc += InDetTRTRodDecoder
from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProviderTool
- InDetTRTRawDataProviderTool = TRTRawDataProviderTool(name = "InDetTRTRawDataProviderTool",
+ InDetTRTRawDataProviderTool = TRTRawDataProviderTool(name = "InDetTRTRawDataProviderTool" + signature,
Decoder = InDetTRTRodDecoder)
ToolSvc += InDetTRTRawDataProviderTool
# load the TRTRawDataProvider
from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProvider
- InDetTRTRawDataProvider = TRTRawDataProvider(name = "InDetTRTRawDataProvider",
+ InDetTRTRawDataProvider = TRTRawDataProvider(name = "InDetTRTRawDataProvider" + signature,
RDOKey = "TRT_RDOs",
ProviderTool = InDetTRTRawDataProviderTool)
InDetTRTRawDataProvider.isRoI_Seeded = True
@@ -123,7 +126,7 @@ def makeInDetAlgs():
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import TrigPixelLorentzAngleTool, TrigSCTLorentzAngleTool
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
- InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
+ InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool" + signature,
PixelCalibSvc = None,
UsePixelCalibCondDB = False,
SCTLorentzAngleTool = TrigSCTLorentzAngleTool,
@@ -133,7 +136,7 @@ def makeInDetAlgs():
from SiClusterizationTool.SiClusterizationToolConf import InDet__MergedPixelsTool
- InDetMergedPixelsTool = InDet__MergedPixelsTool(name = "InDetMergedPixelsTool",
+ InDetMergedPixelsTool = InDet__MergedPixelsTool(name = "InDetMergedPixelsTool" + signature,
globalPosAlg = InDetClusterMakerTool,
MinimalSplitSize = 0,
MaximalSplitSize = 49,
@@ -143,11 +146,11 @@ def makeInDetAlgs():
ToolSvc += InDetMergedPixelsTool
from SiClusterizationTool.SiClusterizationToolConf import InDet__PixelGangedAmbiguitiesFinder
- InDetPixelGangedAmbiguitiesFinder = InDet__PixelGangedAmbiguitiesFinder(name = "InDetPixelGangedAmbiguitiesFinder")
+ InDetPixelGangedAmbiguitiesFinder = InDet__PixelGangedAmbiguitiesFinder(name = "InDetPixelGangedAmbiguitiesFinder" + signature)
ToolSvc += InDetPixelGangedAmbiguitiesFinder
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__PixelClusterization
- InDetPixelClusterization = InDet__PixelClusterization(name = "InDetPixelClusterization",
+ InDetPixelClusterization = InDet__PixelClusterization(name = "InDetPixelClusterization" + signature,
clusteringTool = InDetMergedPixelsTool,
gangedAmbiguitiesFinder = InDetPixelGangedAmbiguitiesFinder,
DetectorManagerName = InDetKeys.PixelManager(),
@@ -167,7 +170,7 @@ def makeInDetAlgs():
# InDetSCT_FlaggedConditionTool = sct_FlaggedConditionToolSetup.getTool()
from SCT_ConditionsTools.SCT_ConditionsSummaryToolSetup import SCT_ConditionsSummaryToolSetup
- sct_ConditionsSummaryToolSetup = SCT_ConditionsSummaryToolSetup("InDetSCT_ConditionsSummaryTool")
+ sct_ConditionsSummaryToolSetup = SCT_ConditionsSummaryToolSetup("InDetSCT_ConditionsSummaryTool" + signature)
sct_ConditionsSummaryToolSetup.setup()
InDetSCT_ConditionsSummaryTool = sct_ConditionsSummaryToolSetup.getTool()
condTools = []
@@ -177,7 +180,7 @@ def makeInDetAlgs():
if condTool not in condTools:
if condTool != "SCT_FlaggedConditionTool/InDetSCT_FlaggedConditionTool":
condTools.append(condTool)
- sct_ConditionsSummaryToolSetupWithoutFlagged = SCT_ConditionsSummaryToolSetup("InDetSCT_ConditionsSummaryToolWithoutFlagged")
+ sct_ConditionsSummaryToolSetupWithoutFlagged = SCT_ConditionsSummaryToolSetup("InDetSCT_ConditionsSummaryToolWithoutFlagged" + signature)
sct_ConditionsSummaryToolSetupWithoutFlagged.setup()
InDetSCT_ConditionsSummaryToolWithoutFlagged = sct_ConditionsSummaryToolSetupWithoutFlagged.getTool()
InDetSCT_ConditionsSummaryToolWithoutFlagged.ConditionsTools = condTools
@@ -186,7 +189,7 @@ def makeInDetAlgs():
# --- SCT_ClusteringTool (public)
#
from SiClusterizationTool.SiClusterizationToolConf import InDet__SCT_ClusteringTool
- InDetSCT_ClusteringTool = InDet__SCT_ClusteringTool(name = "InDetSCT_ClusteringTool",
+ InDetSCT_ClusteringTool = InDet__SCT_ClusteringTool(name = "InDetSCT_ClusteringTool" + signature,
globalPosAlg = InDetClusterMakerTool,
conditionsTool = InDetSCT_ConditionsSummaryToolWithoutFlagged)
#
@@ -194,7 +197,7 @@ def makeInDetAlgs():
#
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__SCT_Clusterization
- InDetSCT_Clusterization = InDet__SCT_Clusterization(name = "InDetSCT_Clusterization",
+ InDetSCT_Clusterization = InDet__SCT_Clusterization(name = "InDetSCT_Clusterization" + signature,
clusteringTool = InDetSCT_ClusteringTool,
# ChannelStatus = InDetSCT_ChannelStatusAlg,
DataObjectName = InDetKeys.SCT_RDOs(),
@@ -210,12 +213,12 @@ def makeInDetAlgs():
#Space points and FTF
from SiSpacePointTool.SiSpacePointToolConf import InDet__SiSpacePointMakerTool
- InDetSiSpacePointMakerTool = InDet__SiSpacePointMakerTool(name = "InDetSiSpacePointMakerTool")
+ InDetSiSpacePointMakerTool = InDet__SiSpacePointMakerTool(name = "InDetSiSpacePointMakerTool" + signature)
ToolSvc += InDetSiSpacePointMakerTool
from AthenaCommon.DetFlags import DetFlags
from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiTrackerSpacePointFinder
- InDetSiTrackerSpacePointFinder = InDet__SiTrackerSpacePointFinder(name = "InDetSiTrackerSpacePointFinder",
+ InDetSiTrackerSpacePointFinder = InDet__SiTrackerSpacePointFinder(name = "InDetSiTrackerSpacePointFinder" + signature,
SiSpacePointMakerTool = InDetSiSpacePointMakerTool,
PixelsClustersName = "PixelTrigClusters",
SCT_ClustersName = "SCT_TrigClusters",
@@ -239,13 +242,13 @@ def makeInDetAlgs():
# Setup alignment folders and conditions algorithms
from InDetCondFolders import InDetAlignFolders
from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiElementPropertiesTableCondAlg
- condSeq += InDet__SiElementPropertiesTableCondAlg(name = "InDetSiElementPropertiesTableCondAlg")
+ condSeq += InDet__SiElementPropertiesTableCondAlg(name = "InDetSiElementPropertiesTableCondAlg" + signature)
from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool
from TrigInDetConf.TrigInDetPostTools import InDetTrigParticleCreatorToolFTF
from InDetTrigParticleCreation.InDetTrigParticleCreationConf import InDet__TrigTrackingxAODCnvMT
- theTrackParticleCreatorAlg = InDet__TrigTrackingxAODCnvMT(name = "InDetTrigTrackParticleCreatorAlg",
+ theTrackParticleCreatorAlg = InDet__TrigTrackingxAODCnvMT(name = "InDetTrigTrackParticleCreatorAlg" + signature,
doIBLresidual = False,
TrackName = "TrigFastTrackFinder_Tracks",
TrackParticlesName = "xAODTracks",
@@ -253,6 +256,7 @@ def makeInDetAlgs():
theTrackParticleCreatorAlg.roiCollectionName = "EMViewRoIs"
viewAlgs.append(theTrackParticleCreatorAlg)
-
+
+
return (viewAlgs, eventAlgs)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref
index e3e3846fd41d159f15b516788dcd1f7094530e1b..8373d8fc4fa8e311a2c270ff4b0b75ee45fe453b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/RunMenuTest.ref
@@ -2,8 +2,8 @@ TrigSignatureMoniMT INFO Chains passing step (1st
TrigSignatureMoniMT INFO Chain name L1, AfterPS, [... steps ...], Output
TrigSignatureMoniMT INFO All 20 20 0 0 17
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 18 17 17
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 262
+TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 54 342
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 17 16 16
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 251
+TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 50 329
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 15 14 14
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 205
+TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 36 264
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref
index bf716b4bc559821984a2cfa5718aef8d52a1b301..7f1e238a59688cd7bbb989cb5d8af67f73a23a08 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref
@@ -1,6 +1,6 @@
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 100 100 30 24 24
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 decisions 237 97
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split 100 100 30 24 24
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split decisions 237 97
-TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split 100 100 30 24 24
-TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split decisions 237 97
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 100 100 28 22 22
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 decisions 61 38
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split 100 100 28 22 22
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split decisions 61 38
+TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split 100 100 28 22 22
+TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split decisions 61 38
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenuALLTE.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenuALLTE.ref
index bf716b4bc559821984a2cfa5718aef8d52a1b301..7f1e238a59688cd7bbb989cb5d8af67f73a23a08 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenuALLTE.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenuALLTE.ref
@@ -1,6 +1,6 @@
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 100 100 30 24 24
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 decisions 237 97
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split 100 100 30 24 24
-TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split decisions 237 97
-TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split 100 100 30 24 24
-TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split decisions 237 97
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 100 100 28 22 22
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 decisions 61 38
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split 100 100 28 22 22
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split decisions 61 38
+TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split 100 100 28 22 22
+TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split decisions 61 38
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
index 19ef84faf0d755e528139c3f5254fa14277c9e50..06ad199e389d1848358a3cae6b11daf0733ba886 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
@@ -119,7 +119,7 @@ decisionObjectsToRecord = []
for d in decisionObjects:
decisionObjectsToRecord.extend([
"xAOD::TrigCompositeContainer_v1#%s" % d,
- "xAOD::TrigCompositeAuxContainer_v2#%s.decisions" % d
+ "xAOD::TrigCompositeAuxContainer_v2#%s." % d
])
##########################################
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 474e1c36b3f0a87a9d39ba72c4bd7f0307f565c5..00c05345fad1382118dc87f2e7a93cd4a9b81cbb 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -349,7 +349,7 @@ serialiser = TriggerEDMSerialiserToolCfg("Serialiser")
serialiser.OutputLevel=VERBOSE
serialiser.addCollectionListToMainResult([
"xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions",
- "xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux.decisions",
+ "xAOD::TrigCompositeAuxContainer_v2#remap_EgammaCaloDecisionsAux.",
"xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters",
"xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux.RoIword.clusterQuality.e233.e237.e277.e2tsts1.ehad1.emaxs1.energy.energySample.et.eta.eta1.fracs1.nCells.phi.rawEnergy.rawEnergySample.rawEt.rawEta.rawPhi.viewIndex.weta2.wstot",
"xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex",
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
index 1c772ff2c5efe1023d0853f5f99752afdcb877a1..0ae91dd2c15987a6d8412bd3200007d23ad0d0a8 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
@@ -1,129 +1,115 @@
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :380 bytes
-HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 128 bytes from 1x DynAux : 508
+HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :396 bytes
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :804 bytes
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 88 bytes from 1x DynAux : 892
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :748 bytes
-HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 1392 bytes from 14x DynAux : 2140
+HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1116 bytes
+HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 1616 bytes from 14x DynAux : 2732
HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :664 bytes
-HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG Fragment size including 184 bytes from 1x DynAux : 848
+HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :740 bytes
HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1764 bytes
HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG Fragment size including 100 bytes from 1x DynAux : 1864
HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :2864 bytes
-HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG Fragment size including 2680 bytes from 14x DynAux : 5544
+HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3140 bytes
+HLTRMakerAlg.MKTool.Serialiser 1 0 DEBUG Fragment size including 2848 bytes from 14x DynAux : 5988
HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :856 bytes
-HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG Fragment size including 204 bytes from 1x DynAux : 1060
+HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :948 bytes
HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :2404 bytes
HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG Fragment size including 108 bytes from 1x DynAux : 2512
HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1760 bytes
-HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG Fragment size including 2008 bytes from 14x DynAux : 3768
+HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :2864 bytes
+HLTRMakerAlg.MKTool.Serialiser 2 0 DEBUG Fragment size including 2680 bytes from 14x DynAux : 5544
HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :664 bytes
-HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG Fragment size including 172 bytes from 1x DynAux : 836
+HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :728 bytes
HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1764 bytes
HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG Fragment size including 100 bytes from 1x DynAux : 1864
HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3324 bytes
-HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG Fragment size including 2960 bytes from 14x DynAux : 6284
+HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3692 bytes
+HLTRMakerAlg.MKTool.Serialiser 3 0 DEBUG Fragment size including 3184 bytes from 14x DynAux : 6876
HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :476 bytes
-HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG Fragment size including 152 bytes from 1x DynAux : 628
+HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :516 bytes
HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1124 bytes
HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG Fragment size including 92 bytes from 1x DynAux : 1216
HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1024 bytes
-HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG Fragment size including 1560 bytes from 14x DynAux : 2584
+HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1484 bytes
+HLTRMakerAlg.MKTool.Serialiser 4 0 DEBUG Fragment size including 1840 bytes from 14x DynAux : 3324
HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :948 bytes
-HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG Fragment size including 212 bytes from 1x DynAux : 1160
+HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :1052 bytes
HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :2724 bytes
HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG Fragment size including 112 bytes from 1x DynAux : 2836
HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :4612 bytes
-HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG Fragment size including 3744 bytes from 14x DynAux : 8356
+HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :7004 bytes
+HLTRMakerAlg.MKTool.Serialiser 5 0 DEBUG Fragment size including 5200 bytes from 14x DynAux : 12204
HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :380 bytes
-HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG Fragment size including 132 bytes from 1x DynAux : 512
+HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :400 bytes
HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :804 bytes
HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG Fragment size including 88 bytes from 1x DynAux : 892
HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1208 bytes
-HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG Fragment size including 1672 bytes from 14x DynAux : 2880
+HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :840 bytes
+HLTRMakerAlg.MKTool.Serialiser 6 0 DEBUG Fragment size including 1448 bytes from 14x DynAux : 2288
HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :568 bytes
-HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG Fragment size including 160 bytes from 1x DynAux : 728
+HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :620 bytes
HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1444 bytes
HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG Fragment size including 96 bytes from 1x DynAux : 1540
HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3048 bytes
-HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG Fragment size including 2792 bytes from 14x DynAux : 5840
+HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :2312 bytes
+HLTRMakerAlg.MKTool.Serialiser 7 0 DEBUG Fragment size including 2344 bytes from 14x DynAux : 4656
HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :476 bytes
-HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG Fragment size including 160 bytes from 1x DynAux : 636
+HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :524 bytes
HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1124 bytes
HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG Fragment size including 92 bytes from 1x DynAux : 1216
HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :840 bytes
-HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG Fragment size including 1448 bytes from 14x DynAux : 2288
+HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1208 bytes
+HLTRMakerAlg.MKTool.Serialiser 8 0 DEBUG Fragment size including 1672 bytes from 14x DynAux : 2880
HLTRMakerAlg.MKTool.Serialiser 9 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 9 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :284 bytes
+HLTRMakerAlg.MKTool.Serialiser 9 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :296 bytes
HLTRMakerAlg.MKTool.Serialiser 9 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 9 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :484 bytes
HLTRMakerAlg.MKTool.Serialiser 9 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
HLTRMakerAlg.MKTool.Serialiser 9 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :472 bytes
HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :664 bytes
-HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG Fragment size including 204 bytes from 1x DynAux : 868
+HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :760 bytes
HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1764 bytes
HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG Fragment size including 100 bytes from 1x DynAux : 1864
HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3508 bytes
-HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG Fragment size including 3072 bytes from 14x DynAux : 6580
+HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3876 bytes
+HLTRMakerAlg.MKTool.Serialiser 10 0 DEBUG Fragment size including 3296 bytes from 14x DynAux : 7172
HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :380 bytes
-HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG Fragment size including 128 bytes from 1x DynAux : 508
+HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :396 bytes
HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :804 bytes
HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG Fragment size including 88 bytes from 1x DynAux : 892
HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :840 bytes
-HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG Fragment size including 1448 bytes from 14x DynAux : 2288
+HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :656 bytes
+HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG Fragment size including 1336 bytes from 14x DynAux : 1992
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :1044 bytes
-HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 256 bytes from 1x DynAux : 1300
+HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :1192 bytes
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :3044 bytes
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 116 bytes from 1x DynAux : 3160
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3876 bytes
-HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 3296 bytes from 14x DynAux : 7172
+HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :5440 bytes
+HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 4248 bytes from 14x DynAux : 9688
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :476 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 164 bytes from 1x DynAux : 640
+HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :528 bytes
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1124 bytes
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 92 bytes from 1x DynAux : 1216
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :2496 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 2456 bytes from 14x DynAux : 4952
+HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3324 bytes
+HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 2960 bytes from 14x DynAux : 6284
HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :380 bytes
-HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG Fragment size including 132 bytes from 1x DynAux : 512
+HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :400 bytes
HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :804 bytes
HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG Fragment size including 88 bytes from 1x DynAux : 892
@@ -131,31 +117,28 @@ HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG xAOD::TrigElectronContai
HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :748 bytes
HLTRMakerAlg.MKTool.Serialiser 14 0 DEBUG Fragment size including 1392 bytes from 14x DynAux : 2140
HLTRMakerAlg.MKTool.Serialiser 15 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 15 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :284 bytes
+HLTRMakerAlg.MKTool.Serialiser 15 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :296 bytes
HLTRMakerAlg.MKTool.Serialiser 15 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 15 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :484 bytes
HLTRMakerAlg.MKTool.Serialiser 15 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
HLTRMakerAlg.MKTool.Serialiser 15 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :472 bytes
HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :380 bytes
-HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG Fragment size including 124 bytes from 1x DynAux : 504
+HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :392 bytes
HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :804 bytes
HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG Fragment size including 88 bytes from 1x DynAux : 892
HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
HLTRMakerAlg.MKTool.Serialiser 16 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :472 bytes
HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :476 bytes
-HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG Fragment size including 164 bytes from 1x DynAux : 640
+HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :528 bytes
HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1124 bytes
HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG Fragment size including 92 bytes from 1x DynAux : 1216
HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1392 bytes
-HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG Fragment size including 1784 bytes from 14x DynAux : 3176
+HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1852 bytes
+HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG Fragment size including 2064 bytes from 14x DynAux : 3916
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :476 bytes
-HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 160 bytes from 1x DynAux : 636
+HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :524 bytes
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1124 bytes
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 92 bytes from 1x DynAux : 1216
@@ -163,21 +146,20 @@ HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigElectronContai
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :840 bytes
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 1448 bytes from 14x DynAux : 2288
HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigCompositeContainer#remap_EgammaCaloDecisions Fragment size :180 bytes
-HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :568 bytes
-HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG Fragment size including 152 bytes from 1x DynAux : 720
+HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigCompositeAuxContainer#remap_EgammaCaloDecisionsAux. Fragment size :612 bytes
HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1444 bytes
HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG Fragment size including 96 bytes from 1x DynAux : 1540
HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex Fragment size :196 bytes
-HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :3324 bytes
-HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG Fragment size including 2960 bytes from 14x DynAux : 6284
+HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :5624 bytes
+HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG Fragment size including 4360 bytes from 14x DynAux : 9984
TrigSignatureMoniMT INFO HLT_2e3_etcut 20 10 6 5 5
-TrigSignatureMoniMT INFO HLT_2e3_etcut decisions 16 83
-TrigSignatureMoniMT INFO HLT_e3_e5_etcut 20 20 12 10 10
-TrigSignatureMoniMT INFO HLT_e3_e5_etcut decisions 46 215
+TrigSignatureMoniMT INFO HLT_2e3_etcut decisions 16 100
+TrigSignatureMoniMT INFO HLT_e3_e5_etcut 20 20 12 11 11
+TrigSignatureMoniMT INFO HLT_e3_e5_etcut decisions 46 279
TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 8 8
-TrigSignatureMoniMT INFO HLT_e3_etcut decisions 22 107
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 22 140
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 17 17
-TrigSignatureMoniMT INFO HLT_e5_etcut decisions 52 255
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 52 333
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 11 11 11
-TrigSignatureMoniMT INFO HLT_e7_etcut decisions 17 119
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 17 173
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref
index 8e8cfe440bebbaa461fd8c198a1a0359ce07b417..9e7fb876f609783fd025f673b027c14ccc01c35d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref
@@ -94,10 +94,10 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#243
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 7 7
-TrigSignatureMoniMT INFO HLT_e3_etcut decisions 22 105
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 22 137
TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18
TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16
-TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 251
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 329
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 14
-TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 205
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 264
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
index f235b86abb82468c5f2906284ba1024f2872bddc..3038ae267ade58a248390d2a42e8711dbf7cd61e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
@@ -188,15 +188,15 @@ TrigSignatureMoniMT INFO HLT_2mu6 decisions
TrigSignatureMoniMT INFO HLT_2mu6Comb 20 20 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17
-TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 262
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 343
TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18
TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0
TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 20 20 10 0 1
TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 decisions 17 0
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16
-TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 251
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 330
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 14
-TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 205
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 265
TrigSignatureMoniMT INFO HLT_g5_etcut 20 20 17 17 17
TrigSignatureMoniMT INFO HLT_g5_etcut decisions 50 50
TrigSignatureMoniMT INFO HLT_j100 20 20 6 0 6
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met_standalone.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/met_standalone.ref
index 0fd92ec58434e564311a669c5d747b1f1f10bb46..411aed960438769b9fc0df4c9c08fab56173fb31 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met_standalone.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met_standalone.ref
@@ -1,4 +1,4 @@
-METHypoAlg 0 0 DEBUG The MET value is 82
+METHypoAlg 0 0 DEBUG The MET value is 81
METHypoAlg 1 0 DEBUG The MET value is 31
METHypoAlg 2 0 DEBUG The MET value is 39
METHypoAlg 3 0 DEBUG The MET value is 67
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
index 11a3085361381bd3bbd2da276afe0ead09901723..40cec9c91507044bb75b21d8cb2fc5b944259851 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
@@ -3,8 +3,10 @@ TriggerSummaryStep1 4 0 DEBUG +++ HLT_mu6Comb ID#3933
TriggerSummaryStep1 4 0 DEBUG +++ HLT_mu6nol1 ID#1250234908
TriggerSummaryStep1 4 0 DEBUG +++ HLT_mu6 ID#1672162766
TriggerSummaryStep1 4 0 DEBUG +++ HLT_mu6fast ID#2393852230
+TriggerSummaryStep2 4 0 DEBUG +++ HLT_mu20_ivar ID#267444585
TriggerSummaryStep2 4 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep2 4 0 DEBUG +++ HLT_mu6 ID#1672162766
+TriggerSummaryStep3 4 0 DEBUG +++ HLT_mu20_ivar ID#267444585
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6nol1 ID#1250234908
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6 ID#1672162766
@@ -22,8 +24,8 @@ TrigSignatureMoniMT INFO HLT_2mu6
TrigSignatureMoniMT INFO HLT_2mu6 decisions 2 2 2 0
TrigSignatureMoniMT INFO HLT_2mu6Comb 10 10 1 1 0 0 1
TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 2 2 0 0
-TrigSignatureMoniMT INFO HLT_mu20_ivar 10 10 1 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 1 0 0 0
+TrigSignatureMoniMT INFO HLT_mu20_ivar 10 10 1 1 1 0 1
+TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 1 1 1 0
TrigSignatureMoniMT INFO HLT_mu6 10 10 2 2 1 1 1
TrigSignatureMoniMT INFO HLT_mu6 decisions 3 3 2 1
TrigSignatureMoniMT INFO HLT_mu6Comb 10 10 2 2 0 0 2
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
index 50fbefbe84304dbddb1968a7c723aaff4a1c8eae..52d08bb197a1867bcebbcdcc4025ddaafe42608c 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
@@ -61,15 +61,6 @@ acc.merge( TrigInDetCondConfig( flags ) )
acc.getEventAlgo( "TrigSignatureMoniMT" ).OutputLevel=DEBUG
print acc.getEventAlgo( "TrigSignatureMoniMT" )
-topSequence = acc.getSequence("HLTTop")
-muonCacheCreatorName = "MuonCacheCreator"
-mcc = findAlgorithm( topSequence, muonCacheCreatorName )
-if mcc:
- owner = findOwningSequence( topSequence, muonCacheCreatorName )
- owner.remove( mcc )
- top = acc.getSequence("AthAlgSeq")
- top += mcc
-
# from TrigUpgradeTest.TestUtils import applyMenu
# applyMenu( acc.getEventAlgo( "L1Decoder" ) )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
index 5c2e333931c91e8850c3fc65a1d5b99672c18c66..45862afb45c47defcb21e35248d16973d819b481 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
@@ -120,7 +120,7 @@ decisionObjectsToRecord = []
for d in decisionObjects:
decisionObjectsToRecord.extend([
"xAOD::TrigCompositeContainer_v1#%s" % d,
- "xAOD::TrigCompositeAuxContainer_v2#%s.decisions" % d
+ "xAOD::TrigCompositeAuxContainer_v2#%s." % d
])
##########################################
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
index 4fbecdf062ba037b8cbf1400c613b0acd98bc683..87274d1411ce01ca11aab93c15a8d44ebf3c2df9 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
@@ -32,10 +32,10 @@ class opt :
enableCostD3PD = False # enable cost monitoring
doL1Unpacking = True # decode L1 data in input file if True, else setup emulation
doL1Sim = False # (re)run L1 simulation
+ isOnline = False # isOnline flag (TEMPORARY HACK, should be True by default)
#
################################################################################
-import AthenaCommon.CfgMgr as CfgMgr
from AthenaCommon.AppMgr import theApp, ServiceMgr as svcMgr
from AthenaCommon.Logging import logging
log = logging.getLogger('testHLT_MT.py')
@@ -48,9 +48,9 @@ defaultOptions = [a for a in dir(opt) if not a.startswith('__')]
for option in defaultOptions:
if option in globals():
setattr(opt, option, globals()[option])
- print ' %20s = %s' % (option, getattr(opt, option))
+ print(' %20s = %s' % (option, getattr(opt, option)))
else:
- print ' %20s = (Default) %s' % (option, getattr(opt, option))
+ print(' %20s = (Default) %s' % (option, getattr(opt, option)))
#-------------------------------------------------------------
# Setting Global Flags
@@ -61,35 +61,38 @@ from AthenaCommon.BeamFlags import jobproperties
from TriggerJobOpts.TriggerFlags import TriggerFlags
import TriggerRelease.Modifiers
-# Input format and file for athena running
+# Auto-configuration for athena
if len(athenaCommonFlags.FilesInput())>0:
- from RecExConfig.AutoConfiguration import ConfigureFromListOfKeys, GetRunNumber
- ConfigureFromListOfKeys(['everything'])
- TriggerRelease.Modifiers._run_number = GetRunNumber()
-else:
- if '_run_number' in dir(): TriggerRelease.Modifiers._run_number = _run_number # set by athenaHLT
- globalflags.InputFormat = 'bytestream' # default for athenaHLT
- if opt.setupForMC:
- globalflags.DetGeo = 'atlas'
- globalflags.DataSource = 'geant4'
- else:
- globalflags.DetGeo = 'commis'
- globalflags.DataSource = 'data'
- jobproperties.Beam.beamType = 'collisions'
- jobproperties.Beam.bunchSpacing = 25
- globalflags.DetDescrVersion = TriggerFlags.OnlineGeoTag()
- globalflags.ConditionsTag = TriggerFlags.OnlineCondTag()
-
-
-# Overwrite tags if specified on command line
-if opt.setDetDescr is not None:
- globalflags.DetDescrVersion = opt.setDetDescr
-if opt.setGlobalTag is not None:
- globalflags.ConditionsTag = opt.setGlobalTag
-
+ import PyUtils.AthFile as athFile
+ af = athFile.fopen(athenaCommonFlags.FilesInput()[0])
+ globalflags.InputFormat = 'bytestream' if af.fileinfos['file_type']=='bs' else 'pool'
+ globalflags.DataSource = 'data' if af.fileinfos['evt_type'][0]=='IS_DATA' else 'geant4'
+ if opt.setDetDescr is None:
+ opt.setDetDescr = af.fileinfos.get('geometry',None)
+ if opt.setGlobalTag is None:
+ opt.setGlobalTag = af.fileinfos.get('conditions_tag',None) or \
+ (TriggerFlags.OnlineCondTag() if opt.isOnline else 'CONDBR2-BLKPA-2018-13')
+ TriggerRelease.Modifiers._run_number = af.fileinfos['run_number'][0]
+
+else: # athenaHLT
+ globalflags.InputFormat = 'bytestream'
+ globalflags.DataSource = 'data' if not opt.setupForMC else 'data'
+ if '_run_number' in dir():
+ TriggerRelease.Modifiers._run_number = _run_number # noqa, set by athenaHLT
+ del _run_number
+
+# Set final Cond/Geo tag based on input file, command line or default
+globalflags.DetDescrVersion = opt.setDetDescr or TriggerFlags.OnlineGeoTag()
+globalflags.ConditionsTag = opt.setGlobalTag or TriggerFlags.OnlineCondTag()
+
+# Other defaults
+jobproperties.Beam.beamType = 'collisions'
+jobproperties.Beam.bunchSpacing = 25
globalflags.DatabaseInstance='CONDBR2' if opt.useCONDBR2 else 'COMP200'
+athenaCommonFlags.isOnline.set_Value_and_Lock(opt.isOnline)
-athenaCommonFlags.isOnline = False # for the moment, run in offline mode
+log.info('Configured the following global flags:')
+globalflags.print_JobProperties()
#-------------------------------------------------------------
# Transfer flags into TriggerFlags
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
index 94b86c7dfa59afef4fd0b43da787a54b6971f267..a220b43967725e4388bf3e4f3a4ff06955ce3278 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
@@ -6,9 +6,9 @@
#include "TestHypoAlg.h"
namespace HLTTest {
-
+
TestHypoAlg::TestHypoAlg( const std::string& name, ISvcLocator* pSvcLocator )
- : ::HypoBase( name, pSvcLocator ) {}
+ : ::HypoBase( name, pSvcLocator ) {}
TestHypoAlg::~TestHypoAlg() {}
@@ -51,9 +51,9 @@ namespace HLTTest {
// find features:
std::vector<const FeatureOBJ*> featureFromDecision;
- for ( auto previousDecision: *previousDecisionsHandle ) {
- auto linkInfo = TrigCompositeUtils::findLink<FeatureContainer>(previousDecision, m_linkName.value());
- auto featureLink = linkInfo.link;
+ for ( const auto previousDecision: *previousDecisionsHandle ) {
+ const auto linkInfo = TrigCompositeUtils::findLink<FeatureContainer>(previousDecision, m_linkName.value());
+ const auto featureLink = linkInfo.link;
CHECK( featureLink.isValid() );
const FeatureOBJ* feature = *featureLink;
featureFromDecision.push_back( feature);
@@ -62,51 +62,50 @@ namespace HLTTest {
//map reco object and decision: find in reco obejct the initial RoI and map it to the correct decision
size_t reco_counter = 0;
- for (auto recoobj: *recoInput){
- auto roiInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( recoobj, "initialRoI" );
- auto roiEL = roiInfo.link;
+ for (const auto recoobj: *recoInput){
+ const auto roiInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( recoobj, "initialRoI" );
+ const auto roiEL = roiInfo.link;
CHECK( roiEL.isValid() );
- auto featureInfo = TrigCompositeUtils::findLink<FeatureContainer>( recoobj, m_linkName.value() );
- auto featurelink = featureInfo.link;
+ const auto featureInfo = TrigCompositeUtils::findLink<FeatureContainer>( recoobj, m_linkName.value() );
+ const auto featurelink = featureInfo.link;
CHECK( featurelink.isValid() );
if ( not featurelink.isValid() ) {
- ATH_MSG_ERROR( " Can not find reference to " + m_linkName.value() + " from the decision" );
- return StatusCode::FAILURE;
+ ATH_MSG_ERROR( " Can not find reference to " + m_linkName.value() + " from the decision" );
+ return StatusCode::FAILURE;
}
ATH_MSG_DEBUG(" Found link from the reco object to feature "<<m_linkName.value() );
const FeatureOBJ* feature = *featurelink;
// find the same roi in the previous decisions
bool foundFeatureInDecision=false;
- size_t pos=distance(featureFromDecision.begin(), find(featureFromDecision.begin(), featureFromDecision.end(), feature));
- if (pos < featureFromDecision.size()){
- foundFeatureInDecision=true;
- }
-
- if (foundFeatureInDecision){
- ATH_MSG_DEBUG(" Found link from the reco object to the previous decision at position "<<pos);
- auto d = newDecisionIn(decisions);
- d->setObjectLink( "feature", ElementLink<xAOD::TrigCompositeContainer>(m_recoInput.key(), reco_counter) );// feature used by the Tool
- d->setObjectLink( m_linkName.value(), featurelink );
- linkToPrevious( d, decisionInput().key(), pos );
- }
- else{
- ATH_MSG_ERROR( " Can not find reference to previous decision from feature " + m_linkName.value() + " from reco object " << reco_counter );
- return StatusCode::FAILURE;
- }
- reco_counter++;
+ size_t pos=distance(featureFromDecision.begin(), find(featureFromDecision.begin(), featureFromDecision.end(), feature));
+ if (pos < featureFromDecision.size()){
+ foundFeatureInDecision=true;
+ }
+
+ if (foundFeatureInDecision){
+ ATH_MSG_DEBUG(" Found link from the reco object to the previous decision at position "<<pos);
+ auto d = newDecisionIn(decisions);
+ d->setObjectLink( "feature", ElementLink<xAOD::TrigCompositeContainer>(m_recoInput.key(), reco_counter) );// feature used by the Tool
+ d->setObjectLink( m_linkName.value(), featurelink );
+ linkToPrevious( d, decisionInput().key(), pos );
+ }
+ else{
+ ATH_MSG_ERROR( " Can not find reference to previous decision from feature " + m_linkName.value() + " from reco object " << reco_counter );
+ return StatusCode::FAILURE;
+ }
+ reco_counter++;
}
-
-
if (decisions->size()>0){
for ( auto tool: m_tools ) {
- CHECK( tool->decide( decisions ) );
+ CHECK( tool->decide( decisions ) );
}
}
ATH_MSG_DEBUG( "Exiting with "<< outputHandle->size() <<" decisions");
+
//debug
for (auto outh: *outputHandle){
TrigCompositeUtils::DecisionIDContainer objDecisions;
@@ -115,14 +114,11 @@ namespace HLTTest {
ATH_MSG_DEBUG("Number of positive decisions for this input: " << objDecisions.size() );
for ( TrigCompositeUtils::DecisionID id : objDecisions ) {
- ATH_MSG_DEBUG( " --- found new decision " << HLT::Identifier( id ) );
+ ATH_MSG_DEBUG( " --- found new decision " << HLT::Identifier( id ) );
}
-
}
-
-
+
return StatusCode::SUCCESS;
}
-
} //> end namespace HLTTest
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.cxx
index cac352bfc086e1737d36e2117255d525f33b91bd..e3f0bf919a51ab90d2b588afbd5acdf01411bb06 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.cxx
@@ -11,10 +11,10 @@ using namespace TrigCompositeUtils;
namespace HLTTest {
TestHypoTool::TestHypoTool( const std::string& type,
- const std::string& name,
- const IInterface* parent ) :
- ITestHypoTool( name ),
- AthAlgTool( type, name, parent )
+ const std::string& name,
+ const IInterface* parent ) :
+ ITestHypoTool( name ),
+ AthAlgTool( type, name, parent )
{
m_decisionId=HLT::Identifier::fromToolName(name );
}
@@ -28,59 +28,59 @@ namespace HLTTest {
ATH_MSG_DEBUG("Link name is "<<m_linkName.value());
ATH_MSG_DEBUG("threshold="<<m_threshold);
ATH_MSG_DEBUG("property="<<m_property);
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
-
-
StatusCode TestHypoTool::decide( DecisionContainer* decisions ) const {
ATH_MSG_DEBUG( "Making new decisions " << name() );
size_t counter = 0;
- for ( auto d: *decisions ) {
+ for ( const auto d: *decisions ) {
//get previous decisions
ElementLinkVector<DecisionContainer> inputLinks = getLinkToPrevious(d);
ATH_MSG_DEBUG("Got "<<inputLinks.size()<<" previous decisions");
- for (auto previousDecisions: inputLinks){
-
- //auto previousDecisions = linkToPrevious( d);
- TrigCompositeUtils::DecisionIDContainer objDecisions;
- TrigCompositeUtils::decisionIDs( *previousDecisions, objDecisions );
-
- ATH_MSG_DEBUG("Number of previous decisions ID for input "<< counter <<"= " << objDecisions.size() );
-
- for ( TrigCompositeUtils::DecisionID id : objDecisions ) {
- ATH_MSG_DEBUG( " -- found decision " << HLT::Identifier( id ) );
- }
-
- auto it= find(objDecisions.begin(), objDecisions.end(), m_decisionId);
- if (it != objDecisions.end()){
- auto feature = d->objectLink<xAOD::TrigCompositeContainer>( "feature" );
- //auto feature = d->objectLink<xAOD::TrigCompositeContainer>( m_linkName.value() );
- if ( not feature.isValid() ) {
- ATH_MSG_ERROR( " Can not find reference to the object from the decision" );
- return StatusCode::FAILURE;
- }
- float v = (*feature)->getDetail<float>( m_property );
- if ( v > m_threshold ) { // actual cut will be more complex of course
- ATH_MSG_DEBUG( " threshold " << m_threshold << " passed by value: " << v );
- addDecisionID( m_decisionId, d );
- }
- else ATH_MSG_DEBUG( " threshold " << m_threshold << " not passed by value " << v );
- }
- else {
- ATH_MSG_DEBUG("No Input decisions requested by active chain "<< m_decisionId);
- }
- counter++;
+ for (const auto previousDecisions: inputLinks){
+
+ TrigCompositeUtils::DecisionIDContainer objDecisions;
+ TrigCompositeUtils::decisionIDs( *previousDecisions, objDecisions );
+
+ ATH_MSG_DEBUG("Number of previous decisions ID for input "<< counter <<"= " << objDecisions.size() );
+
+ for ( TrigCompositeUtils::DecisionID id : objDecisions ) {
+ ATH_MSG_DEBUG( " -- found decision " << HLT::Identifier( id ) );
+ }
+
+ const auto it = find(objDecisions.begin(), objDecisions.end(), m_decisionId);
+ if (it != objDecisions.end()){
+
+ const auto feature = d->objectLink<xAOD::TrigCompositeContainer>( "feature" );
+ // Used to fetch m_linkName.value() but this was refactored to "feature"
+ if ( not feature.isValid() ) {
+ ATH_MSG_ERROR( " Can not find reference to the object from the decision" );
+ return StatusCode::FAILURE;
+ }
+ const float v = (*feature)->getDetail<float>( m_property );
+ if ( v > m_threshold ) { // actual cut will be more complex of course
+ ATH_MSG_DEBUG( " threshold " << m_threshold << " passed by value: " << v );
+ addDecisionID( m_decisionId, d );
+ } else {
+ ATH_MSG_DEBUG( " threshold " << m_threshold << " not passed by value " << v );
+ }
+
+ } else { // it == objDecisions.end()
+
+ ATH_MSG_DEBUG("No Input decisions requested by active chain "<< m_decisionId);
+
+ }
+ counter++;
}
}
-
return StatusCode::SUCCESS;
}
-
+
StatusCode TestHypoTool::finalize() {
ATH_MSG_INFO( "Finalizing " << name() << "..." );
return StatusCode::SUCCESS;
}
- } //> end namespace HLTTest
+} //> end namespace HLTTest
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
index 3d7b76d870f9b2df38d784cfebf4933b5fe119ef..226e7820b9ae739def0c571c41d0d28b0b38d194 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
@@ -10,11 +10,11 @@
#include <vector>
namespace HLTTest {
-
+
TestInputMaker::TestInputMaker( const std::string& name,
- ISvcLocator* pSvcLocator )
- : InputMakerBase( name, pSvcLocator ) {}
-
+ ISvcLocator* pSvcLocator )
+ : InputMakerBase( name, pSvcLocator ) {}
+
TestInputMaker::~TestInputMaker() {}
@@ -36,7 +36,7 @@ namespace HLTTest {
StatusCode TestInputMaker::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
-
+
// call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled
std::vector< SG::WriteHandle<TrigCompositeUtils::DecisionContainer> > outputHandles;
CHECK (decisionInputToOutput(context, outputHandles));
@@ -50,51 +50,50 @@ namespace HLTTest {
// loop over output decisions, navigate to inputs
for (auto outputHandle: outputHandles) {
if( not outputHandle.isValid() ) {
- ATH_MSG_DEBUG( "Got no decisions from output "<< outputHandle.key() << " because handle not valid");
- continue;
+ ATH_MSG_DEBUG( "Got no decisions from output "<< outputHandle.key() << " because handle not valid");
+ continue;
}
if( outputHandle->size() == 0){ // input filtered out
- ATH_MSG_ERROR( "Got no decisions from output "<< outputHandle.key()<<": handle is valid but container is empty. Is this expected?");
- return StatusCode::FAILURE;
+ ATH_MSG_ERROR( "Got no decisions from output "<< outputHandle.key()<<": handle is valid but container is empty. Is this expected?");
+ return StatusCode::FAILURE;
}
+
ATH_MSG_DEBUG( "Got output "<< outputHandle.key()<<" with " << outputHandle->size() << " elements" );
// loop over output decisions in container of outputHandle, follow link to inputDecision
- for ( auto outputDecision : *outputHandle){
- ElementLinkVector<DecisionContainer> inputLinks = getLinkToPrevious(outputDecision);
- for (auto input: inputLinks){
- ATH_MSG_DEBUG( "followed seed link to input "<< input.key() );
- const Decision* inputDecision = *input;
- auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value());
- CHECK( roiELInfo.isValid() );
-
- // retrieve input feature from input decision (TrigComposite), will in this case be a TrigRoiDescriptor
- auto featureLinkInfo = TrigCompositeUtils::findLink<FeatureContainer>( inputDecision, m_linkName.value());
- CHECK( featureLinkInfo.isValid() );
-
- // link input reco object to outputDecision
- auto featureLink = featureLinkInfo.link;
- const FeatureOBJ* feature = *featureLink;
- ATH_MSG_DEBUG(" Found feature " <<m_linkName.value() );
-
- // merge reco outputs that are linked to the same feature (RoI): this avoids processing the same RoI from TC decisions from different chains
-
- // avoid adding the same feature multiple times: check if not in container, if not add it
- if ( find(featuresFromDecision.begin(), featuresFromDecision.end(), feature)
- == featuresFromDecision.end() ){
- featuresFromDecision.push_back(feature); // just to keep track of which we have used
- // create the "reco" output: this would normally be a copy of the reco input or something derived from it, e.g. detector data inside a RoI. A TrigComposite is used here just for a trivial example.
- auto newFeature = new xAOD::TrigComposite;
- reco_output->push_back(newFeature);
- newFeature->setObjectLink(m_linkName.value(), featureLink);
- ATH_MSG_DEBUG(" Added " <<m_linkName.value() << " and " << m_roisLink.value() << " to reco object");
- }
- }//loop over previous inputs
+ for (const auto outputDecision : *outputHandle){
+ const ElementLinkVector<DecisionContainer> inputLinks = getLinkToPrevious(outputDecision);
+ for (const auto input: inputLinks){
+ ATH_MSG_DEBUG( "followed seed link to input "<< input.key() );
+ const Decision* inputDecision = *input;
+ const auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value());
+ CHECK( roiELInfo.isValid() );
+
+ // retrieve input feature from input decision (TrigComposite), will in this case be a TrigRoiDescriptor
+ const auto featureLinkInfo = TrigCompositeUtils::findLink<FeatureContainer>( inputDecision, m_linkName.value());
+ CHECK( featureLinkInfo.isValid() );
+
+ // link input reco object to outputDecision
+ const auto featureLink = featureLinkInfo.link;
+ const FeatureOBJ* feature = *featureLink;
+ ATH_MSG_DEBUG(" Found feature " <<m_linkName.value() );
+
+ // merge reco outputs that are linked to the same feature (RoI): this avoids processing the same RoI from TC decisions from different chains
+
+ // avoid adding the same feature multiple times: check if not in container, if not add it
+ if ( find(featuresFromDecision.begin(), featuresFromDecision.end(), feature) == featuresFromDecision.end() ){
+ featuresFromDecision.push_back(feature); // just to keep track of which we have used
+ // create the "reco" output: this would normally be a copy of the reco input or something derived from it, e.g. detector data inside a RoI. A TrigComposite is used here just for a trivial example.
+ auto newFeature = new xAOD::TrigComposite;
+ reco_output->push_back(newFeature);
+ newFeature->setObjectLink(m_linkName.value(), featureLink);
+ ATH_MSG_DEBUG(" Added " <<m_linkName.value() << " and " << m_roisLink.value() << " to reco object");
+ }
+ }//loop over previous inputs
// For early tests, create TC, link to RoiD, push back onto TCC.
// Later will output RoID collection directly via tool.
} // loop over decisions
} // loop over input keys
-
-
+
// Finally, record output
ATH_MSG_DEBUG("Produced "<<reco_output->size() <<" reco objects and stored in "<<m_recoOutput);
auto reco_outputHandle = SG::makeHandle(m_recoOutput, context);
@@ -106,5 +105,5 @@ namespace HLTTest {
return StatusCode::SUCCESS;
}
-
+
} //> end namespace HLTTest
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.cxx
index 43495b0c8053b1ef7a785970d177ae89624096a5..7a0af223d1a2d903634619ddedad3006511346fb 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.cxx
@@ -17,8 +17,8 @@ namespace HLTTest {
// Constructors
////////////////
TestMerger::TestMerger( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::AthAlgorithm( name, pSvcLocator )
+ ISvcLocator* pSvcLocator ) :
+ ::AthAlgorithm( name, pSvcLocator )
{
declareProperty( "Inputs", m_inputs );
declareProperty( "Output", m_outputKey );
@@ -51,17 +51,17 @@ namespace HLTTest {
auto aux = std::make_unique<DecisionAuxContainer>();
output->setStore( aux.get() );
- for ( auto input: m_inputs ) {
+ for (const auto input: m_inputs ) {
auto iHandle = SG::ReadHandle<DecisionContainer>(input);
if ( iHandle.isValid() ) {
- size_t counter = 0;
- for ( auto iDecisionIter = iHandle->begin(); iDecisionIter != iHandle->end(); ++iDecisionIter, ++counter ) {
- auto d = newDecisionIn(output.get());
- linkToPrevious(d, input, counter );
- }
- ATH_MSG_DEBUG( "Input " << input << " present, linked " << counter << " inputs" );
+ size_t counter = 0;
+ for ( auto iDecisionIter = iHandle->begin(); iDecisionIter != iHandle->end(); ++iDecisionIter, ++counter ) {
+ auto d = newDecisionIn(output.get());
+ linkToPrevious(d, *iDecisionIter );
+ }
+ ATH_MSG_DEBUG( "Input " << input << " present, linked " << counter << " inputs" );
} else {
- ATH_MSG_DEBUG( "Input " << input << " absent" );
+ ATH_MSG_DEBUG( "Input " << input << " absent" );
}
}
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx
index 968b9f7e8c1826f1c9a37f86336889e753abdb45..db31e748bfd2c3a2825aca525e706b9a07dcacd9 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx
@@ -15,8 +15,8 @@ using namespace TrigCompositeUtils;
namespace HLTTest {
TestRoRSeqFilter::TestRoRSeqFilter( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::AthAlgorithm( name, pSvcLocator )
+ ISvcLocator* pSvcLocator ) :
+ ::AthAlgorithm( name, pSvcLocator )
{
declareProperty( "Inputs", m_inputs );
declareProperty( "Outputs", m_outputs );
@@ -34,25 +34,28 @@ namespace HLTTest {
ATH_MSG_DEBUG("Will consume the input data: " << m_inputs << " and produce " << m_outputs );
ATH_MSG_DEBUG("This filter has alwaysPass=" << m_alwaysPass);
ATH_MSG_DEBUG("Configured chains are:");
- for ( auto& el: m_chainsProperty ) ATH_MSG_DEBUG(el);
+ for ( auto& el: m_chainsProperty ) {
+ ATH_MSG_DEBUG(el);
+ }
// if ( m_inputs.size() != m_outputs.size() ) {
// ATH_MSG_ERROR("Inputs and Outputs have different size, the mapping is unclear");
// return StatusCode::FAILURE;
// }
-
- for ( auto& el: m_chainsProperty )
+
+ for ( auto& el: m_chainsProperty ) {
m_chains.insert( HLT::Identifier(el).numeric() );
-
+ }
+
// minimal validity crosscheck
if ( m_chainsProperty.size() == 0 and m_alwaysPass == false ) {
ATH_MSG_WARNING("This filter will always reject as it has no chains of interest configured");
}
-
+
if ( m_chains.size() != m_chainsProperty.size() ) {
ATH_MSG_ERROR("Repeated chain requirements (annoyance) or chain to hash conversion clash (major configuration issue therefore can not run)");
return StatusCode::FAILURE;
}
-
+
return StatusCode::SUCCESS;
}
@@ -67,7 +70,7 @@ namespace HLTTest {
{
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
bool pass = false;
-
+
for ( size_t inputIndex = 0; inputIndex < m_inputs.size(); ++inputIndex ) {
auto input = m_inputs[inputIndex];
ATH_MSG_DEBUG( "Processing input " << input );
@@ -79,22 +82,21 @@ namespace HLTTest {
// not bother recording if there is no output
if ( not decisionOutput->empty() ) {
- ATH_MSG_DEBUG( "Saving output " << m_outputs[inputIndex] );
- pass = true;
- SG::WriteHandle<DecisionContainer> outputDH( m_outputs[inputIndex] );
- CHECK( outputDH.record( std::move( decisionOutput ), std::move( decisionAux ) ) );
+ ATH_MSG_DEBUG( "Saving output " << m_outputs[inputIndex] );
+ pass = true;
+ SG::WriteHandle<DecisionContainer> outputDH( m_outputs[inputIndex] );
+ CHECK( outputDH.record( std::move( decisionOutput ), std::move( decisionAux ) ) );
} else {
- ATH_MSG_DEBUG( "None of the decisions in the input " << input << " passed, skipping recording output " );
+ ATH_MSG_DEBUG( "None of the decisions in the input " << input << " passed, skipping recording output " );
}
}
ATH_MSG_DEBUG( "The overall decision is : " << ( pass or m_alwaysPass ? "positive" : "negative") );
-
+
setFilterPassed( pass or m_alwaysPass );
return StatusCode::SUCCESS;
}
-
void TestRoRSeqFilter::copyPassing( const std::string& inputKey, DecisionContainer* output ) const {
SG::ReadHandle<DecisionContainer> inputDH( inputKey );
if ( not inputDH.isValid() ) {
@@ -103,29 +105,29 @@ namespace HLTTest {
}
ATH_MSG_DEBUG( "Filtering "<<inputDH->size()<<" obejcts with key "<<inputKey);
-
+
size_t counter=0;
for ( auto objIter = inputDH->begin(); objIter != inputDH->end(); ++objIter, ++counter ) {
DecisionIDContainer objDecisions;
decisionIDs( *objIter, objDecisions ); // this should be replaced in production code by method passingIDs but the later is not printing so in tests we want the IDs
// here we have to sets of IDs, those we are interested in (via chain property) and those comming from the decision obj
-
+
std::vector<DecisionID> intersection;
std::set_intersection( m_chains.begin(), m_chains.end(),
- objDecisions.begin(), objDecisions.end(),
- std::back_inserter( intersection ) );
-
+ objDecisions.begin(), objDecisions.end(),
+ std::back_inserter( intersection ) );
+
ATH_MSG_DEBUG( "Found "<<intersection.size()<<" objects of interest for key "<<inputKey);
for ( auto positive: intersection ) {
- ATH_MSG_DEBUG( "Found positive decision for chain " << HLT::Identifier( positive ) );
+ ATH_MSG_DEBUG( "Found positive decision for chain " << HLT::Identifier( positive ) );
}
const bool positiveObjectDecision = not intersection.empty();
if ( positiveObjectDecision ) {
- auto d = newDecisionIn( output );
- linkToPrevious( d, inputKey, counter );
+ auto d = newDecisionIn( output );
+ linkToPrevious( d, *objIter );
} else {
- ATH_MSG_DEBUG( "Skipping objects with key " << inputKey <<" as they passed no chain of interest to this filter" );
+ ATH_MSG_DEBUG( "Skipping objects with key " << inputKey <<" as they passed no chain of interest to this filter" );
}
}
}
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
index f7156c46c3c4aec55f6896c0a4077af1cb2bfa97..74e9973310d471cfab859f7e5cef03fe65a5069e 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
@@ -2,7 +2,7 @@
# art-type: build
# art-include: master/Athena
-#clear BS from previous runs
+#clear BS from previous runs
rm -rf data_test.*.data
athena --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TrigUpgradeTest/egamma.withViews.py &&
checkxAOD.py myESD.pool.root &&
diff --git a/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt b/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt
index 395e1ccd0c75f2b384fc0505729f0bef14950633..db9b326dafec91e5cc57be1992f50a28f93a9b99 100644
--- a/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt
@@ -25,6 +25,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaKernel
Control/CxxUtils
+ Control/AthViews
Event/EventInfo
Event/xAOD/xAODEventInfo
Event/xAOD/xAODBTagging
@@ -64,7 +65,7 @@ atlas_add_component( TrigValAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthAnalysisBaseCompsLib GaudiKernel TrigDecisionToolLib TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigNavToolsLib TrigNavigationLib TrigParticle TrigSteeringEvent AthenaKernel CxxUtils EventInfo xAODEventInfo xAODBTagging xAODEgamma xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODCore xAODTrigger AnalysisTriggerEvent MuonCombinedToolInterfaces Particle tauEvent VxSecVertex TrigConfigSvcLib TrigConfHLTData TrigRoiConversionLib TrigDecisionEvent TrigMissingEtEvent TrigInDetTruthEvent TrigT1Interfaces DecisionHandlingLib )
+ LINK_LIBRARIES ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthAnalysisBaseCompsLib GaudiKernel TrigDecisionToolLib TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigNavToolsLib TrigNavigationLib TrigParticle TrigSteeringEvent AthenaKernel CxxUtils EventInfo xAODEventInfo xAODBTagging xAODEgamma xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODCore xAODTrigger AnalysisTriggerEvent MuonCombinedToolInterfaces Particle tauEvent VxSecVertex TrigConfigSvcLib TrigConfHLTData TrigRoiConversionLib TrigDecisionEvent TrigMissingEtEvent TrigInDetTruthEvent TrigT1Interfaces DecisionHandlingLib AthViews )
# Install files from the package:
atlas_install_headers( TrigValAlgs )
diff --git a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
index 4ccbf728073a0eae1e29bdd8cc23be549189e136..a9837a115caa3e58af77951f62ac1b141f8882a7 100644
--- a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
+++ b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
@@ -99,6 +99,9 @@
#include "TrigT1Interfaces/RecEmTauRoI.h"
+#include "AthViews/ViewHelper.h"
+#include "AthViews/View.h"
+
#include <iostream>
#include <fstream>
@@ -4030,6 +4033,11 @@ StatusCode TrigEDMChecker::dumpTrigComposite() {
m_dumpTrigCompositeContainers.clear();
const CLID TrigCompositeCLID = static_cast<CLID>( ClassID_traits< xAOD::TrigCompositeContainer >::ID() );
evtStore()->keys(TrigCompositeCLID, m_dumpTrigCompositeContainers);
+ std::string typeNameTC;
+ ATH_CHECK(m_clidSvc->getTypeNameOfID(TrigCompositeCLID, typeNameTC));
+ ATH_MSG_DEBUG("dumpTrigComposite got " << m_dumpTrigCompositeContainers.size() << " keys for " << typeNameTC);
+ } else {
+ ATH_MSG_DEBUG("Using supplied " << m_dumpTrigCompositeContainers.size() << " keys");
}
for ( const std::string & key: m_dumpTrigCompositeContainers ) {
@@ -4042,22 +4050,12 @@ StatusCode TrigEDMChecker::dumpTrigComposite() {
const xAOD::TrigCompositeContainer* cont= nullptr;
ATH_CHECK( evtStore()->retrieve( cont, key ) );
+ size_t count = 0;
for ( auto tc: *cont ) {
- ATH_MSG_DEBUG("name: " << tc->name());
-
- // one gets a bit of info but is not that useful, we need to develop
- //SGdebug::print_aux_vars( *tc );
- //SGdebug::dump_aux_vars( *tc );
-
- // find the EL and check them
- ATH_MSG_DEBUG( "Link col names : " << tc->linkColNames() );
- ATH_MSG_DEBUG( "Link col keys : " << tc->linkColKeys() );
- ATH_MSG_DEBUG( "Link col CLIDs : " << tc->linkColClids() );
- ATH_MSG_DEBUG( "Link col indices : " << tc->linkColIndices() );
-
+ ATH_MSG_DEBUG(" ########## ELEMENT " << count++);
+ ATH_MSG_DEBUG(*tc);
// Get the objects we know of
for (size_t i = 0; i < tc->linkColNames().size(); ++i) ATH_CHECK(checkTrigCompositeElementLink(tc, i));
-
}
}
ATH_MSG_INFO( "REGTEST ==========END of xAOD::TrigCompositeContainer DUMP===========" );
@@ -4074,24 +4072,31 @@ StatusCode TrigEDMChecker::checkTrigCompositeElementLink(const xAOD::TrigComposi
if (clid == ClassID_traits< TrigRoiDescriptorCollection >::ID()) {
const ElementLink<TrigRoiDescriptorCollection> elementLink = tc->objectLink<TrigRoiDescriptorCollection>(name);
- if (!elementLink.isValid()) ATH_MSG_WARNING("Invalid element link from '" << tc->name() << "' to '" << name << "'");
- else ATH_MSG_DEBUG("Got TrigRoiDescriptor:" << *elementLink);
+ if (!elementLink.isValid()) ATH_MSG_WARNING(" Invalid element link to TrigRoiDescriptorCollection, link name:'" << name << "'");
+ else ATH_MSG_DEBUG(" Dereferenced link '" << name << "'' to TrigRoiDescriptor:" << *elementLink);
} else if (clid == ClassID_traits< DataVector< LVL1::RecEmTauRoI > >::ID()) { // There could be a few ROI types....
// CLASS_DEF( DataVector< LVL1::RecEmTauRoI >, 6256, 1 )
const ElementLink<DataVector< LVL1::RecEmTauRoI >> elementLink = tc->objectLink<DataVector< LVL1::RecEmTauRoI >>(name);
- if (!elementLink.isValid()) ATH_MSG_WARNING("Invalid element link from '" << tc->name() << "' to '" << name << "'");
- else ATH_MSG_DEBUG("Got LVL1::RecEmTauRoI:" << *elementLink);
+ if (!elementLink.isValid()) ATH_MSG_WARNING(" Invalid element link to LVL1::RecEmTauRoI, link name:'" << name << "'");
+ else ATH_MSG_DEBUG(" Dereferenced link '" << name << "' to LVL1::RecEmTauRoI:" << *elementLink);
} else if (clid == ClassID_traits< xAOD::TrigCompositeContainer >::ID()) {
const ElementLink<xAOD::TrigCompositeContainer> elementLink = tc->objectLink<xAOD::TrigCompositeContainer>(name);
- if (!elementLink.isValid()) ATH_MSG_WARNING("Invalid element link from '" << tc->name() << "' to '" << name << "'");
- else ATH_MSG_DEBUG("Got TrigComposite:" << (*elementLink)->name());
+ if (!elementLink.isValid()) ATH_MSG_WARNING(" Invalid element link to TrigComposite, link name:'" << name << "'");
+ else ATH_MSG_DEBUG(" Dereferenced link '" << name << "' to TrigComposite, TC name:'" << (*elementLink)->name() << "'");
+
+ } else if (clid == ClassID_traits< ViewContainer >::ID()) {
+
+ const ElementLink<ViewContainer> elementLink = tc->objectLink<ViewContainer>(name);
+ if (!elementLink.isValid()) ATH_MSG_WARNING(" Invalid element link to View, link name:'" << name << "'");
+ else ATH_MSG_DEBUG(" Dereferenced link '" << name << "' to View:'" << *elementLink);
+
} else {
- ATH_MSG_DEBUG("Ignoring link to '" << name << "' with CLID " << clid);
+ ATH_MSG_DEBUG(" Ignoring link to '" << name << "' with link CLID " << clid);
}
return StatusCode::SUCCESS;
@@ -4104,11 +4109,11 @@ StatusCode TrigEDMChecker::TrigCompositeNavigationToDot(std::string& returnValue
// This constexpr is evaluated at compile time
const CLID TrigCompositeCLID = static_cast<CLID>( ClassID_traits< xAOD::TrigCompositeContainer >::ID() );
std::vector<std::string> keys;
- if ( m_doDumpAll ) {
+ if ( m_doDumpAllTrigComposite ) {
evtStore()->keys(TrigCompositeCLID, keys);
}
else {
- std::vector<std::string> keys = m_dumpTrigCompositeContainers;
+ keys = m_dumpTrigCompositeContainers;
}
std::string typeNameTC;
ATH_CHECK(m_clidSvc->getTypeNameOfID(TrigCompositeCLID, typeNameTC));
@@ -4123,8 +4128,21 @@ StatusCode TrigEDMChecker::TrigCompositeNavigationToDot(std::string& returnValue
ss << " node [shape=rectangle]" << std::endl;
ss << " rankdir = BT" << std::endl;
+ const std::vector<std::string> vetoList = { // Patterns to ignore when dumping all
+ "TrigCostContainer",
+ "L1DecoderSummary"
+ };
+
// Now process them
- for (const std::string key : keys) {
+ for (const std::string& key : keys) {
+ bool veto = false;
+ for (const std::string& vetoStr : vetoList) {
+ if (m_doDumpAllTrigComposite && key.find(vetoStr) != std::string::npos) {
+ veto = true;
+ break;
+ }
+ }
+ if (veto) continue;
ATH_CHECK( evtStore()->retrieve( container, key ) );
size_t index = 0;
ss << " subgraph " << key << " {" << std::endl;
@@ -4146,21 +4164,23 @@ StatusCode TrigEDMChecker::TrigCompositeNavigationToDot(std::string& returnValue
// Output all the things I link to
for (size_t i = 0; i < tc->linkColNames().size(); ++i) {
const std::string link = tc->linkColNames().at(i);
- if (link == "seed") {
- const xAOD::TrigComposite* seed = tc->object<xAOD::TrigComposite>("seed");
- ss << " \"" << tc << "\" -> \"" << seed << "\" [label=\"seed\"]" << std::endl;
+ if (link == "self") {
+ continue; // Ignore the "self" link
+ } else if (link == "seed" || link == "seed__COLL") {
+ const xAOD::TrigComposite* seed = tc->object<xAOD::TrigComposite>(link);
+ ss << " \"" << tc << "\" -> \"" << seed << "\" [label=\"seed\"]" << std::endl; // Print ptr address
} else {
// Start with my class ID
const CLID linkCLID = static_cast<CLID>( tc->linkColClids().at(i) );
// Use it to get my class name
std::string tname;
ATH_CHECK(m_clidSvc->getTypeNameOfID(linkCLID, tname));
- // Now ge the sgkey I'm linking to & the index
+ // Now get the sgkey I'm linking to & the index
const SG::sgkey_t key = static_cast<SG::sgkey_t>( tc->linkColKeys().at(i) );
const unsigned index = tc->linkColIndices().at(i);
// Look it up
CLID checkCLID;
- const std::string* keyStr = evtStore()->keyToString(key, checkCLID);
+ const std::string* keyStr = evtStore()->keyToString(key, checkCLID); // I don't own this str
if (keyStr != nullptr && checkCLID != linkCLID) {
std::string tnameOfCheck;
m_clidSvc->getTypeNameOfID(checkCLID, tnameOfCheck).ignore(); // Might be invalid. But we don't care.
@@ -4168,7 +4188,7 @@ StatusCode TrigEDMChecker::TrigCompositeNavigationToDot(std::string& returnValue
<< ". We were expecting " << linkCLID << " [" << tname << "]");
}
// Print
- ss << " \"" << tc << "\" -> \"";
+ ss << " \"" << tc << "\" -> \""; // Print ptr address
ss << "Container=" << tname << "\\nKey=";
if (keyStr != nullptr) ss << *keyStr;
else ss << "[KEY "<< key <<" NOT IN STORE]";
diff --git a/Trigger/TrigValidation/TrigValTools/bin/atn_summary.pl b/Trigger/TrigValidation/TrigValTools/bin/atn_summary.pl
deleted file mode 100755
index 25a2404739f77f055b2b951dc9afda0741325846..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/bin/atn_summary.pl
+++ /dev/null
@@ -1,658 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Basename;
-use Date::Manip::Date;
-
-# Produce summary table for trigtest.pl tests in same dir or first parameter to script
-my $output="index.html";
-
-# If given, use first argument as output file
-if ($#ARGV>=0) {
- $output=$ARGV[0];
-}
-print "Writing output to $output\n";
-
-# Test procedure.
-# 1. Identify nightly to use for test, and the path to the working directory, e.g.
-# 17.X.0 rel_1 TrigAnalsysTest:
-# web http://atlas-computing.web.cern.ch/atlas-computing/links/buildDirectory/nightlies/devval/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X0VAL64BS5G4AnlOpt/triganalysistest_testconfiguration_work/
-# afs /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X0VAL64BS5G4AnlOpt/triganalysistest_testconfiguration_work/
-# 2. Find the output from that nightly in the atn_summary log file, e.g.
-# http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/nightlies/developmentWebArea/nicos_web_area17X0VAL64BS5G4AnlOpt/NICOS_TestLog_rel_1/Trigger_TrigValidation_TrigAnalysisTest_36__TrigAnalysisTest_TestConfiguration__atn_xml_summary_table__x.html
-# and cut and paste the environment settings from that:
-# "To test, set the following environment:"
-# 3. Make a mock-up of the working directory for the tests
-# a) create a path that the script will recognise, e.g. from step 1 above,
-# take this path. You need at least the rel_ part:
-# dir=builds/nightlies/17.X.0/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X064BS5G4AnlOpt/triganalysistest_testconfiguration_work/
-# mkdir -p $dir
-# cd $dir
-# b) Make copies for files and links to test dirs from ATN itself
-# find /afs/cern.ch/atlas/software/$dir -maxdepth 1 -type d -exec ln -s {} . \;
-# find /afs/cern.ch/atlas/software/$dir -maxdepth 1 \! -type d -exec cp {} . \;
-#
-# 4. Rename the previous index.html to something else e.g.
-# mv index.html index.html.orig
-# 5. Now you can run atn_summary.pl
-# Check there are no warnings or errors of course.
-# 6. Compare index.html to index.html.orig, look for expected changes
-# 7. Use a web brower to view it, e.g.
-# firefox -no-remote file://`pwd`/index.html
-
-# these lines must match trigtest.pl:
-my $regtestout = "regtest.log";
-my $htmldiffout = "regtest.html";
-my $summaryout = "summary.log";
-my $timerout = "timer.log";
-my $checklogout = "checklog.log";
-my $warnout = "warn.log";
-my $rootcompout = "rootcompout.log";
-my $checkcountout = "checkcountout.log";
-#my $edmcheckout = "edmcheckout.log";
-my $postcmdout = "postcmd.log";
-my $posttestrc = "post_test.exitcodes";
-my $docout = "doc.txt";
-my $athenalogglob = "*_{tail,test}.log{,.gz}"; # add .gz
-my $atn_timeline = "atn_timeline.png";
-my $atn_order = "atn_timeline_order.txt";
-my $no_of_nightlies=7;
-my %no_of_nightlies_exceptions = ('TrigMC',2);
-my %ERROR = (
- OK => 0,
- SCRIPT_MISC => 1,
- POST_TEST_BAD_EXIT => 2,
- ROOTCOMP_MISMATCH => 4,
- ATHENA_BAD_EXIT => 8,
- CHECKCOUNTS_FAILED => 16,
- ATHENA_ERROR_IN_LOG => 32,
- ATHENA_REGTEST_FAILED => 64,
- ATN_TIME_LIMIT => 128,
- PRECONDITION_FAILED_SO_NOT_RUN => 256
- );
-
-my $atn_rel = "unkown";
-my $atn_platform = "unkown";
-# use to fake env for testing - uncomment to enable
-my $testcwd;
-#my $testcwd = "/afs/cern.ch/atlas/software/builds/nightlies/17.X.0/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X064BS5G4AnlOpt/triganalysistest_testconfiguration_work/";
-
-
-sub main();
-main();
-exit;
-
-sub main(){
- # for debugging:
- system("printenv > atn_summary_printenv.log");
- print "\nTo test, set the following environment. If unset, results may not reproduce those within ATN. Read this script for more details on testing procedure.\n";
- my $ev;
- foreach $ev qw(AtlasProject AtlasVersion NICOS_GIT_RELBRANCH NICOS_PROJECT_RELNAME_COPY){
- print "export " . $ev . "=" . getEnv($ev,"") . "\n";
- }
- print "\n";
- my $context = getcontext();
- my $testdir='.';
- my @testnames=();
- my %exitcodes=();
- my %maskedcodes=();
- my %doc=();
- my %timer=();
- my %order = getorder();
- my $project = getEnv('AtlasProject',getEnv('NICOS_ATLAS_PROJECT',''));
- my $gitbranch = getEnv('NICOS_GIT_RELBRANCH','');
- my $release = getEnv('AtlasVersion','');
- opendir(DIRHANDLE, $testdir) || die "Cannot opendir $testdir: $!";
- foreach my $name (sort readdir(DIRHANDLE)) {
- if (-d $name and $name !~ /^\./){
- print "found dir: $name ... ";
- push @testnames, $name;
- if (-f "$name/$summaryout"){
- print "found summary file\n";
- open SUMMARYIN, "<$name/$summaryout";
- while (<SUMMARYIN>){
- if (/exitcode = (\d+)/){
- $exitcodes{$name} = $1;
- }
- elsif (/maskedcode = (\d+)/){
- $maskedcodes{$name} = $1;
- }
- }
- close SUMMARYIN;
- if (-f "$name/$timerout"){
- print "found timer file\n";
- open TIMERIN, "<$name/$timerout";
- while (<TIMERIN>){
- my ($wall,$user,$system)=split;
- $timer{$name}=$wall;
- }
- close TIMERIN;
- }
- else {
- print "no timer file\n";
- }
- } else {
- print "no summary file\n";
- }
- $doc{$name}="";
- if (-f "$name/$docout"){
- print "found doc file\n";
- open DOCIN, "<$name/$docout";
- while (<DOCIN>){
- chomp;
- $doc{$name}.=$_;
- }
- close DOCIN;
- }
- else {
- print "no doc file\n";
- }
-
- }
- }
- closedir(DIRHANDLE);
-
- open HTMLOUT, "> $output" or die "failed to write to $output: $!";
- print HTMLOUT "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">
-<html>\n<head>\n<script type=\"text/javascript\" src=\"http://atlas-project-trigger-release-validation.web.cern.ch/atlas-project-trigger-release-validation/www/js/sorttable.js\"></script>\n<script type=\"text/javascript\" src=\"http://atlas-project-trigger-release-validation.web.cern.ch/atlas-project-trigger-release-validation/www/js/suitehighlight.min.js\"></script>\n<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" >
-<title>Trigger ATN results for $project,$gitbranch,$release</title>\n
-<script type=\"text/javascript\">
-
-var thisRelease = null;
-var loaded = false;
-
-function highlightDiffs(clear) {
- var table1 = document.getElementById('ATNResults');
- var table2 = null;
- if (!clear) {
- try {
- table2 = document.getElementById('DiffFrame').contentWindow.document.getElementById('ATNResults');
- }
- catch (e) {}
- }
-
- var diffs = 0;
- for (var i=1; i < table1.rows.length; i++) {
- var cells = table1.rows[i].cells;
- for (var j=1; j < cells.length; j++) { // skip name
- if (j==9) continue; // skip timing
- if (!table2 || cells[j].textContent == table2.rows[i].cells[j].textContent) {
- cells[j].style.backgroundColor = '';
- cells[j].title = '';
- }
- else {
- cells[j].style.backgroundColor = '#FFCCCC';
- cells[j].title = table2.rows[i].cells[j].textContent || table2.rows[i].cells[j].innerText;
- diffs++;
- }
- }
- }
- setDiffCount(diffs);
-}
-
-function setDiffCount(diffs) {
- if (diffs>0) {
- document.getElementById('nDiffs').textContent = diffs+' differences';
- }
- else {
- document.getElementById('nDiffs').textContent = '';
- }
-}
-
-function loadPage() {
- var diffRelease = document.DiffForm.rel.value;
- var iframe = document.getElementById('DiffFrame');
- if (diffRelease != thisRelease) {
- // Load second summary page in hidden iframe
- var url = window.document.location.href;
- iframe.src = url.replace(/rel_[0-6]/, diffRelease);
- }
- else {
- highlightDiffs(true); // remove all highlighting
- }
-}
-
-function setRelease() {
- var url = window.document.location.href;
- thisRelease = url.match(/rel_[0-6]/);
- if (thisRelease) {
- thisRelease = thisRelease[0];
- document.DiffForm.rel.value = thisRelease;
- }
- return true;
-}
-
-function popup(mylink, windowname) {
- if (! window.focus) return true;
- var href;
- if (typeof(mylink) == 'string')
- href=mylink;
- else
- href=mylink.href;
- window.open(href, windowname, 'width=1000,height=300,toolbar=yes,resizable=yes,scrollbars=yes');
- return false;
-}
-
-function showBuildFailures(failures,link) {
- if (failures!='0') {
- document.write('<a href=\"'+link+'\" style=\"color:Red\">Build failures: '+failures+'</a>');
- }
-}
-
-</script>
-</head>
-<style type=\"text/css\">
- tr.hi:hover {background-color:#E6E6E6;}
-</style>
-<body onload=\"highlightSuite({id:'ATNResults'});setDiffCount(0);\">
-<h1>Trigger ATN test results summary</h1>
-<form name=\"DiffForm\">
-";
-
-
- my $now=qx(date);
- my $testWWWPage=getTestWWWPage();
- my $nicosWWWPage=dirname($testWWWPage);
-
- print HTMLOUT "<p>Last updated $now</p>\n";
-
- my $atn_relno = $atn_rel;
- $atn_relno =~ s/rel_//;
- print HTMLOUT "<p><a href=\"".$testWWWPage."\">Nightly test</a>: $project,$gitbranch,<b>$release</b> ($atn_platform)";
- print HTMLOUT "<script src=\"".$nicosWWWPage."/build_failures_".$atn_relno.".js\" language=\"JavaScript\"></script>\n";
- print HTMLOUT "<script type=\"text/javascript\">showBuildFailures(failures_".$atn_relno."(),"."\"".$nicosWWWPage."/nicos_buildsummary_".$atn_relno.".html\")</script>";
-
- # Link to GitLab diff between today's and yesterday's release
- my $fmt="%Y-%m-%dT%H%M";
- my $date = new Date::Manip::Date;
- $date->parse_format($fmt,$release);
- my $delta = $date->new_delta();
- $delta->set(d => -1); # minus 1 day
- my $yesterday = $date->calc($delta);
- my $prevrel = $yesterday->printf($fmt);
- my $gitdiff = "https://gitlab.cern.ch/atlas/athena/compare/nightly%2F$gitbranch%2F$prevrel...nightly%2F$gitbranch%2F$release";
-
- print HTMLOUT "<br>Other nightlies: ";
- if (defined $no_of_nightlies_exceptions{$project}){
- $no_of_nightlies=$no_of_nightlies_exceptions{$project};
- print "$project exceptionally has $no_of_nightlies nightly builds\n";
- } else {
- print "$project normally has $no_of_nightlies nightly builds\n";
- }
-
- my @dow = ('Sun','Mon','Tue','Wed','Thu','Fri','Sat');
- for (my $i=0; $i<$no_of_nightlies; $i++){
- if ("rel_$i" eq $atn_rel){
- print HTMLOUT " $dow[$i] ";
- } else {
- my $p=getrelpath();
- $p =~ s/rel_\d/rel_$i/;
- $p =~ s/rel_nightly/rel_$i/;
- print HTMLOUT " <a href=\"$p\">$dow[$i]</a> ";
- }
- }
-
- print HTMLOUT "
-<a href=\"$gitdiff\">GitLab diff</a>
- Diff results: <select name=\"rel\" size=\"1\" onchange=\"loadPage()\">
-<option value='rel_0'>Sun</option>
-<option value='rel_1'>Mon</option>
-<option value='rel_2'>Tue</option>
-<option value='rel_3'>Wed</option>
-<option value='rel_4'>Thu</option>
-<option value='rel_5'>Fri</option>
-<option value='rel_6'>Sat</option>
-</select> <span id='nDiffs' style='font-weight:bold'></span>
-</form><script type=\"text/javascript\">setRelease();</script></p>";
-
- print HTMLOUT "\n<table class=\"sortable\" id=\"ATNResults\" border=1><thead><tr>
-<th title=\"Click to sort by test suite\">Test name</th>
-<th>Overall Result</th>
-<th title=\"exit code of Athena\">Athena exit</th>
-<th title=\"presence of any error messages in log\">Error Msgs</th>
-<th title=\"number of warning messages in log\">Warn Msgs</th>
-<th>Reg. tests</th>
-<th title=\"expert histogram exact comparison to ref\">Root comp</th>
-<th title=\"L2 + EF chain and trigger element counts within tolerance w.r.t. ref\"> Chain, TE cnts </th>
-<th title=\"athena wall time in secs\">Time (s)</th>
-<th title=\"trigtest.pl exit code, bare and masked for ATN\">Exit code</th>
-<th>Post Tests</th>
-<th>Dir. link</th>
-<th>Log link</th></tr></thead><tbody>\n";
- for my $name (@testnames){
- my $atn_script = "-";
- my $atn_timeout = "-";
- my $athena_exit = "-";
- my $error_msgs = "-";
- my $error = "-";
- my $warn = "-";
- my $reg_tests = "-";
- my $rootcomp = "-";
- my $checkcount = "-";
- my $timer = "-";
- my $exitcode = "-";
- my $maskedcode = "-";
- my $postrc = 0;
- my $logfile = "";
- my $order = "";
- if (defined $exitcodes{$name}){
- $exitcode = $exitcodes{$name};
- if (defined $maskedcodes{$name}){
- $maskedcode = $maskedcodes{$name};
- if ($maskedcodes{$name} != 0){
- $maskedcode = "<font color=\"red\">$maskedcodes{$name}</font>";
- }
- }
- if (defined $timer{$name}){
- $timer = $timer{$name};
- }
- $atn_script = testcode($exitcodes{$name},"SCRIPT_MISC");
- my $skipped = testcode($exitcodes{$name},"PRECONDITION_FAILED_SO_NOT_RUN");
- if ($skipped !~ /OK/){
- $atn_script = "<div title=\"Not run because precondition failed\" style=\"color:gray\">SKIP</div>";
- $logfile = "not run because precondition failed";
- }
- elsif ($atn_script !~ /OK/){
- $atn_script = "<font color=\"red\">FAIL</font>";
- }
- else{
- if ($maskedcodes{$name} != 0){
- my $errors = errornames($maskedcodes{$name});
- $atn_script = "<div title=\"Failures: $errors\" style=\"color:red\">ERROR</div>";
- }
-
- $atn_timeout = testcode($exitcodes{$name},"ATN_TIME_LIMIT");
- $athena_exit = testcode($exitcodes{$name},"ATHENA_BAD_EXIT");
- $rootcomp = testcode($exitcodes{$name},"ROOTCOMP_MISMATCH");
-
- if ($atn_timeout !~ /OK/){
- $athena_exit="<font color=\"yellow\">TIMEOUT</font>";
- }
-
- # no checklog output file and no failure in exitcode
- $error_msgs = testcode($exitcodes{$name},"ATHENA_ERROR_IN_LOG");
- if (! -f "$name/$checklogout" and $error_msgs =~ /OK/){
- $error = "<font color=\"gray\">N/A</font>";
- } else {
- my $error_count = '';
- if ($error_msgs !~ /OK/){
- $error_count=qx(head -5 $name/$checklogout | grep 'Found messages in');
- if ($error_count =~ /Found messages in.*\(([0-9]*)\).*/){
- $error_count="($1)";
- }
- }
- print "error count: $error_count\n";
- $error = "<a type=\"text/plain\" href=\"$name/$checklogout\">$error_msgs$error_count</a>";
- }
-
- if (! -f "$name/$warnout"){
- $warn = "<font color=\"gray\">N/A</font>";
- } else {
- my $warn_count=qx(head -5 $name/$warnout | grep 'Found messages in');
- if ($warn_count =~ /Found messages in.*\(([0-9]*)\).*/){
- $warn_count = $1;
- chomp $warn_count;
- }
- else {
- $warn_count = 'N/A'
- }
- print "warn count: $warn_count\n";
- $warn = "<a type=\"text/plain\" href=\"$name/$warnout\">$warn_count</a>";
- }
- if (! -e "$name/$regtestout"){
- $reg_tests = "<font color=\"gray\">N/A</font>";
- } else {
- my $status = warncode($exitcodes{$name},"ATHENA_REGTEST_FAILED");
- my $tooltip = "";
- if ($status ne "OK") {
- my @diffs = `grep REGTEST $name/$regtestout | awk '{print \$2}' | sort -u`;
- chomp @diffs;
- if (scalar(@diffs) > 50) {
- $tooltip = "More than 50 sources of REGTEST differences!";
- }
- elsif (scalar(@diffs) > 0) {
- $tooltip = join(", ",@diffs);
- }
- }
- $reg_tests = "<a type=\"text/plain\" title=\"$tooltip\" href=\"$name/$regtestout\">" . $status . "</a>";
- if ($status ne "OK" and -e "$name/$htmldiffout"){
- $reg_tests .= " <a href=\"$name/$htmldiffout\">[ht]</a>"
- }
- }
- if (! -e "$name/$rootcompout"){
- $rootcomp = "<font color=\"gray\">N/A</font>";
- } elsif ($rootcomp =~ /FAIL/){
- my @diffs = `egrep '^Different histograms:' $name/$rootcompout`;
- chomp @diffs;
- $rootcomp = "<a type=\"text/plain\" title=\"@diffs\" href=\"$name/$rootcompout\"><font color=\"red\">DIFF</font></a>";
- if (-e "$name/rootcomp.ps.gz") {
- $rootcomp .= " <a href=\"$name/rootcomp.ps.gz\">[ps]</a>";
- }
- } elsif ($rootcomp =~ /OK/){
- $rootcomp = "<a type=\"text/plain\" href=\"$name/$rootcompout\"><font color=\"green\">MATCH</font></a>";
- }
- if (! -f "$name/$checkcountout"){
- $checkcount = "<font color=\"gray\">N/A</font>";
- } else {
- my $checkcount1 = chaincountcheck("$name/$checkcountout");
- print "check chain counts: $checkcount1\n";
- $checkcount = "<a type=\"text/plain\" href=\"$name/$checkcountout\">$checkcount1</a>";
- }
- $postrc = 0;
- if (! -e "$name/$posttestrc"){
- $postrc = "<font color=\"gray\">N/A</font>";
- } elsif (($exitcodes{$name} & $ERROR{"POST_TEST_BAD_EXIT"})==0) {
- $postrc = "OK";
- } else {
- $postrc = getposttests($name);
- }
-
- }
- }
- my @logfiles = glob("$name/$athenalogglob");
- for (@logfiles){
- my ($lfd, $lflabel) = split('/',$_);
- $lflabel = "[tail]" if ($lflabel =~ /tail/);
- $logfile .= "<a type=\"text/plain\" href=\"$_\"><font size=-2>$lflabel</font></a> ";
- }
- if (length($logfile)==0){
- $logfile = " ";
- }
- print "logfile=$logfile\n";
-
- my $thename = $name;
- my $logurl;
- if ($context){
- $logurl = getlogpath($name,$testdir);
- }
- # special case when run by hand, log might be in current dir as testname.log
- if (! defined $logurl and -f "$name.log"){
- $logurl="$name.log";
- }
- if (defined $logurl){
- $thename = "<a type=\"text/plain\" href=\"$logurl\">$name</a>";
- print "found URL: $logurl\n";
- } else {
- print "not found URL for $name\n";
- }
-
- if (exists $order{$name}) {
- $order = "suite=\"$order{$name}[1]\" sorttable_customkey=\"$order{$name}[0]\"";
- }
- print HTMLOUT "<tr class=\"hi\"><td $order title=\"$doc{$name}\">$thename</td> <td>$atn_script</td> <td>$athena_exit</td> <td>$error</td> <td>$warn</td> <td style=\"white-space:nowrap\">$reg_tests</td> <td style=\"white-space:nowrap\">$rootcomp</td> <td>$checkcount</td> <td><a type=\"text/plain\" href=\"$name/$timerout\">$timer</a></td> <td>$exitcode/$maskedcode</td> <td>$postrc</td> <td><a href=\"$name\">dir</a></td><td>$logfile</td></tr>\n";
- }
- print HTMLOUT "</tbody></table>";
- if (-e "$atn_timeline"){
- print HTMLOUT "<font face=\"monospace\"><br>";
- my @lines = `tail -3 *atn_timeline.log`;
- print HTMLOUT join('<br>',@lines);
- print HTMLOUT "<a href=\"atn_timeline.png\"> [timeline plot]</a>";
- print HTMLOUT "</font>";
- }
- print HTMLOUT '<iframe onload="highlightDiffs(false)" id="DiffFrame" style="visibility:hidden;display:none;"></iframe></body></html>';
- close HTMLOUT;
-
-}
-
-sub chaincountcheck($){
- my ($infile)=@_;
- my $counts="";
- my $nonexist = 0;
- open COUNTIN, "<$infile" or return "-";
- while (<COUNTIN>){
- if (/Fraction inside tolerance\:\s+(\d+)\/(\d+)/){
- $counts .= "$1/$2 "
- } elsif (/does not exist/){
- $nonexist++;
- }
- }
- close COUNTIN;
- $counts = "New" if ($counts eq "" && $nonexist > 0);
- $counts = "OK" if ($counts eq "");
- print "nonexistant counts: $nonexist\n";
- return $counts;
-}
-
-sub testcode($$){
- my ($code,$string) = @_;
- my $value=$ERROR{$string};
- return (($code & $value)? "<font color=\"red\">FAIL</font>" : "OK");
-}
-
-sub warncode($$){
- my ($code,$string) = @_;
- my $value=$ERROR{$string};
- return (($code & $value)? "<font color=\"orange\">WARN</font>" : "OK");
-}
-
-sub getEnv($$){
- my ($name,$default) = @_;
- if (exists $ENV{$name}) {
- return $ENV{$name};
- }
- else {
- return $default;
- }
-}
-
-# figure out which nightly this is and where logs are etc.
-# this wil only work if run in ATN.
-sub getcontext(){
- my $cwd = '';
- chomp($cwd=`pwd`);
- # for testing:
- if (defined $testcwd){
- print "!WARNING: TEST MODE!";
- $cwd=$testcwd;
- }
- print "--------------------------------------------------------\n";
- print "$cwd\n";
- if ($cwd =~ /NICOS_.*test([\w\d]+)\//){ # NICOS_qmtest (old) or NICOS_atntest (new) directory
- $atn_platform=$1;
- print "ATN_JOB_LOGFILE=" . getEnv("ATN_JOB_LOGFILE","") . "\n";
- print "ATN_PACKAGE=" . getEnv("ATN_PACKAGE","") . "\n";
- print "--------------------------------------------------------\n";
- }
- $atn_rel = $ENV{'NICOS_PROJECT_RELNAME_COPY'};
-
- if (defined $atn_platform and defined $atn_rel){
- print "$atn_platform $atn_rel $cwd\n";
- }else{
- print "atn_platform and atn_rel not defined - probably running outside ATN\n";
- }
- return (defined $atn_platform && defined $atn_rel && defined $cwd);
-}
-
-sub getlogpath($){
- my ($name,$testdir) = @_;
- my $found;
- opendir(DIRHANDLE, $testdir) || die "Cannot opendir $testdir: $!";
- foreach my $file (sort readdir(DIRHANDLE)) {
- if ($file =~ /__${name}.log/){
- #print "$name matches $file\n";
- $found="$file";
- last;
- }
- }
- return $found;
-}
-
-# create a relative URL by going back (../) until rel_N is reached, then forward again to here. This can then be changed to use for other rel_N
-sub getrelpath(){
- my $pcwd = '';
- chomp($pcwd=`pwd`);
- # for testing
- if (defined $testcwd){
- $pcwd=$testcwd;
- }
- my @pcwd = split('/',$pcwd);
- my ($i, $n, $up, $down);
- $up="";
- $down="";
- for ($i=$#pcwd; $i>=0; --$i){
- $up.="../";
- $down = $pcwd[$i]. "/" . $down;
- if ($pcwd[$i] =~ /rel_/){
- last;
- }
- }
- return "$up$down";
-}
-
-# find the directory name we are in, e.g. triganalysistest_testconfiguration_work
-sub gettestpkgdir(){
- use File::Basename;
- my $cwd = '';
- chomp($cwd=`pwd`);
- if (defined $testcwd){
- $cwd=$testcwd;
- }
- return basename($cwd);
-}
-
-sub getposttests(){
- my ($testname) = @_;
- my $text;
- open POSTRC, "<$testname/$posttestrc" or return "";
- while (<POSTRC>){
- chomp;
- (my $name, my $rc) = split();
- if ($rc!=0){
- $text .= "<a type=\"text/plain\" href=\"$testname/post_test_$name.log\"><font color=\"red\">$name</font></a> ";
- }
- }
- close POSTRC;
- return "<font size=\"-2\">$text</font>";
-}
-
-sub getorder(){
- my %order = ();
- open ORDER,"<$atn_order" or return %order;
- while (<ORDER>){
- chomp;
- (my $i, my $name, my $suite) = split();
- $order{$name} = [$i,$suite]
- }
- return %order;
-}
-
-sub errornames() {
- my ($code) = @_;
- my @errors = ();
- foreach my $key ( keys %ERROR ) {
- if (($code & $ERROR{$key}) != 0) {
- push(@errors,$key);
- }
- }
- return join(', ', @errors);
-}
-
-sub getTestWWWPage() {
- open XML,"ATNOverview.xml" or return "";
- while (<XML>){
- chomp;
- if (/<testWWWPage>(.*)<\/testWWWPage>/){
- return $1;
- }
- }
- return "";
-}
diff --git a/Trigger/TrigValidation/TrigValTools/bin/atn_summary_ART.pl b/Trigger/TrigValidation/TrigValTools/bin/atn_summary_ART.pl
deleted file mode 100755
index e90ca91cf87f1adf3f2486696c3b8cfb4bcc5b12..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/bin/atn_summary_ART.pl
+++ /dev/null
@@ -1,816 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Basename;
-use Date::Manip::Date;
-
-# Produce summary table for trigtest.pl tests in same dir or first parameter to script
-my $output="index.php";
-
-# If given, use first argument as output file
-if ($#ARGV>=0) {
- $output=$ARGV[0];
-}
-print "Writing output to $output\n";
-
-# Test procedure.
-# 1. Identify nightly to use for test, and the path to the working directory, e.g.
-# 17.X.0 rel_1 TrigAnalsysTest:
-# web http://atlas-computing.web.cern.ch/atlas-computing/links/buildDirectory/nightlies/devval/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X0VAL64BS5G4AnlOpt/triganalysistest_testconfiguration_work/
-# afs /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X0VAL64BS5G4AnlOpt/triganalysistest_testconfiguration_work/
-# 2. Find the output from that nightly in the atn_summary log file, e.g.
-# http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/nightlies/developmentWebArea/nicos_web_area17X0VAL64BS5G4AnlOpt/NICOS_TestLog_rel_1/Trigger_TrigValidation_TrigAnalysisTest_36__TrigAnalysisTest_TestConfiguration__atn_xml_summary_table__x.html
-# and cut and paste the environment settings from that:
-# "To test, set the following environment:"
-# 3. Make a mock-up of the working directory for the tests
-# a) create a path that the script will recognise, e.g. from step 1 above,
-# take this path. You need at least the rel_ part:
-# dir=builds/nightlies/17.X.0/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X064BS5G4AnlOpt/triganalysistest_testconfiguration_work/
-# mkdir -p $dir
-# cd $dir
-# b) Make copies for files and links to test dirs from ATN itself
-# find /afs/cern.ch/atlas/software/$dir -maxdepth 1 -type d -exec ln -s {} . \;
-# find /afs/cern.ch/atlas/software/$dir -maxdepth 1 \! -type d -exec cp {} . \;
-#
-# 4. Rename the previous index.html to something else e.g.
-# mv index.html index.html.orig
-# 5. Now you can run atn_summary.pl
-# Check there are no warnings or errors of course.
-# 6. Compare index.html to index.html.orig, look for expected changes
-# 7. Use a web brower to view it, e.g.
-# firefox -no-remote file://`pwd`/index.html
-
-# these lines must match trigtest.pl:
-my $regtestout = "regtest.log";
-my $htmldiffout = "regtest.html";
-my $summaryout = "summary.log";
-my $timerout = "timer.log";
-my $checklogout = "checklog.log";
-my $warnout = "warn.log";
-my $rootcompout = "rootcompout.log";
-my $checkcountout = "checkcountout.log";
-#my $edmcheckout = "edmcheckout.log";
-my $postcmdout = "postcmd.log";
-my $posttestrc = "post_test.exitcodes";
-my $docout = "doc.txt";
-my $athenalogglob = "*_{tail,test}.log{,.gz}"; # add .gz
-my $atn_timeline = "atn_timeline.png";
-my $atn_order = "atn_timeline_order.txt";
-my $no_of_nightlies=7;
-my %no_of_nightlies_exceptions = ('TrigMC',2);
-my %ERROR = (
- OK => 0,
- SCRIPT_MISC => 1,
- POST_TEST_BAD_EXIT => 2,
- ROOTCOMP_MISMATCH => 4,
- ATHENA_BAD_EXIT => 8,
- CHECKCOUNTS_FAILED => 16,
- ATHENA_ERROR_IN_LOG => 32,
- ATHENA_REGTEST_FAILED => 64,
- ATN_TIME_LIMIT => 128,
- PRECONDITION_FAILED_SO_NOT_RUN => 256
- );
-
-my $atn_rel = "unkown";
-my $atn_platform = "unkown";
-# use to fake env for testing - uncomment to enable
-my $testcwd;
-#my $testcwd = "/afs/cern.ch/atlas/software/builds/nightlies/17.X.0/AtlasAnalysis/rel_1/NICOS_area/NICOS_atntest17X064BS5G4AnlOpt/triganalysistest_testconfiguration_work/";
-
-
-sub main();
-main();
-exit;
-
-sub main(){
- # for debugging:
- system("printenv > atn_summary_printenv.log");
- print "\nTo test, set the following environment. If unset, results may not reproduce those within ATN. Read this script for more details on testing procedure.\n";
- my $ev;
- foreach $ev qw(AtlasProject AtlasVersion NICOS_GIT_RELBRANCH NICOS_PROJECT_RELNAME_COPY){
- print "export " . $ev . "=" . getEnv($ev,"") . "\n";
- }
- print "\n";
- my $context = getcontext();
- my $testdir='.';
- my @testnames=();
- my %exitcodes=();
- my %maskedcodes=();
- my %doc=();
- my %timer=();
- my %order = getorder();
- my $project = getEnv('AtlasProject',getEnv('NICOS_ATLAS_PROJECT',''));
- my $gitbranch = getEnv('NICOS_GIT_RELBRANCH','');
- my $release = getEnv('AtlasVersion','');
- opendir(DIRHANDLE, $testdir) || die "Cannot opendir $testdir: $!";
- # modification to run on ART jobs (ATR-17644i)
- foreach my $upname (sort readdir(DIRHANDLE)) {
- if (-d $upname and $upname !~ /^\./){
- print "found updir: $upname ... \n";
- # $upname=$testdir."/".$upname;
- opendir(SUBDIRHANDLE, $upname) || die "Cannot opendir $upname: $!";
- foreach my $name (sort readdir(SUBDIRHANDLE)) {
- next if $name eq ".";
- next if $name eq "..";
- $name=$upname."/".$name;
- if (-d $name){
- print "found dir: $name ... ";
- push @testnames, $name;
- if (-f "$name/$summaryout"){
- print "found summary file\n";
- open SUMMARYIN, "<$name/$summaryout";
- while (<SUMMARYIN>){
- if (/exitcode = (\d+)/){
- $exitcodes{$name} = $1;
- }
- elsif (/maskedcode = (\d+)/){
- $maskedcodes{$name} = $1;
- }
- }
- close SUMMARYIN;
- if (-f "$name/$timerout"){
- print "found timer file\n";
- open TIMERIN, "<$name/$timerout";
- while (<TIMERIN>){
- my ($wall,$user,$system)=split;
- $timer{$name}=$wall;
- }
- close TIMERIN;
- }
- else {
- print "no timer file\n";
- }
- } else {
- print "no summary file\n";
- }
- $doc{$name}="";
- if (-f "$name/$docout"){
- print "found doc file\n";
- open DOCIN, "<$name/$docout";
- while (<DOCIN>){
- chomp;
- $doc{$name}.=$_;
- }
- close DOCIN;
- }
- else {
- print "no doc file\n";
- }
-
- }
- }
- closedir(SUBDIRHANDLE);
- }
- }
- closedir(DIRHANDLE);
-
- open HTMLOUT, "> $output" or die "failed to write to $output: $!";
- print HTMLOUT "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">
-<html>\n<head>\n<script type=\"text/javascript\" src=\"http://atlas-project-trigger-release-validation.web.cern.ch/atlas-project-trigger-release-validation/www/js/sorttable.js\"></script>\n<script type=\"text/javascript\" src=\"http://atlas-project-trigger-release-validation.web.cern.ch/atlas-project-trigger-release-validation/www/js/suitehighlight.min.js\"></script>\n<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" >
-<title>Trigger ART results for $project,$gitbranch,$release</title>\n
-<script type=\"text/javascript\" src=\"https://www.gstatic.com/charts/loader.js\"></script>
-<script type=\"text/javascript\">
-
- google.charts.load('current', {packages: ['corechart', 'line']});
- google.charts.setOnLoadCallback(drawCrosshairs17000);
- google.charts.setOnLoadCallback(drawCrosshairs9000);
-
- function drawCrosshairs17000() {
- var data = new google.visualization.DataTable();
-
- data.addColumn('string', 'Nightly');
-
- <?php
-
- \$nightlies = glob(dirname(__FILE__) . '/../../*');
- \$nightlies = array_values(\$nightlies);
- \$content = file_get_contents(dirname(__FILE__).'/test_HLT_physicsV7_menu_ART_and_ROSsim_build/HLT_physicsV7_ROSsim_17000/ATLASros2rob2018.py');
- //echo \$content;
- preg_match_all('/ROS-.[A-Z]+-.[A-Z]+-.[0-9]+/i',\$content,\$ROSes);
- \$ROSes = array_values(\$ROSes);
- foreach(\$ROSes as \$ros){
- \$ros = array_values(\$ros);
- foreach(\$ros as \$ros1){
- echo \" data.addColumn('number', '\$ros1'); \\n\";
- }
- }
-
- echo \" data.addRows([\";
- foreach(\$nightlies as \$nightly){
- \$content = file_get_contents(\$nightly.'/TrigP1Test/test_HLT_physicsV7_menu_ART_and_ROSsim_build/HLT_physicsV7_ROSsim_17000/ROStest.reference.new');
- //echo \$content.'\\n';
- echo \" ['\".basename(\$nightly).\"',\";
- foreach(\$ROSes as \$ros){
- \$ros = array_values(\$ros);
- foreach(\$ros as \$ros1){
- //echo \$ros1.'\\n';
- \$matched = preg_match_all('/'.\$ros1.'.[ \\t]+[|].[ \\t]+.[0-9]+.[ \t]+[|](.[.0-9]+)/', \$content,\$rates);
- if(\$matched) echo \$rates[1][0].\",\";
- else echo \"0.,\";
- //print_r(\$rates);
- }
- }
- echo \"],\";
- }
- echo \" ]);\";
- ?>
-
- var options = {
- title: 'ROS request rates in rejected events for lumi 1.7e34',
- hAxis: {
- title: 'Nightly'
- },
- vAxis: {
- title: 'ROS request rate'
- },
- //colors: ['#a52714', '#097138'],
- crosshair: {
- color: '#000',
- trigger: 'selection'
- }
- };
-
- var chart = new google.visualization.LineChart(document.getElementById('chart_div17000'));
-
- chart.draw(data, options);
-
- }
-
- function drawCrosshairs9000() {
- var data = new google.visualization.DataTable();
-
- data.addColumn('string', 'Nightly');
-
- <?php
-
- \$nightlies = glob(dirname(__FILE__) . '/../../*');
- \$nightlies = array_values(\$nightlies);
- \$content = file_get_contents(dirname(__FILE__).'/test_HLT_physicsV7_menu_ART_and_ROSsim_build/HLT_physicsV7_ROSsim_9000/ATLASros2rob2018.py');
- //echo \$content;
- preg_match_all('/ROS-.[A-Z]+-.[A-Z]+-.[0-9]+/i',\$content,\$ROSes);
- \$ROSes = array_values(\$ROSes);
- foreach(\$ROSes as \$ros){
- \$ros = array_values(\$ros);
- foreach(\$ros as \$ros1){
- echo \" data.addColumn('number', '\$ros1'); \\n\";
- }
- }
-
- echo \" data.addRows([\";
- foreach(\$nightlies as \$nightly){
- \$content = file_get_contents(\$nightly.'/TrigP1Test/test_HLT_physicsV7_menu_ART_and_ROSsim_build/HLT_physicsV7_ROSsim_9000/ROStest.reference.new');
- //echo \$content.'\\n';
- echo \" ['\".basename(\$nightly).\"',\";
- foreach(\$ROSes as \$ros){
- \$ros = array_values(\$ros);
- foreach(\$ros as \$ros1){
- //echo \$ros1.'\\n';
- \$matched = preg_match_all('/'.\$ros1.'.[ \\t]+[|].[ \\t]+.[0-9]+.[ \t]+[|](.[.0-9]+)/', \$content,\$rates);
- if(\$matched) echo \$rates[1][0].\",\";
- else echo \"0.,\";
- //print_r(\$rates);
- }
- }
- echo \"],\";
- }
- echo \" ]);\";
- ?>
-
- var options = {
- title: 'ROS request rates in rejected events for lumi 0.9e34',
- hAxis: {
- title: 'Nightly'
- },
- vAxis: {
- title: 'ROS request rate'
- },
- //colors: ['#a52714', '#097138'],
- crosshair: {
- color: '#000',
- trigger: 'selection'
- }
- };
-
- var chart = new google.visualization.LineChart(document.getElementById('chart_div9000'));
-
- chart.draw(data, options);
-
- }
-
-</script>
-<script type=\"text/javascript\">
-
-var thisRelease = null;
-var loaded = false;
-
-
-
-
-function highlightDiffs(clear) {
- var table1 = document.getElementById('ATNResults');
- var table2 = null;
- if (!clear) {
- try {
- table2 = document.getElementById('DiffFrame').contentWindow.document.getElementById('ATNResults');
- }
- catch (e) {}
- }
-
- var diffs = 0;
- for (var i=1; i < table1.rows.length; i++) {
- var cells = table1.rows[i].cells;
- for (var j=1; j < cells.length; j++) { // skip name
- if (j==9) continue; // skip timing
- if (!table2 || cells[j].textContent == table2.rows[i].cells[j].textContent) {
- cells[j].style.backgroundColor = '';
- cells[j].title = '';
- }
- else {
- cells[j].style.backgroundColor = '#FFCCCC';
- cells[j].title = table2.rows[i].cells[j].textContent || table2.rows[i].cells[j].innerText;
- diffs++;
- }
- }
- }
- setDiffCount(diffs);
-}
-
-function setDiffCount(diffs) {
- if (diffs>0) {
- document.getElementById('nDiffs').innerHTML = '<a href=\"https://gitlab.cern.ch/atlas/athena/compare/nightly%2F21.1%2F'+document.DiffForm.rel.value+'...nightly%2F21.1%2F'+thisRelease+'\">'+diffs+' differences! click here for GitLab diff</a>';
- }
- else {
- document.getElementById('nDiffs').textContent = '';
- }
-}
-
-function loadPage() {
- var diffRelease = document.DiffForm.rel.value;
- var iframe = document.getElementById('DiffFrame');
- if (diffRelease != thisRelease) {
- // Load second summary page in hidden iframe
- var url = window.document.location.href;
- iframe.src = url.replace(/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9][0-9][0-9]/, diffRelease);
- }
- else {
- highlightDiffs(true); // remove all highlighting
- }
-}
-
-function setRelease() {
- var url = window.document.location.href;
- thisRelease = url.match(/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9][0-9][0-9]/);
- if (thisRelease) {
- thisRelease = thisRelease[0];
- document.DiffForm.rel.value = thisRelease;
- }
- return true;
-}
-
-function popup(mylink, windowname) {
- if (! window.focus) return true;
- var href;
- if (typeof(mylink) == 'string')
- href=mylink;
- else
- href=mylink.href;
- window.open(href, windowname, 'width=1000,height=300,toolbar=yes,resizable=yes,scrollbars=yes');
- return false;
-}
-
-function showBuildFailures(failures,link) {
- if (failures!='0') {
- document.write('<a href=\"'+link+'\" style=\"color:Red\">Build failures: '+failures+'</a>');
- }
-}
-
-</script>
-</head>
-<style type=\"text/css\">
- tr.hi:hover {background-color:#E6E6E6;}
-</style>
-<body onload=\"highlightSuite({id:'ATNResults'});setDiffCount(0);\">
-<h1>Trigger ART test results summary</h1>
-<form name=\"DiffForm\">
-";
-
-
- my $now=qx(date);
- my $testWWWPage=getTestWWWPage();
- my $nicosWWWPage=dirname($testWWWPage);
-
- print HTMLOUT "<p>Last updated $now. Contact: Daniele.Zanzi @ cern.ch</p>\n";
-
-# my $atn_relno = $atn_rel;
-# $atn_relno =~ s/rel_//;
-# print HTMLOUT "<p><a href=\"".$testWWWPage."\">Nightly test</a>: $project,$gitbranch,<b>$release</b> ($atn_platform)";
-# print HTMLOUT "<script src=\"".$nicosWWWPage."/build_failures_".$atn_relno.".js\" language=\"JavaScript\"></script>\n";
-# print HTMLOUT "<script type=\"text/javascript\">showBuildFailures(failures_".$atn_relno."(),"."\"".$nicosWWWPage."/nicos_buildsummary_".$atn_relno.".html\")</script>";
-#
- my $test_suite = gettestpkgdir(); # this is a basename of pwd (expected to be e.g. TrigP1Test)
- print HTMLOUT "<p>Nightly test: $project, $gitbranch, $release\n\n";
- print HTMLOUT " Check other builds: <select name=\"select_other_builds\" onchange=\"location = this.value;\">\n";
- print HTMLOUT "<option value=\"\" selected=\"selected\">-----</option>\n";
- print HTMLOUT "<?php\n";
- print HTMLOUT " \$nightlies = glob(dirname(__FILE__) . '/../../*');\n";
- print HTMLOUT " \$nightlies = array_reverse(\$nightlies);\n";
- print HTMLOUT " \$current_page_link = \"\$_SERVER[REQUEST_URI]\";\n";
- print HTMLOUT " // protect against multiple slashes in a row\n";
- print HTMLOUT " \$current_page_link = preg_replace('#/+#','/',\$current_page_link);\n";
- print HTMLOUT " \$full_link = (isset(\$_SERVER['HTTPS']) ? \"https\" : \"http\") . \"://\$_SERVER[HTTP_HOST]\" . \$current_page_link;\n";
- print HTMLOUT " foreach(\$nightlies as \$nightly){\n";
- print HTMLOUT " \$nightly = basename(\$nightly);\n";
- print HTMLOUT " echo \"<option value='\" . \$full_link . \"../../\" . \$nightly . \"/$test_suite/\" . \"'>\".\$nightly.\"</option>\";\n";
- print HTMLOUT " }\n";
- print HTMLOUT "?>\n";
- print HTMLOUT "</select></p>\n";
-
- print HTMLOUT "<p>Check differences: <select name=\"rel\" size=\"1\" onchange=\"loadPage()\">\n";
- print HTMLOUT "<option value=\"\" selected=\"selected\">-----</option>\n";
- print HTMLOUT "<?php\n";
- print HTMLOUT " \$nightlies = glob(dirname(__FILE__) . '/../../*');\n";
- print HTMLOUT " \$nightlies = array_reverse(\$nightlies);\n";
- print HTMLOUT " \$current_page_link = \"\$_SERVER[REQUEST_URI]\";\n";
- print HTMLOUT " // protect against multiple slashes in a row\n";
- print HTMLOUT " \$current_page_link = preg_replace('#/+#','/',\$current_page_link);\n";
- print HTMLOUT " \$full_link = (isset(\$_SERVER['HTTPS']) ? \"https\" : \"http\") . \"://\$_SERVER[HTTP_HOST]\" . \$current_page_link;\n";
- print HTMLOUT " foreach(\$nightlies as \$nightly){\n";
- print HTMLOUT " \$nightly = basename(\$nightly);\n";
- print HTMLOUT " echo \"<option value='\".\$nightly.\"'>\".\$nightly.\"</option>\";\n";
- print HTMLOUT " }\n";
- print HTMLOUT "?>\n";
- print HTMLOUT "</select> <span id='nDiffs' style='font-weight:bold'></span>
-</form><script type=\"text/javascript\">setRelease();</script></p>";
-
-
- print HTMLOUT "\n<table class=\"sortable\" id=\"ATNResults\" border=1><thead><tr>
-<th title=\"Click to sort by test suite\">Test name</th>
-<th>Overall Result</th>
-<th title=\"exit code of Athena\">Athena exit</th>
-<th title=\"presence of any error messages in log\">Error Msgs</th>
-<th title=\"number of warning messages in log\">Warn Msgs</th>
-<th>Reg. tests (incl. WARNING)</th>
-<th title=\"expert histogram exact comparison to ref\">Root comp</th>
-<th title=\"L2 + EF chain and trigger element counts within tolerance w.r.t. ref\"> Chain, TE cnts </th>
-<th title=\"athena wall time in secs\">Time (s)</th>
-<th title=\"trigtest.pl exit code, bare and masked for ATN\">Exit code</th>
-<th>Post Tests</th>
-<th>Dir. link</th>
-<th>Log link</th></tr></thead><tbody>\n";
- for my $name (@testnames){
- my $atn_script = "-";
- my $atn_timeout = "-";
- my $athena_exit = "-";
- my $error_msgs = "-";
- my $error = "-";
- my $warn = "-";
- my $reg_tests = "-";
- my $rootcomp = "-";
- my $checkcount = "-";
- my $timer = "-";
- my $exitcode = "-";
- my $maskedcode = "-";
- my $postrc = 0;
- my $logfile = "";
- my $order = "";
- if (defined $exitcodes{$name}){
- $exitcode = $exitcodes{$name};
- if (defined $maskedcodes{$name}){
- $maskedcode = $maskedcodes{$name};
- if ($maskedcodes{$name} != 0){
- $maskedcode = "<font color=\"red\">$maskedcodes{$name}</font>";
- }
- }
- if (defined $timer{$name}){
- $timer = $timer{$name};
- }
- $atn_script = testcode($exitcodes{$name},"SCRIPT_MISC");
- my $skipped = testcode($exitcodes{$name},"PRECONDITION_FAILED_SO_NOT_RUN");
- if ($skipped !~ /OK/){
- $atn_script = "<div title=\"Not run because precondition failed\" style=\"color:gray\">SKIP</div>";
- $logfile = "not run because precondition failed";
- }
- elsif ($atn_script !~ /OK/){
- $atn_script = "<font color=\"red\">FAIL</font>";
- }
- else{
- if ($maskedcodes{$name} != 0){
- my $errors = errornames($maskedcodes{$name});
- $atn_script = "<div title=\"Failures: $errors\" style=\"color:red\">ERROR</div>";
- }
-
- $atn_timeout = testcode($exitcodes{$name},"ATN_TIME_LIMIT");
- $athena_exit = testcode($exitcodes{$name},"ATHENA_BAD_EXIT");
- $rootcomp = testcode($exitcodes{$name},"ROOTCOMP_MISMATCH");
-
- if ($atn_timeout !~ /OK/){
- $athena_exit="<font color=\"yellow\">TIMEOUT</font>";
- }
-
- # no checklog output file and no failure in exitcode
- $error_msgs = testcode($exitcodes{$name},"ATHENA_ERROR_IN_LOG");
- if (! -f "$name/$checklogout" and $error_msgs =~ /OK/){
- $error = "<font color=\"gray\">N/A</font>";
- } else {
- my $error_count = '';
- if ($error_msgs !~ /OK/){
- $error_count=qx(head -5 $name/$checklogout | grep 'Found messages in');
- if ($error_count =~ /Found messages in.*\(([0-9]*)\).*/){
- $error_count="($1)";
- }
- }
- print "error count: $error_count\n";
- $error = "<a type=\"text/plain\" href=\"$name/$checklogout\">$error_msgs$error_count</a>";
- }
-
- if (! -f "$name/$warnout"){
- $warn = "<font color=\"gray\">N/A</font>";
- } else {
- my $warn_count=qx(head -5 $name/$warnout | grep 'Found messages in');
- if ($warn_count =~ /Found messages in.*\(([0-9]*)\).*/){
- $warn_count = $1;
- chomp $warn_count;
- }
- else {
- $warn_count = 'N/A'
- }
- print "warn count: $warn_count\n";
- $warn = "<a type=\"text/plain\" href=\"$name/$warnout\">$warn_count</a>";
- }
- if (! -e "$name/$regtestout"){
- $reg_tests = "<font color=\"gray\">N/A</font>";
- } else {
- my $status = warncode($exitcodes{$name},"ATHENA_REGTEST_FAILED");
- my $tooltip = "";
- if ($status ne "OK") {
- my @diffs = `grep REGTEST $name/$regtestout | awk '{print \$2}' | sort -u`;
- chomp @diffs;
- if (scalar(@diffs) > 50) {
- $tooltip = "More than 50 sources of REGTEST differences!";
- }
- elsif (scalar(@diffs) > 0) {
- $tooltip = join(", ",@diffs);
- }
- }
- $reg_tests = "<a type=\"text/plain\" title=\"$tooltip\" href=\"$name/$regtestout\">" . $status . "</a>";
- if ($status ne "OK" and -e "$name/$htmldiffout"){
- $reg_tests .= " <a href=\"$name/$htmldiffout\">[ht]</a>"
- }
- }
- if (! -e "$name/$rootcompout"){
- $rootcomp = "<font color=\"gray\">N/A</font>";
- } elsif ($rootcomp =~ /FAIL/){
- my @diffs = `egrep '^Different histograms:' $name/$rootcompout`;
- chomp @diffs;
- $rootcomp = "<a type=\"text/plain\" title=\"@diffs\" href=\"$name/$rootcompout\"><font color=\"red\">DIFF</font></a>";
- if (-e "$name/rootcomp.ps.gz") {
- $rootcomp .= " <a href=\"$name/rootcomp.ps.gz\">[ps]</a>";
- }
- } elsif ($rootcomp =~ /OK/){
- $rootcomp = "<a type=\"text/plain\" href=\"$name/$rootcompout\"><font color=\"green\">MATCH</font></a>";
- }
- if (! -f "$name/$checkcountout"){
- $checkcount = "<font color=\"gray\">N/A</font>";
- } else {
- my $checkcount1 = chaincountcheck("$name/$checkcountout");
- print "check chain counts: $checkcount1\n";
- $checkcount = "<a type=\"text/plain\" href=\"$name/$checkcountout\">$checkcount1</a>";
- }
- $postrc = 0;
- if (! -e "$name/$posttestrc"){
- $postrc = "<font color=\"gray\">N/A</font>";
- } elsif (($exitcodes{$name} & $ERROR{"POST_TEST_BAD_EXIT"})==0) {
- $postrc = "OK";
- $postrc .= gethistnumber($name);
- } else {
- $postrc = getposttests($name);
- $postrc .= gethistnumber($name);
- }
-
- }
- }
- my @logfiles = glob("$name/$athenalogglob");
- for (@logfiles){
- my ($lfd, $lflabel) = split('/',$_);
- $lflabel = "[tail]" if ($lflabel =~ /tail/);
- $logfile .= "<a type=\"text/plain\" href=\"$_\"><font size=-2>$lflabel</font></a> ";
- }
- if (length($logfile)==0){
- $logfile = " ";
- }
- print "logfile=$logfile\n";
-
- my $thename = $name;
- my $logurl;
- if ($context){
- $logurl = getlogpath($name,$testdir);
- }
- # special case when run by hand, log might be in current dir as testname.log
- if (! defined $logurl and -f "$name.log"){
- $logurl="$name.log";
- }
- if (defined $logurl){
- $thename = "<a type=\"text/plain\" href=\"$logurl\">$name</a>";
- print "found URL: $logurl\n";
- } else {
- print "not found URL for $name\n";
- }
-
- if (exists $order{$name}) {
- $order = "suite=\"$order{$name}[1]\" sorttable_customkey=\"$order{$name}[0]\"";
- }
- print HTMLOUT "<tr class=\"hi\"><td $order title=\"$doc{$name}\">$thename</td> <td>$atn_script</td> <td>$athena_exit</td> <td>$error</td> <td>$warn</td> <td style=\"white-space:nowrap\">$reg_tests</td> <td style=\"white-space:nowrap\">$rootcomp</td> <td>$checkcount</td> <td><a type=\"text/plain\" href=\"$name/$timerout\">$timer</a></td> <td>$exitcode/$maskedcode</td> <td>$postrc</td> <td><a href=\"$name\">dir</a></td><td>$logfile</td></tr>\n";
- }
- print HTMLOUT "</tbody></table>";
- if (-e "$atn_timeline"){
- print HTMLOUT "<font face=\"monospace\"><br>";
- my @lines = `tail -3 *atn_timeline.log`;
- print HTMLOUT join('<br>',@lines);
- print HTMLOUT "<a href=\"atn_timeline.png\"> [timeline plot]</a>";
- print HTMLOUT "</font>";
- }
- print HTMLOUT '<iframe onload="highlightDiffs(false)" id="DiffFrame" style="visibility:hidden;display:none;"></iframe>';
- print HTMLOUT '<div id="chart_div17000" style="float: left; width: 50%; height: 500px"></div>';
- print HTMLOUT '<div id="chart_div9000" style="float: right; width: 50%; height: 500px"></div>';
- print HTMLOUT '</body></html>';
- close HTMLOUT;
-
-}
-
-sub chaincountcheck($){
- my ($infile)=@_;
- my $counts="";
- my $nonexist = 0;
- open COUNTIN, "<$infile" or return "-";
- while (<COUNTIN>){
- if (/Fraction inside tolerance\:\s+(\d+)\/(\d+)/){
- $counts .= "$1/$2 "
- } elsif (/does not exist/){
- $nonexist++;
- }
- }
- close COUNTIN;
- $counts = "New" if ($counts eq "" && $nonexist > 0);
- $counts = "OK" if ($counts eq "");
- print "nonexistant counts: $nonexist\n";
- return $counts;
-}
-
-sub testcode($$){
- my ($code,$string) = @_;
- my $value=$ERROR{$string};
- return (($code & $value)? "<font color=\"red\">FAIL</font>" : "OK");
-}
-
-sub warncode($$){
- my ($code,$string) = @_;
- my $value=$ERROR{$string};
- return (($code & $value)? "<font color=\"orange\">WARN</font>" : "OK");
-}
-
-sub getEnv($$){
- my ($name,$default) = @_;
- if (exists $ENV{$name}) {
- return $ENV{$name};
- }
- else {
- return $default;
- }
-}
-
-# figure out which nightly this is and where logs are etc.
-# this wil only work if run in ATN.
-sub getcontext(){
- my $cwd = '';
- chomp($cwd=`pwd`);
- # for testing:
- if (defined $testcwd){
- print "!WARNING: TEST MODE!";
- $cwd=$testcwd;
- }
- print "--------------------------------------------------------\n";
- print "$cwd\n";
- if ($cwd =~ /NICOS_.*test([\w\d]+)\//){ # NICOS_qmtest (old) or NICOS_atntest (new) directory
- $atn_platform=$1;
- print "ATN_JOB_LOGFILE=" . getEnv("ATN_JOB_LOGFILE","") . "\n";
- print "ATN_PACKAGE=" . getEnv("ATN_PACKAGE","") . "\n";
- print "--------------------------------------------------------\n";
- }
- $atn_rel = $ENV{'NICOS_PROJECT_RELNAME_COPY'};
-
- if (defined $atn_platform and defined $atn_rel){
- print "$atn_platform $atn_rel $cwd\n";
- }else{
- print "atn_platform and atn_rel not defined - probably running outside ATN\n";
- }
- return (defined $atn_platform && defined $atn_rel && defined $cwd);
-}
-
-sub getlogpath($){
- my ($name,$testdir) = @_;
- my $found;
- opendir(DIRHANDLE, $testdir) || die "Cannot opendir $testdir: $!";
- foreach my $file (sort readdir(DIRHANDLE)) {
- if ($file =~ /__${name}.log/){
- #print "$name matches $file\n";
- $found="$file";
- last;
- }
- }
- return $found;
-}
-
-# create a relative URL by going back (../) until rel_N is reached, then forward again to here. This can then be changed to use for other rel_N
-sub getrelpath(){
- my $pcwd = '';
- chomp($pcwd=`pwd`);
- # for testing
- if (defined $testcwd){
- $pcwd=$testcwd;
- }
- my @pcwd = split('/',$pcwd);
- my ($i, $n, $up, $down);
- $up="";
- $down="";
- for ($i=$#pcwd; $i>=0; --$i){
- $up.="../";
- $down = $pcwd[$i]. "/" . $down;
- if ($pcwd[$i] =~ /rel_/){
- last;
- }
- }
- return "$up$down";
-}
-
-# find the directory name we are in, e.g. triganalysistest_testconfiguration_work
-sub gettestpkgdir(){
- use File::Basename;
- my $cwd = '';
- chomp($cwd=`pwd`);
- if (defined $testcwd){
- $cwd=$testcwd;
- }
- return basename($cwd);
-}
-
-sub gethistnumber(){
- my ($testname) = @_;
- my $text;
- open POSTRC, "<$testname/post_test_checkHist.log" or return "";
- while (<POSTRC>){
- chomp;
- if ($_ =~ /Total histograms/)
- {
- $text = $_;
- return "<font size=\"-2\">$text</font>";
- }
- }
- return "No hist number found";
-}
-
-sub getposttests(){
- my ($testname) = @_;
- my $text;
- open POSTRC, "<$testname/$posttestrc" or return "";
- while (<POSTRC>){
- chomp;
- (my $name, my $rc) = split();
- if ($rc!=0){
- $text .= "<a type=\"text/plain\" href=\"$testname/post_test_$name.log\"><font color=\"red\">$name</font></a> ";
- }
- }
- close POSTRC;
- return "<font size=\"-2\">$text</font>";
-}
-
-sub getorder(){
- my %order = ();
- open ORDER,"<$atn_order" or return %order;
- while (<ORDER>){
- chomp;
- (my $i, my $name, my $suite) = split();
- $order{$name} = [$i,$suite]
- }
- return %order;
-}
-
-sub errornames() {
- my ($code) = @_;
- my @errors = ();
- foreach my $key ( keys %ERROR ) {
- if (($code & $ERROR{$key}) != 0) {
- push(@errors,$key);
- }
- }
- return join(', ', @errors);
-}
-
-sub getTestWWWPage() {
- open XML,"ATNOverview.xml" or return "";
- while (<XML>){
- chomp;
- if (/<testWWWPage>(.*)<\/testWWWPage>/){
- return $1;
- }
- }
- return "";
-}
diff --git a/Trigger/TrigValidation/TrigValTools/bin/atn_timeline.py b/Trigger/TrigValidation/TrigValTools/bin/atn_timeline.py
deleted file mode 100755
index 040d6cce260690667a26af1bd2cf5b0ac89970b3..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/bin/atn_timeline.py
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-"""Analyse and create a graph of the ATN test timeline."""
-
-__author__ = "Frank Winklmeier"
-
-import glob
-import re
-import sys
-import os
-import operator
-from datetime import datetime
-
-import matplotlib
-from matplotlib.dates import date2num
-from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
-from matplotlib.figure import Figure
-
-class Test:
- def __init__(self):
- self.name = None
- self.t1 = None
- self.t2 = None
- self.suite = None
-
-def getSuites(dir):
- """Read test suites from python dict dumped into NICOS log file"""
-
- f = open(os.path.join(dir,'nicos_test.loglog'),'r')
- for line in f:
- if line.find('atn_streams_config: dictStreams')!=-1:
- streams = eval(f.next().strip())
- return streams
- return {}
-
-def parseTestLog(log):
- """Extract time stamps from NICOS logs"""
-
- test = Test()
- f = open(log,'r')
-
- # Test name from log file name
- # Example: Trigger_TrigValidation_TrigP1Test_49__TrigP1Test_TestConfiguration__AllPT_physicsV1_magField_on_off_on__x.loglog
- m = re.match('.*?_([0-9]+.*)\.loglog',log)
- if m==None:
- print "Cannot deduce test name from %s" % log
- test.name = log
- test.alias = ''
- else:
- test.name = re.match('.*?_([0-9]+.*)\.loglog',log).group(1)
- test.alias = test.name.split('__')[2]
-
- for line in f:
- # Old NICOS version
- if line.find('qmtest.start_time')!=-1:
- test.t1 = f.next().strip()
- test.t1 = datetime.strptime(test.t1, '%Y-%m-%dT%H:%M:%SZ')
- continue
- if line.find('qmtest.end_time')!=-1:
- test.t2 = f.next().strip()
- test.t2 = datetime.strptime(test.t2, '%Y-%m-%dT%H:%M:%SZ')
- continue
-
- # New NICOS version without QMTest
- if line.find('ATN, test start time')!=-1:
- test.t1 = line.split('] ')[1].strip()
- test.t1 = datetime.strptime(test.t1, '%a %b %d %H:%M:%S %Z %Y')
- continue
- if line.find('ATN, test end time')!=-1:
- test.t2 = line.split('] ')[1].strip()
- test.t2 = datetime.strptime(test.t2, '%a %b %d %H:%M:%S %Z %Y')
- continue
-
- return test
-
-def getTimes(dir, package):
- """Loop over all test log files and extract test info"""
-
- tests = {}
- suites = getSuites(dir)
- if len(suites)==0: return None
-
- for log in glob.iglob(os.path.join(dir,"*%s*.loglog" % package)):
- test = parseTestLog(log)
- if test.t1==None or test.t2==None:
- print "Missing start/stop time for %s" % test.name
- else:
- tests[test.name] = test
-
- for s,v in suites.iteritems():
- if test.name.lower() in v: test.suite = s
-
- return tests
-
-def main():
- import optparse
- parser = optparse.OptionParser(description=__doc__,
- usage="%prog [Options] TESTDIR")
-
- parser.add_option("-p", dest="package", type="string", action="store",
- help="Test package (e.g. TrigP1Test)")
-
- parser.add_option("-o", dest="output", type="string", action="store", default = 'atn_timeline.png',
- help="File name for graphics [%default]")
-
- parser.add_option("--atn", action="store_true",
- help="ATN mode for nightly tests")
-
- (opts, args) = parser.parse_args()
-
- if not opts.package:
- parser.error("Specify test package")
- return 1
-
- if len(args)==0 and not opts.atn:
- parser.print_help()
- return 1
-
- if opts.atn:
- testdir = '../../NICOS_TestLog%s' % os.environ['NICOS_SUFFIX']
- else:
- testdir = args[0]
-
- tests = getTimes(testdir, opts.package)
- if tests==None or len(tests)==0:
- print 'No test suites available for %s in %s' % (opts.package,testdir)
- return 0
-
- # Print tests and stats
- suites = []
- print '%-40s %-20s %-19s %-19s %s' % ('Test', 'Suite', 'Start', 'Stop', 'Duration')
- for t in sorted(tests.values(), key=operator.attrgetter('t1')):
- print '%-40s %-20s %s %s %s' % (t.alias, t.suite, t.t1, t.t2, t.t2-t.t1)
- if not t.suite in suites: suites += [t.suite]
- suites.sort()
-
- f = open('atn_timeline_order.txt','w')
- for i,t in enumerate(sorted(tests.values(), key=operator.attrgetter('suite','t1'))):
- f.write('%d %s %s\n' % (i,t.alias,t.suite))
- f.close()
-
- dmin = sorted(tests.values(), key=operator.attrgetter('t1'))[0].t1
- dmax = sorted(tests.values(), key=operator.attrgetter('t1'))[-1].t2
- print
- print 'First test started: %s' % dmin
- print 'Last test finished: %s' % dmax
- print 'Total duration: %s' % (dmax-dmin)
-
- # Create graphics
- DPI = 80
- fig = Figure(figsize=(1200/DPI,800/DPI), dpi=DPI)
- canvas = FigureCanvas(fig)
- ax = fig.add_subplot(111)
-
- # Just to get the x-axis as time
- ax.plot_date([date2num(dmin)-0.001,date2num(dmax)+0.001], [1,1], markersize=0)
-
- # Plot tests
- n = 0
- suite = None
- for t in sorted(tests.values(), key=operator.attrgetter('suite','t1')):
- t1 = date2num(t.t1)
- t2 = date2num(t.t2)
- dt = '%s' % (t.t2-t.t1).seconds
- y = suites.index(t.suite)
- ax.hlines([y], t1, t2, color='red')
- ax.vlines(t1, y-0.1, y+0.1, color='red')
- ax.vlines(t2, y-0.1, y+0.1, color='red')
-
- # Labels
- if suite!=t.suite:
- ax.text(date2num(dmin), y+0.35, 'Suite: %s' % t.suite, color='blue')
- suite = t.suite
- n = 0
- else:
- n += 1
-
- if n%4==0: offset = -0.3
- elif n%4==1: offset = 0.1
- elif n%4==2: offset = -0.45
- elif n%4==3: offset = 0.25
-
- ax.text(t1, y+offset, '%d) %s' % (n+1,t.alias))
- ax.text(t1+0.5*(t2-t1), y+0.02, dt, color='red', ha='center')
-
-
- ax.text(0, 1, testdir, transform = ax.transAxes)
- ax.xaxis.set_major_formatter(matplotlib.dates.DateFormatter('%H:%M:%S'))
- ax.yaxis.set_ticklabels([])
-
- canvas.print_figure(opts.output, dpi=DPI)
-
-if __name__ == "__main__":
- try:
- sys.exit(main())
- except KeyboardInterrupt:
- sys.exit(1)
diff --git a/Trigger/TrigValidation/TrigValTools/bin/test-xml-autoconf.py b/Trigger/TrigValidation/TrigValTools/bin/test-xml-autoconf.py
deleted file mode 100755
index 820942beb24485e6cc9ec5975e9e05d9297f7285..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/bin/test-xml-autoconf.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-#
-# Takes test xml file and enabled/disables tests marked with:
-#
-# <!-- DISABLE-IN-PROJECT-BEGIN: AtlasTier0 AtlasProduction-->
-# <TEST name="HelloWorld" type="script" suite="TrigOnline">
-# ...
-# </TEST>
-# <!-- DISABLE-IN-PROJECT-END -->
-#
-# or
-#
-# <!-- ENABLE-IN-PROJECT-BEGIN: AtlasHLT -->
-# <TEST name="HelloWorld" type="script" suite="TrigOnline">
-# ...
-# </TEST>
-# <!-- ENABLE-IN-PROJECT-END -->
-#
-#
-import sys
-import os
-import re
-
-if len(sys.argv) < 2:
- print 'Syntax: text-xml-autoconf.py test.xml [output.xml]'
- sys.exit(1)
-
-output = sys.stdout
-if len(sys.argv)==3:
- output = open(sys.argv[2],'w')
-
-# Get project from NICOS or asetup environment
-project = os.environ.get('NICOS_PROJECT_NAME',os.environ.get('AtlasProject',''))
-if len(project)==0:
- print 'Cannot read $AtlasProject or $NICOS_PROJECT_NAME'
- sys.exit(1)
-
-reDisable = re.compile(".*<\!--\s*DISABLE-IN-PROJECT-BEGIN:\s*(.*)-->")
-reEnable = re.compile(".*<\!--\s*ENABLE-IN-PROJECT-BEGIN:\s*(.*)-->")
-reEnd = re.compile(".*<\!--.*-IN-PROJECT-END.*-->")
-disable = False
-
-f = open(sys.argv[1],'r')
-for line in f:
-
- m = reDisable.match(line)
- if m and (project in m.group(1).split()):
- disable = True
- continue
-
- m = reEnable.match(line)
- if m and not (project in m.group(1).split()):
- disable = True
- continue
-
- if disable and reEnd.match(line):
- disable = False
- continue
-
- if not disable: output.write(line)
-
diff --git a/Trigger/TrigValidation/TrigValTools/bin/trigtest.pl b/Trigger/TrigValidation/TrigValTools/bin/trigtest.pl
deleted file mode 100755
index aeadb4440fdef11fa0b7e3273c52ef3fbe973d74..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/bin/trigtest.pl
+++ /dev/null
@@ -1,1372 +0,0 @@
-#!/usr/bin/perl -w
-# Script to manage Trigger tests
-# $Id: trigtest.pl,v 1.16 2009-05-20 15:53:22 sgeorge Exp $
-
-use Getopt::Long;
-use File::Basename;
-use File::Spec;
-use File::Copy;
-use File::Path;
-use constant TRUE => 1;
-use constant FALSE => 0;
-use constant UNDEFINED => "undefined";
-$prog = basename $0;
-$config = {};
-$fullregtest = '<fullregtest>';
-$customregtest = '<customregtest>';
-# set some output file names
-$regtestout = "regtest.log";
-$htmldiffout = "regtest.html";
-$summaryout = "summary.log";
-$timerout = "timer.log";
-$checklogout = "checklog.log";
-$warnout = "warn.log";
-$rootcompout = "rootcompout.log";
-$checkcountout = "checkcountout.log";
-$checkmergeout = "checkmergeout.log";
-$edmcheckout = "edmcheckout.log";
-$postcmdout = "postcmd.log";
-$posttestrc = "post_test.exitcodes";
-$docout = "doc.txt";
-
-# define error codes - must match atn_summary.pl
-%ERROR = (
- OK => 0,
- SCRIPT_MISC => 1,
- POST_TEST_BAD_EXIT => 2,
- ROOTCOMP_MISMATCH => 4,
- ATHENA_BAD_EXIT => 8,
- CHECKCOUNTS_FAILED => 16,
- ATHENA_ERROR_IN_LOG => 32,
- ATHENA_REGTEST_FAILED => 64,
- ATN_TIME_LIMIT => 128,
- PRECONDITION_FAILED_SO_NOT_RUN => 256
- );
-# max bit: 128. Bash takes return codes 0-256.
-# Larger numbers are taken mod 256 so effectively masked off. Can be used for internal signalling only.
-
-# mask off those codes above which you do not want to flag in the exit code
-# i.e. so ATN does not interpret them as the test failing.
-# bit positions marked 1 will be used, 0 will not be used.
-# SCRIPT_MISC is on the right, ATN_TIME_LIMIT on the left
-# This default mask can be modified via the 'extra_failure_codes' test directive
-# only "shout" if we see/have: ATHENA_BAD_EXIT => 8 decimal 8 in bit is 0b00001000 thus
-$default_exitmask = 0b00001001;
-
-# Exit mask of the last run test. Not nice but the easiest way to implement
-# this on top of all the other ugly things in this script.
-$exitmask = $default_exitmask;
-
-# command to use for rootcomp
-$rootcomp_cmd = "rootcomp.py --pdf --noRoot";
-$checkcount_cmd = "trigtest_checkcounts.sh";
-$checkmerge_cmd = "trigtest_check_merge.sh";
-sub main();
-main();
-exit -10;
-####
-
-sub main(){
- # trap errors from here on
- $SIG{'INT'} = 'CLEANUP_INT';
- $SIG{'TERM'} = 'CLEANUP_TERM';
- $t0=time(); # timer
- $failures = 0; # count number of tests which fail
- $statuscode = 0; # combination of errors from last test
- command_line();
- parse_config();
- if ($verify){
- print_config();
- }
- exit if ($verifyconfig);
- check_tests();
- do_tests();
- results_summary();
- timer($t0);
- if ($statuscode != 0){
- prog_error_exit("at end",@statuscodes);
- }
- exit 0;
- # exit($statuscode); # status code of last test
- # exit($failures); # number of tests which fail
-}
-
-sub CLEANUP_INT {
- print "\n\n$prog: Caught Interrupt (^C), probably ATN time exceeded, finish up and exit\n";
- push @statuscodes, 'ATN_TIME_LIMIT';
- timer($t0);
- if ($statuscode != 0){
- prog_error_exit("at end",@statuscodes);
- }
- exit(1); # never reaches this line in principle
-}
-
-sub CLEANUP_TERM {
- print "\n\n$prog: Caught TERM signal, finish up and exit\n";
- push @statuscodes, 'ATN_TIME_LIMIT';
- timer($t0);
- if ($statuscode != 0){
- prog_error_exit("at end",@statuscodes);
- }
- exit(1); # never reaches this line in principle
-}
-
-sub prog_error_exit($$){
- my ($message,@error_strings) = @_ or die;
- my $exitcode_unmasked = process_error_codes(@error_strings);
- # for ATN purposes, mask less significant codes
- my $exitcode = $exitcode_unmasked & $exitmask;
- if ($exitcode!=0){
- printf "$prog: $failkey $message (unmasked=%#.8b exitcode=%#.8b)\n", $exitcode_unmasked, $exitcode;
- } else {
- printf "$prog: $warnkey $message (unmasked=%#.8b exitcode=%#.8b)\n", $exitcode_unmasked, $exitcode;
- }
- exit($exitcode);
-
-}
-
-sub process_error_codes(@) {
- my (@error_strings) = @_;
- my $exitcode=0;
- # | sort | uniq
- my %saw;
- undef %saw;
- @saw{@error_strings} = ();
- my @error_strings_uniq = sort keys %saw;
- print "$prog: debug: all statuscodes: @error_strings\n" if ($debug);
- print "$prog: debug: uniq statuscodes: @error_strings_uniq\n" if ($debug);
- # convert strings, keep numbers as they are, add together
- print "=== These errors occured: ";
- open SUMMARY, ">$summaryout";
- for (@error_strings_uniq){
- my $code;
- if (/^\d+$/){
- # it's already a number
- $code = $_;
- } else {
- # translate string
- $code = $ERROR{$_};
- }
- $exitcode += $code;
- if ($code != 0){ # print all except ok.
- print "$_ ($code) ";
- print SUMMARY "$_ ($code)\n";
- }
- }
- print "\n";
- my $maskedcode = $exitcode & $exitmask;
- print "$prog:process_error_codes() debug exitcode = $exitcode maskedcode = $maskedcode\n" if ($debug);
- print SUMMARY " exitcode = $exitcode\n";
- print SUMMARY " maskedcode = $maskedcode\n";
- close SUMMARY;
- return $exitcode;
-}
-
-# command line arguments
-sub command_line(){
- # parse command arguments and check usage
- $debug = FALSE;
- $verify = FALSE;
- $verifyconfig = FALSE;
- $configfile = 'trigtest.conf'; # default
- $failkey = 'FAILURE';
- $warnkey = 'WARNING';
- $showsummary = FALSE;
- @tests = ();
- $run_dir = '../run'; # working directory, relative to cmt dir
- $clear_dir = FALSE;
- print "=== Command to repeat this test:\n $prog @ARGV\n";
- my $result = GetOptions ('help' => \$help,
- 'debug!' => \$debug,
- 'verify!' => \$verify,
- 'verifyconfig!' => \$verifyconfig,
- 'showsummary' => \$showsummary,
- 'failkey=s' => \$failkey,
- 'warnkey=s' => \$warnkey,
- 'config=s' => \$configfile,
- 'test=s' => \@tests,
- 'rundir=s' => \$run_dir,
- 'cleardir!' => \$clear_dir,
- 'package=s' => \$testpackagefq);
- if ($help || !$result) {
- usage();
- prog_error_exit("usage",'SCRIPT_MISC');
- }
- $verify = TRUE if ($verifyconfig);
- if (defined $testpackagefq){
- print "\n$prog info: note that the --package option is deprecated and will be removed in a \nfuture release. It no longer does anything.\n";
- }
-}
-
-# usage message
-sub usage(){
- print "
- Usage: $prog [options]
-
- Testing tool for managing Trigger software tests
-
- Options:
-
- --help show this information
- --debug print debug information, for the script maintainer
- --verify verify config file and show what would be done
- for the tests but don't run athena (see tip below)
- --verifyconfig just verify config file and stop
- --showsummary print a short summary table of tests results at the end
- --failkey <string> keyword to be printed to indicate to the test
- framework that a test has failed, default $failkey
- --failkey <string> keyword to be printed to indicate a problem, but not
- seen as failure by test framework, default $warnkey
- --config <file> specify config file, default trigtest.conf
- tries with get_files from DATAPATH if it doesn't exist
- --rundir <dir> specify directory in which to run tests, default ../run
- --cleardir remove/clear rundir before running (FALSE by default)
- --package <string> (deprecated, does nothing, will be removed in future release)
- --test <test name|id> specify test to run, see below
-
- A test name or id can optionally be specified after the --test
- option to run only that test. By default, all tests will be run in
- the order they are defined in the config file. The verify option
- will list all the available tests that are defined in the config
- file. The --test option may be repeated, and tests will be run in the
- order the come on the command line.
-
- See the sample config file for test configuration information.
-
- It is expected that this tool be run from the cmt or run directory
- under TriggerTest, after the necessary cmt environment has been set
- up. If you changed any files in TriggerTest or checked out a
- version different from the release you are using, then you need to
- gmake before running these tests. The --package option can be used
- to change this default location to another package for reference
- files and the check_log config file.
-
- Output from $prog will always be preceeded by its name (for error
- and debug messages) or '===' for the few messages you get without
- debug. All other messages come from other programs and commands it
- has run.
-
- Tip: after running a test for the first time, run again in verify
- mode and the same log files will be re-used. This is a good way to
- quickly test the config file, regression tests, and for script
- development.
-
- The exit code refers only to the last test - be sure to read the
- output if you run multiple tests!
- The exit code can be any combination of these values:
-";
- my $errorcode;
- foreach $error_name (sort { $ERROR{$a} <=> $ERROR{$b} } keys %ERROR) {
- printf " %20s %4d\n", $error_name, $ERROR{$error_name};
- }
-}
-
-
-# If using a file for stdin,
-# try to find it with get_files
-# then check it is there
-# and return with < pre-pended,
-# or return empty string if failed
-sub getStdinFile($){
- my ($stdinfile) = @_;
- $stdinfile =~ s/^\s+$//; # kill file names that are only spaces
- $stdinfile = $stdinfile;
- if (length($stdinfile)>0){
- if (! -e "$stdinfile" ){
- print "$prog debug: $stdinfile does not exist, so copying it with get_files\n" if ($debug);
- systemcall("get_files -data $stdinfile");
- } else {
- print "$prog debug: $stdinfile already exists; not copying it\n" if ($debug);
- }
- if (! -e $stdinfile){
- prog_error_exit ("stdin defined as '$stdinfile' but this is not found", 'SCRIPT_MISC');
- $stdinfile = "";
- } else {
- $stdinfile = "< $stdinfile";
- }
- } else {
- $stdinfile = "";
- }
- return $stdinfile;
-}
-
-# parse config file
-sub parse_config(){
-
- # if specified config file does not exist, try get_files. If still not there, fail.
- print "$prog debug: config file is specified as $configfile\n" if ($debug);
- if (! -r $configfile) {
- print "$prog debug: $configfile does not exist, so try copying it with get_files\n" if ($debug);
- systemcall("get_files -data -symlink -remove $configfile",TRUE);
- if (! -r $configfile){
- prog_error_exit ("config file $configfile not found. Specify a config file with the option --config <filename>", 'SCRIPT_MISC');
- }
- }
- open CONFIG, "<$configfile"
- or prog_error_exit ("failed opening $configfile: $!\n", 'SCRIPT_MISC');
- print "\n$prog debug: start of config file\n" if ($debug);
- my $first = TRUE;
- my $this_test = {};
- my $current_test_id = '';
- while (<CONFIG>){
- chomp;
- # strip out comments
- $endofline = index $_, '#';
- if ($endofline == -1){
- $endofline = length;
- }
- $line = substr($_, 0, $endofline);
- # strip leading white space
- $line =~ s/^\s+//;
- # skip empty lines and lines with only spaces
- next if (length $line == 0);
- next if (/^\s+$/);
- #print "$prog debug: config $. >$line<\n" if ($debug);
- # test keyword
- if ($line =~ /^test/){
- if ($line =~ /^test\s+(\w+)/){
- my $id = $1;
- print "$prog debug: config id = >$id<\n" if ($debug);
- if ($current_test_id eq $id or exists $config{$id}){
- prog_error_exit ("test id $id is not unique",'SCRIPT_MISC');
- }
- # save old test config
- if (! $first){
- $config{$current_test_id} = $this_test;
- push @test_order, $current_test_id;
- }
- # new test config
- $first = FALSE;
- $current_test_id = $id;
- $this_test = {};
- # defaults
- $this_test->{'name'} = "test_$id";
- $this_test->{'disabled'} = FALSE;
- $this_test->{'checklog'} = FALSE;
-# $this_test->{'checklog_opts'} = "--config check_log.conf --showexcludestats";
- $this_test->{'checklog_opts'} = "--showexcludestats";
- $this_test->{'datafile'} = UNDEFINED;
- $this_test->{'datafilelink'} = 'ZEBRA.P';
- $this_test->{'joboptions'} = UNDEFINED;
- $this_test->{'pre_condition'} = ();
- $this_test->{'pre_command'} = ();
- $this_test->{'post_command'} = ();
- $this_test->{'post_test'} = ();
- $this_test->{'athena_env'} = 'export STAGE_SVCCLASS=atlascerngroupdisk;export STAGE_HOST=castoratlast3';
- $this_test->{'athena_args'} = UNDEFINED;
- $this_test->{'athena_cmd'} = 'athena.py -b';
- $this_test->{'exitmask'} = $default_exitmask;
- $this_test->{'stdinfile'} = '';
- $this_test->{'regtest'} = ();
- $this_test->{'filterlog'} = '';
- $this_test->{'compresslog'} = FALSE;
- $this_test->{'rootcomp'} = FALSE;
- $this_test->{'rootcomp_cmd'} = "";
- $this_test->{'rootcomp_file1'} = "";
- $this_test->{'rootcomp_file2'} = "";
- $this_test->{'checkcount'} = FALSE;
- $this_test->{'checkcount_file'} = "";
- $this_test->{'checkcount_tolerance'} = 1;
- $this_test->{'checkcount_level'} = "BOTH";
- $this_test->{'checkmerge'} = FALSE;
- $this_test->{'checkmerge_file'} = "";
- $this_test->{'checkmerge_reffile'} = "";
- $this_test->{'checkmerge_tolerance'} = 1;
- $this_test->{'emdcheck'} = ();
- $this_test->{'doc'} = "";
- next;
- }
- else {
- print "$prog: Error: config line $. incorrect, test definition invalid - ignoring line\n";
- next;
- }
- }
- if ($line =~ /^name\s+([^\s]+)/){
- $this_test->{'name'} = $1;
- print "$prog debug: config test name >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^datafile\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'datafile'} = $1;
- $this_test->{'datafilelink'} = $2;
- print "$prog debug: config datafile >$1< link >$2<\n" if ($debug);
- next;
- }
- if ($line =~ /^datafile\s+([^\s]+)/){
- $this_test->{'datafile'} = $1;
- print "$prog debug: config datafile >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^joboptions\s+([^\s]+)/){
- $this_test->{'joboptions'} = $1;
- print "$prog debug: config joboptions >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^pre_condition\s+(.+)$/){
- my $pre_condition = $1;
- push @{$this_test->{'pre_condition'}}, $pre_condition;
- print "$prog debug: config pre_condition >$pre_condition<\n" if ($debug);
- next;
- }
- if ($line =~ /^pre_command\s+(.+)$/){
- my $pre_command = $1;
- push @{$this_test->{'pre_command'}}, $pre_command;
- print "$prog debug: config pre_command >$pre_command<\n" if ($debug);
- next;
- }
- if ($line =~ /^post_command\s+(.+)$/){
- my $post_command = $1;
- push @{$this_test->{'post_command'}}, $post_command;
- print "$prog debug: config post_command >$post_command<\n" if ($debug);
- next;
- }
- if ($line =~ /^post_test\s+([^\s]+)\s+(.+)$/){
- my $post_test = {'name' => $1, 'cmd' => $2};
- push @{$this_test->{'post_test'}}, $post_test;
- print "$prog debug: config post_test >$1< >$2<\n" if ($debug);
- next;
- }
- if ($line =~ /^athena_args\s+(.+)$/){
- $this_test->{'athena_args'} = $1;
- print "$prog debug: config athena_args >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^athena_env\s+(.+)$/){
- $this_test->{'athena_env'} = $1;
- print "$prog debug: config athena_env >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^athena_cmd\s+(.+)$/){
- $this_test->{'athena_cmd'} = $1;
- print "$prog debug: config athena_cmd >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^extra_failure_codes\s+(.+)$/){
- $this_test->{'exitmask'} = $default_exitmask;
- my @codes = split('\s',$1);
- for (@codes) {
- if (exists $ERROR{$_}) {
- $this_test->{'exitmask'} |= $ERROR{$_};
- }
- else {
- my @tmp = keys %ERROR;
- prog_error_exit ("Exit code '$_' unknown. Allowed values are: @tmp",'SCRIPT_MISC');
- }
- }
- print "$prog debug: config extra_failure_codes >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^stdinfile\s+(.+)$/){
- $this_test->{'stdinfile'} = $1;
- print "$prog debug: config stdinfile >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^disable/){
- $this_test->{'disabled'} = TRUE;
- print "$prog debug: config disabled >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- next;
- }
- if ($line =~ /^checklog\s+(.+)$/){
- $this_test->{'checklog'} = TRUE;
- $this_test->{'checklog_opts'} = $1;
- print "$prog debug: config checklog >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checklog_opts >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^checklog\s*$/){
- $this_test->{'checklog'} = TRUE;
- print "$prog debug: config checklog >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- next;
- }
- if ($line =~ /^filterlog\s+(.+)$/){
- $this_test->{'filterlog'} = $1;
- print "$prog debug: config filterlog >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^compresslog/){
- $this_test->{'compresslog'} = TRUE;
- print "$prog debug: config compresslog >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- next;
- }
- if ($line =~ /^regtest\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- my $regtest = { 'algoname' => $1, 'match' => $2, 'reffile' => $3};
- push @{$this_test->{'regtest'}}, $regtest;
- print "$prog debug: config regtest >$1< >$2< >$3<\n" if ($debug);
- next;
- }
- if ($line =~ /^edmcheck\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- my $edmcheck = { 'algoname' => $1, 'edmfile' => $2, 'edmreffile' => $3};
- push @{$this_test->{'edmcheck'}}, $edmcheck;
- print "$prog debug: config edmcheck >$1< >$2< >$3<\n" if ($debug);
- next;
- }
- if ($line =~ /^fullregtest\s+([^\s]+)\s+([^\s]+)/){
- my $regtest = { 'algoname' => $fullregtest, 'match' => $1, 'reffile' => $2};
- push @{$this_test->{'regtest'}}, $regtest;
- print "$prog debug: config fullregtest >$1< >$2<\n" if ($debug);
- next;
- }
- if ($line =~ /^customregtest\s+(.+)$/){
- my $regtest = { 'algoname' => $customregtest, 'match' => $1, 'reffile' => ''};
- push @{$this_test->{'regtest'}}, $regtest;
- print "$prog debug: config customregtest >$1<\n" if ($debug);
- next;
- }
- #check merge
- if ($line =~ /^checkmerge\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'checkmerge'} = TRUE;
- $this_test->{'checkmerge_file'} = $1;
- $this_test->{'checkmerge_reffile'}= $2;
- $this_test->{'checkmerge_tolerance'}= $3;
- print "$prog debug: config checkmerge >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checkmerge_file >$1<\n" if ($debug);
- print "$prog debug: config checkmerge_reffile >$2<\n" if ($debug);
- print "$prog debug: config checkmerge_tolerance >$3<\n" if ($debug);
- next;
- }
- # check for 3rd argument (L2, EF or BOTH)
- if ($line =~ /^checkcount\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'checkcount'} = TRUE;
- $this_test->{'checkcount_file'} = $1;
- $this_test->{'checkcount_tolerance'}=$2;
- $this_test->{'checkcount_level'}=$3;
- print "$prog debug: config checkcount >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checkcount_file >$1<\n" if ($debug);
- print "$prog debug: config checkcount_tolerance >$2<\n" if ($debug);
- print "$prog debug: config checkcount_level >$3<\n" if ($debug);
- next;
- }
- # only 2 arguments, assume BOTH
- if ($line =~ /^checkcount\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'checkcount'} = TRUE;
- $this_test->{'checkcount_file'} = $1;
- $this_test->{'checkcount_tolerance'}=$2;
- print "$prog debug: config checkcount >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checkcount_file >$1<\n" if ($debug);
- print "$prog debug: config checkcount_tolerance >$2<\n" if ($debug);
- next;
- }
- # optional 2nd argument
- if ($line =~ /^rootcomp\s+([^\s]+)\s*([^\s]*)$/){
- $this_test->{'rootcomp'} = TRUE;
- $this_test->{'rootcomp_cmd'} = $rootcomp_cmd;
- if ($2 eq "") {
- $this_test->{'rootcomp_file1'} = "expert-monitoring.root";
- $this_test->{'rootcomp_file2'} = $1;
- }
- else {
- $this_test->{'rootcomp_file1'} = $1;
- $this_test->{'rootcomp_file2'} = $2;
- }
- print "$prog debug: config rootcomp >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config rootcomp_file1 >$this_test->{'rootcomp_file1'}<\n" if ($debug);
- print "$prog debug: config rootcomp_file2 >$this_test->{'rootcomp_file2'}<\n" if ($debug);
- next;
- }
- # old style
- if ($line =~ /^customrootcomp\s+([^\s]+)\s+([^\s]+)$/){
- $this_test->{'rootcomp'} = TRUE;
- $this_test->{'rootcomp_cmd'} = $1;
- $this_test->{'rootcomp_file2'} = $2;
- print "$prog debug: config custom rootcomp >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config custom rootcomp_cmd >$1<\n" if ($debug);
- print "$prog debug: config custom rootcomp_file2 >$2<\n" if ($debug);
- next;
- }
- # optional 3rd argument
- if ($line =~ /^customrootcomp\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)$/){
- $this_test->{'rootcomp'} = TRUE;
- $this_test->{'rootcomp_cmd'} = $1;
- $this_test->{'rootcomp_file1'} = $2;
- $this_test->{'rootcomp_file2'} = $3;
- print "$prog debug: config custom rootcomp >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config custom rootcomp_cmd >$1<\n" if ($debug);
- print "$prog debug: config custom rootcomp_file1 >$2<\n" if ($debug);
- print "$prog debug: config custom rootcomp_file2 >$3<\n" if ($debug);
- next;
- }
- if ($line =~ /^doc\s+(.+)$/){
- $this_test->{'doc'} = $1;
- print "$prog debug: config doc >$1<\n" if ($debug);
- next;
- }
- else {
- print "$prog: Warning: config line $. not recognised, ignoring it: $line\n";
- next;
- }
- }
- close CONFIG;
- print "$prog debug: end of config file\n\n" if ($debug);
- # save last test config
- if (! $first){
- $config{$current_test_id} = $this_test;
- push @test_order, $current_test_id;
- }
-
-}
-
-# display details of the configured tests
-sub print_config(){
- print "=== Test Configuration\n";
- foreach (keys %config){
- print "test: $_\n";
- print " name '" . $config{$_}->{'name'} . "' \n";
- print " doc '" . $config{$_}->{'doc'} . "'\n";
- print " disabled '" . ( $config{$_}->{'disabled'} ? "true" : "false") . "'\n";
- print " checklog '" . ( $config{$_}->{'checklog'} ? "true" : "false") . "'\n";
- print " checklog_opts '" . $config{$_}->{'checklog_opts'} . "'\n";
- print " filterlog '" . $config{$_}->{'filterlog'} . "'\n";
- print " compresslog '" . ( $config{$_}->{'compresslog'} ? "true" : "false") . "'\n";
- print " rootcomp '" . ( $config{$_}->{'rootcomp'} ? "true" : "false") . "'\n";
- print " rootcomp_cmd '" . $config{$_}->{'rootcomp_cmd'} . "'\n";
- print " rootcomp_file1 '" . $config{$_}->{'rootcomp_file1'} . "'\n";
- print " rootcomp_file2 '" . $config{$_}->{'rootcomp_file2'} . "'\n";
- print " checkcount '" . ( $config{$_}->{'checkcount'} ? "true" : "false") . "'\n";
- print " checkcount_file '" . $config{$_}->{'checkcount_file'} . "'\n";
- print " checkcount_tolerance '" . $config{$_}->{'checkcount_tolerance'} . "'\n";
- print " checkcount_level '" . $config{$_}->{'checkcount_level'} . "'\n";
- print " checkmerge '" . ( $config{$_}->{'checkcount'} ? "true" : "false") . "'\n";
- print " checkmerge_file '" . $config{$_}->{'checkcount_file'} . "'\n";
- print " checkmerge_tolerance '" . $config{$_}->{'checkcount_tolerance'} . "'\n";
- print " checkmerge_reffile '" . $config{$_}->{'checkcount_file'} . "'\n";
- print " datafile '" . $config{$_}->{'datafile'} . "'\n";
- print " datafilelink '" . $config{$_}->{'datafilelink'} . "'\n";
- print " joboptions '" . $config{$_}->{'joboptions'} . "'\n";
- for (@{$config{$_}->{'pre_condition'}}){
- print " pre_condition $_'\n";
- }
- for (@{$config{$_}->{'pre_command'}}){
- print " pre_command $_'\n";
- }
- for (@{$config{$_}->{'post_command'}}){
- print " post_command $_'\n";
- }
- for (@{$config{$_}->{'post_test'}}){
- print " post_test $_'\n";
- }
- print " athena_env'" . $config{$_}->{'athena_env'} . "'\n";
- print " athena_cmd '" . $config{$_}->{'athena_cmd'} . "'\n";
- print " athena_args '" . $config{$_}->{'athena_args'} . "'\n";
- printf " exitmask %#.8b \n", $config{$_}->{'exitmask'};
- print " stdinfile '" . $config{$_}->{'stdinfile'} . "'\n";
- if ($#{$config{$_}->{'regtest'}} == -1){
- print " (no regtests defined)\n";
- }
- for (@{$config{$_}->{'regtest'}}){
- print " regtest: algorithm name '" . $_->{'algoname'} . "'\n";
- print " match message pattern '" . $_->{'match'} . "'\n";
- print " reference file '" . $_->{'reffile'} . "'\n";
- }
- if ($#{$config{$_}->{'edmcheck'}} == -1){
- print " (no edmtests defined)\n";
- }
- for (@{$config{$_}->{'edmcheck'}}){
- print " edmcheck: algorithm name '" . $_->{'algoname'} . "'\n";
- print " edmfile '" . $_->{'edmfile'} . "'\n";
- print " reference file '" . $_->{'edmreffile'} . "'\n";
- }
- }
-}
-
-# check that tests specified on command line exist
-# replace names by ids
-sub check_tests(){
-
- # build map of tests by name
- my $test_id_byname = {};
- foreach (keys %config){
- my $name = $config{$_}->{'name'};
- if (exists $test_id_byname{$name}){
- print "$prog: error: test name $name is not unique\n";
- } else {
- $test_id_byname{$name} = $_;
- }
- }
-
- # check that tests specified on command line exist
- # replace names by ids
- for ( my $i=0; $i<=$#tests; $i++ ){
- if ( exists $config{$tests[$i]} ){
- next;
- } elsif ( exists $test_id_byname{$tests[$i]} ) {
- $tests[$i] = $test_id_byname{$tests[$i]};
- next;
- } else {
- prog_error_exit ("test name/id $tests[$i] is not defined in the config file", 'SCRIPT_MISC');
- }
- }
-
- # if no tests are specified, do them all in the order they were read in.
- if ($#tests == -1){
- @tests = @test_order;
- }
-}
-
-
-# loop over tests, skip those that are disabled
-sub do_tests(){
- my $first = TRUE;
- for (@tests){
- my $id = $_;
- @statuscodes = ( 'OK' ); # reset for status code of latest test
- $exitmask = $config{$id}->{'exitmask'}; # exitmask of latest test
- #print "-------------------------------------------------------\n";
- print "=== Test $id: " . $config{$id}->{'name'};
- if ($config{$id}->{'disabled'}) {
- print " is disabled\n";
- } else {
- print "\n";
- if ($first){
- first_test_prep();
- $first = FALSE;
- }
- run_test($id);
- if ($#statuscodes>0){
- $failures++;
- }
- $statuscode = process_error_codes(@statuscodes);
- $testresults{$id}=$statuscode;
- }
- print "--------------------------------------------------------------------------------\n";
- }
-}
-
-# Timer subroutine
-# given an initial time t0 in seconds since the epoch (i.e. as given by perl time function), calculates and prints the total elapsed (aka wallclock) time, user time and system time. Do not expect these to add up, e.g. if the system is busy with other users or you have to wait for castor.
-# NB if called multiple times, the last call will overwrite previous output files.
-sub timer($){
- my ($t0) = @_;
- my $t1=time();
- my ($tuser,$tsystem,$tcuser,$tcsystem) = times;
- printf( "=== Timer: total elapsed %d s, total user %6.2f s, total system %6.2f s\n",
- $t1-$t0, $tuser+$tcuser, $tsystem+$tcsystem);
- open TIMER, ">$timerout";
- printf TIMER "%d %f %f\n",$t1-$t0, $tuser+$tcuser, $tsystem+$tcsystem;
- close TIMER;
-
-}
-
-sub results_summary(){
- return if (!$showsummary);
- print "=== Test results summary\n";
- printf " %3s %-20s %-10s\n", "Id", "Test Name", "Result";
- for (@tests){
- my $id = $_;
- printf " %3s %-20s ", $id, $config{$id}->{'name'};
- if ($config{$id}->{'disabled'}){
- print "(disabled)\n";
- next;
- }
- if ($testresults{$id} == 0){
- print "passed";
- } else {
- print "failed ($testresults{$id})";
- }
- print "\n";
- }
-}
-
-# preparations before first test is run
-sub first_test_prep {
-
- # create run dir if it doesn't already exist
- if ( $clear_dir ) {
- system "rm -fr $run_dir";
- }
- if ( ! -d $run_dir ){
- mkpath $run_dir
- #or die "$prog: error: failed mkpath $run_dir: $!\n";
- }
- chdir $run_dir or prog_error_exit( "failed chdir $run_dir: $!\n", 'SCRIPT_MISC');
-
- # get log file from env
- my $ajl = $ENV{'ATN_JOB_LOGFILE'};
- if (defined($ajl)){
- system "echo $ajl > atn_job_logfile_name";
- }
-
- # run script to get relevant file
- my $id = $_;
- my $jobopts = $config{$id}->{'joboptions'};
- print "$prog debug: job options:$jobopts\n" if ($debug);
-}
-
-# run a test
-sub run_test($){
- my ($id) = @_;
- my $name = $config{$id}->{'name'};
-
- # prepare file names
- my $jobopts = $config{$id}->{'joboptions'};
- my $logfile = "atn_test.log";
- my $logfiletail = "atn_tail.log";
- my $local_jobopts = "";
- print "$prog debug: job options:$jobopts\n" if ($debug);
- systemcall("echo \"$config{$id}->{'doc'}\" > $docout");
- if ( $jobopts ne 'None' and $jobopts ne UNDEFINED ){
- my @suffixlist = ( '.py', '.txt' );
- my ($filename,$path,$suffix) = fileparse($jobopts,@suffixlist);
- $local_jobopts = $filename . "_test" . $suffix;
- $logfile = "$filename" . "_test.log";
- $logfiletail = "$filename" . "_tail.log";
- print "$prog debug: $jobopts $local_jobopts $logfile\n" if ($debug);
-
- # get copy of joboptions file to customise for this job,
- # if it's not already there
- # allow for the case of no jobotions (AthanMT)
- if (! -e "$filename$suffix" ){
- print "$prog debug: $filename$suffix does not exist, so copying it with get_files\n" if ($debug);
- systemcall("get_files -jo $jobopts");
- }
- if (-e "$filename$suffix"){ # check: will not be there in verify mode
- copy "$filename$suffix", "$local_jobopts"
- or prog_error_exit( "failed copying $filename$suffix to $local_jobopts: $!\n", 'SCRIPT_MISC');
- }
- # check permissions on local joboptions file before trying to append to it
- if (! -w $local_jobopts){
- chmod 0644, $local_jobopts
- or prog_error_exit( "failed to set write permission for $local_jobopts: $!\n", 'SCRIPT_MISC');
- }
-
-
- # append joboptions to set algorithm output level to 2,
- # for algorithms to be regression tested.
- open JOBOPTS, ">> $local_jobopts"
- or prog_error_exit ("failed opening $local_jobopts: $!\n", 'SCRIPT_MISC');
- print JOBOPTS "\n";
-# for (@{$config{$id}->{'regtest'}}){
-# my $algoname = $_->{'algoname'};
- # require some alphanumeric chars for a valid algoname
-# if ($algoname =~ /\w/){
-# print "$prog debug: appending to joboptions file: $algoname.Outputlevel = 2\n" if ($debug);
-# print JOBOPTS "Algorithm(\"$algoname\").Outputlevel = DEBUG\n";
-# print JOBOPTS "MessageSvc.debugLimit = 2000\n";
-# print JOBOPTS "MessageSvc.defaultLimit = 2000\n";
-# } else {
-# print "$prog warning: not setting output level for algorithm \"$algoname\" since it doesn't look like a valid name (no alphanumeric chars)\n";
-# }
-# }
- close JOBOPTS;
- }
- # run any pre-condition - they must all succeeed or else the job won't run
- my $pre_condition;
- my $precondrc=TRUE;
- for $pre_condition (@{$config{$id}->{'pre_condition'}}){
- my $precondrc1=systemcall("$pre_condition");
- print "$prog debug: pre_condition \"$pre_condition\" returned $precondrc1\n" if ($debug);
- if ($precondrc1!=0){
- print "$prog info: pre_condition \"$pre_condition\" failed (exit code $precondrc1)\n";
- $precondrc=FALSE;
- }
- }
- if ($precondrc){
- print "$prog debug: pre-conditions met\n" if ($debug);
- } else {
- print "$prog info: pre-conditions failed so test cannot be run. This is not a test failure.\n";
- push @statuscodes, 'PRECONDITION_FAILED_SO_NOT_RUN';
- return;
- }
-
- # run any pre-command
- my $pre_command;
- for $pre_command (@{$config{$id}->{'pre_command'}}){
- systemcall("$pre_command");
- }
-
- # link data file if specified
- my $datafile = $config{$id}->{'datafile'};
- my $datafilelink = $config{$id}->{'datafilelink'};
- if ($datafile ne UNDEFINED){
- # expand environment variables in datafile
- while ($datafile =~ /\$\{(.+)\}/){
- my $var = $1;
- if (exists $ENV{$var}){
- my $sub=$ENV{$var};
- $datafile =~ s/\$\{$var\}/$sub/;
- print "$prog debug: expanding env var '$var' in datafile yields: $datafile\n" if ($debug);
- } else {
- print "$prog: Warning: env var '$var' used in datafile definition is undefined, replacing with blank\n";
- $datafile =~ s/\$\{$1\}//;
- }
- }
-
- print "$prog debug: linking data file to $datafilelink: $datafile\n"
- if ($debug);
- if (-e $datafilelink or -l $datafilelink){
- print "$prog debug: first removing $datafilelink\n" if ($debug);
- unlink $datafilelink
- or die "$prog: error: failed to delete $datafilelink: $!\n";
- }
- symlink $datafile, $datafilelink
- or die "$prog: error: failed to symlink $datafilelink: $!\n";
- }
-
- # run athena
- my $athena_env = $config{$id}->{'athena_env'};
- my $athena_cmd = $config{$id}->{'athena_cmd'};
- my $athena_args = $config{$id}->{'athena_args'};
- my $filter_cmd = $config{$id}->{'filterlog'};
- $filter_cmd = " 2>&1 | " . $filter_cmd if (length($filter_cmd)>0);
- $athena_args = "" if ($athena_args eq UNDEFINED);
- my $stdinfile = getStdinFile($config{$id}->{'stdinfile'});
- print "=== Athena env '$athena_env' \n";
- print "=== Running '$athena_cmd $athena_args $local_jobopts $stdinfile $filter_cmd'\n";
- # the stderr redirection needs to be exactly at this place
- my $athenarc = systemcall("$athena_env ; $athena_cmd $athena_args $local_jobopts $stdinfile $filter_cmd > $logfile 2>&1");
-
- # the way to recognise a timeout
- $timeout = FALSE;
- if (! open LOG, "tail -600 $logfile|"){
- print "$prog: error: failed opening $logfile to read: $!\n";
- print "-> $failkey Aborting this test\n";
- # will happen later: return; # go on to next test
- }
- while (<LOG>){
- if (/CRITICAL stopped by user interrupt/ or
- /ERROR Keyboard interruption caught/ or
- /^Signal handler: Killing [0-9]+ with 15/){
- $timeout = TRUE;
- last;
- }
-
- }
- close LOG;
-
- print "$prog: debug: timeout=$timeout " . ($timeout?"true":"false") . " athenarc=$athenarc \n" if ($debug);
-
- # check athena return code
- #print "-------------------------------------------------------\n";
- if ($athenarc == 0 and not $timeout){
- print "=== $name OK: Athena exited normally\n";
- } elsif ($timeout){
- # or $athenarc == 35584 -> sometimes this exit code is just a seg fault
- print "=== $name $warnkey: Athena exceeded time limit and was killed\n";
- push @statuscodes, 'ATN_TIME_LIMIT';
- } else {
- print "=== $name $failkey : Athena exited abnormally! Exit code: $athenarc\n";
- push @statuscodes, 'ATHENA_BAD_EXIT';
- }
-
-
- # run any post-commands
- unlink "$postcmdout" if (-f "$postcmdout");
-# if
- if (defined $config{$id}->{'post_command'}
- and @{$config{$id}->{'post_command'}}>0) {
- my $post_command;
- @postrc=();
-
- for $post_command (@{$config{$id}->{'post_command'}}){
- # All post command share the same log file
- push @postrc, systemcall("($post_command) >> $postcmdout 2>&1");
- }
- systemcall("cat $postcmdout");
- print "$prog debug: post_command #commands: ".@postrc." return codes: @postrc \n" if ($debug);
- }
-
- my %reldata = release_metadata();
- my $nightly = (exists $reldata{'nightly name'} ? $reldata{'nightly name'} : "UNKNOWN");
- $nightly = $nightly . "/latest";
- print "$prog: looking for histograms and references for nightly $nightly \n";
-
- # run any post-tests
- unlink "$posttestrc" if (-f "$posttestrc");
- if ( defined(@{$config{$id}->{'post_test'}}) ) {
- my $post_test;
- my $total_rc = 0;
- @postrc=();
- open (POSTTEST, '>', $posttestrc);
- for $post_test (@{$config{$id}->{'post_test'}}){
- # Each post test has its own log file
- my $post_test_log = "post_test_$post_test->{'name'}.log";
- # Replace '$logfile' with the actual file name
- my $post_test_cmd = $post_test->{'cmd'};
- $post_test_cmd =~ s/\$logfile/$logfile/;
- # If there is a comparison to a reference file, make sure that the correct path is used
- $post_test_cmd =~ s/latest/$nightly/g;
- my $rc = systemcall("($post_test_cmd) > $post_test_log 2>&1");
- $total_rc += $rc;
- # Save return codes in separate text file
- print POSTTEST "$post_test->{'name'} $rc\n";
- }
- close POSTTEST;
- if ($total_rc>0) {
- push @statuscodes, 'POST_TEST_BAD_EXIT';
- }
- }
-
- my $pwd = `pwd`;
- chomp $pwd;
- # make a URL by substituting the lxbuild local disk path for the web
- # server URL if it does not match the lxbuild local disk path then it
- # will be left as a file path instead.
- # NB gives wrong address for incremental nightlies because the build is always done in atlrel_0 then copied to altrel_1-5 as appropriate
- my $logfileURL = $logfile;
- $logfileURL =~ s%/pool/build/atnight/localbuilds/nightlies%http://atlas-computing.web.cern.ch/atlas-computing/links/buildDirectory/nightlies%;
- print "=== Log file: " . $pwd . "/$logfileURL\nNB replace rel_0 with actual nightly in this URL.\n";
- if (! -e $logfile or -z $logfile){
- print "=== Error: log file does not exist or is empty, skipping the rest of this test\n";
- return;
- }
- # get data file LFN/PFN from log file + pool file catalogue
- if (! open LOG, "<$logfile"){
- print "$prog: error: failed opening $logfile to read: $!\n";
- print "-> $warnkey Aborting this test\n";
- return; # go on to next test
- }
- my $dataLFN="unknown";
- my $dataPFN="";
- my $eventCounter=0;
- while (my $line = <LOG>){
- if ($line =~ /InputCollections\s+\= \['(.*)'\]/){ # athena
- $dataLFN=$1;
- }
- elsif ($line =~ /event stream from file list\s+\['(.*)'\]/){ # athenaHLT
- $dataLFN=$1;
- }
- # count events for athena job
- ++$eventCounter if ($line =~ /AthenaEventLoopMgr\s+INFO\s+===>>> done processing event/);
- # handle athenaHLT case
- if ($line =~ /Py:athenaHLT\s+INFO\s+Processed ([0-9]+) events/){
- $eventCounter=$1;
- }
- }
- close LOG;
-
- print "$prog debug: dataLFN=$dataLFN\n" if ($debug);
- if ($dataLFN ne "unknown"){
- my $dataLFNstripped = $dataLFN;
- $dataLFNstripped =~ s/^LFN\://;
- my $cmdout1 = qx(FClistPFN -u xmlcatalog_file:PoolFileCatalog.xml -l $dataLFNstripped);
- chomp $cmdout1;
- if (length($cmdout1)>0){
- $dataPFN = $cmdout1;
- }
- print "$prog debug: dataLFNstripped=$dataLFNstripped dataPFN=$dataPFN\n" if ($debug);
- print "$prog debug: cmdout1=$cmdout1\n" if ($debug);
- }
- print "=== Data file: $dataLFN $dataPFN\n";
-
- # write how many events processed
- print "=== Events processed: $eventCounter\n";
-
- # check log file for likely errors and known false positives
- if ($config{$id}->{'checklog'}){
- my $checklog_opts = $config{$id}->{'checklog_opts'};
- # ERRORs
- my $logrc = systemcall("check_log.pl $checklog_opts $logfile > $checklogout 2>&1");
- systemcall("cat $checklogout");
- if ($logrc != 0){
- print "=== $name $failkey : problem detected in log file\n";
- push @statuscodes, 'ATHENA_ERROR_IN_LOG';
- }
- # WARNINGs
- $rc = systemcall("check_log.pl $checklog_opts --noerrors --warnings $logfile > $warnout 2>&1");
- # Ignore rc.
- }
-
- #make short file with last 600 lines only
- systemcall("tail -600 $logfile > $logfiletail");
-
-
- # rootcomp
- if ($config{$id}->{'rootcomp'}){
- my $rootcomp_file1 = $config{$id}->{'rootcomp_file1'};
- my $rootcomp_file2 = $config{$id}->{'rootcomp_file2'};
- if( $nightly ne "" ) {
- # allow for custom tests with two files
- $rootcomp_file2 =~ s/latest/$nightly/g ;
- }
- $rootcomp_file1 = resolveSymlinks($rootcomp_file1);
- $rootcomp_file2 = resolveSymlinks($rootcomp_file2);
-
- if (-e $rootcomp_file1) {
- if (-e $rootcomp_file2) {
- my $rc=systemcall("$config{$id}->{'rootcomp_cmd'} $rootcomp_file1 $rootcomp_file2 > $rootcompout 2>&1", TRUE);
- if ($rc != 0){
- print "=== $name WARNING: monitoring histogram mismatch detected by rootcomp\n";
- push @statuscodes, 'ROOTCOMP_MISMATCH';
- } else {
- print "=== $name: rootcomp: monitoring histograms match. \n";
- }
- }
- else {
- print "=== Alert: $rootcomp_file2 does not exist \n";
- }
- }
- else {
- print "=== Alert: $rootcomp_file1 does not exist \n";
- }
- #systemcall("cat $rootcompout");
- if (-e $rootcompout) {
- systemcall("grep -A 5 '^Summary' $rootcompout");
- }
- }
-
- # checkcount
- if ($config{$id}->{'checkcount'}){
- my $checkcount_file = $config{$id}->{'checkcount_file'};
- my $checkcount_tolerance = $config{$id}->{'checkcount_tolerance'};
- my $checkcount_level = $config{$id}->{'checkcount_level'};
- if( $nightly ne "" ) {
- $checkcount_file =~ s/latest/$nightly/ ;
- }
- $checkcount_file = resolveSymlinks($checkcount_file);
- print "$prog: checking trigger and TE counts \n";
- print "=== Running $checkcount_cmd $checkcount_tolerance $checkcount_file $checkcount_level > $checkcountout 2>&1 \n";
- my $rc=systemcall("$checkcount_cmd $checkcount_tolerance $checkcount_file $checkcount_level > $checkcountout 2>&1", TRUE);
- if ($rc != 0){
- print "=== $name WARNING: trigger count mismatch detected by checkcount\nSee $checkcountout for details.\n";
- push @statuscodes, 'CHECKCOUNTS_FAILED';
- } else {
- print "=== $name: countcheck: trigger counts match. \n";
- }
- #systemcall("cat $rootcompout");
- #Grep for FAILURE here so that bad runs will be flagged as such
- systemcall("grep 'FAILURE' $checkcountout");
- systemcall("grep 'test warning' $checkcountout");
- systemcall("grep 'tolerance' $checkcountout");
- }
-
- # checkmerge
- if ($config{$id}->{'checkmerge'}){
- my $checkmerge_file = $config{$id}->{'checkmerge_file'};
- my $checkmerge_tolerance = $config{$id}->{'checkmerge_tolerance'};
- my $checkmerge_reffile = $config{$id}->{'checkmerge_reffile'};
- if( $nightly ne "" ) {
- $checkmerge_file =~ s/latest/$nightly/ ;
- }
- $checkmerge_file = resolveSymlinks($checkmerge_file);
- print "$prog: checking trigger histograms for merged system \n";
- print "=== Running $checkmerge_cmd $checkmerge_file $checkmerge_reffile $checkmerge_tolerance > $checkmergeout 2>&1 \n";
- my $rc=systemcall("$checkmerge_cmd $checkmerge_file $checkmerge_reffile $checkmerge_tolerance > $checkmergeout 2>&1", TRUE);
-
- if ($rc != 0){
- print "=== $name WARNING: Errors detected by checkmerge\nSee $checkmergeout for details.\n";
- push @statuscodes, 'POST_TEST_BAD_EXIT';
- } else {
- print "=== $name: mergecheck: the test passed successfully. \n";
- }
- systemcall("grep 'ERROR' $checkmergeout");
- systemcall("grep 'WARNING' $checkmergeout");
- }
-
- # EDM tests
- my $emdcheckresult=TRUE;
- EDMCHECK:
- for (@{$config{$id}->{'edmcheck'}}){
- # truncate algorithm name for 30 characters
- my $algoname = $_->{'algoname'};
- my $truncalgoname = substr($algoname, 0, 30);
- my $edmfile = $_->{'edmfile'};
- my $edmreffile = $_->{'edmreffile'};
- # if file exist for this sepecfic nightly use it, otherwise
- # use default
- if( $nightly ne "" ) {
- $newedmreffile = $edmreffile;
- # substitute e.g. devval/latest for latest
- $newedmreffile =~ s/latest/$nightly/ ;
- # check if the reference file for this nightly exists
- if ( -e $edmreffile ) {
- $edmreffile = $newedmreffile;
- print "New reference file name $edmreffile \n";
- }
- }
- $edmreffile = resolveSymlinks($edmreffile);
- my $rc=systemcall("$truncalgoname -f $edmfile -r $edmreffile >>$edmcheckout 2>&1", TRUE);
- if ($rc != 0){
- print "=== $name WARNING: trigger edmcheck mismatch detected by $truncalgoname\nSee $edmcheckout for details.\n";
- print "=== $name if differences are understood cp $edmfile $edmreffile \n";
- } else {
- print "=== $name: edmcheck: files matched \n";
- }
- }
-
- # regression tests
- my $regtestresult=TRUE;
- REGTEST:
- for (@{$config{$id}->{'regtest'}}){
- # truncate algorithm name for 15 characters
- my $algoname = $_->{'algoname'};
- my $truncalgoname = substr($algoname, 0, 30);
- my $match = $_->{'match'};
- my $reffile = $_->{'reffile'};
- my $newfile = $reffile . ".new";
- # reference file caser
- if( substr($newfile, 0, 5) eq "/tmp/" ){
- # ref file is in /tmp, eg. from another tst (due to tmp filling up, avoid this)
- $newfile = substr($newfile, 5);
- } elsif ( substr($newfile,0,3) eq "../"){
- # reference is to another test -- other test must be first in test/xxx_TestConfigruation.xml
- my $lslash = rindex $newfile, '/';
- $newfile = substr($newfile, $lslash+1 );
- # in this case ref-file for an existing test will end in .new
- $reffile = $reffile . ".new";
- } elsif ( substr($newfile, 0, 5) eq "/afs/" ){
- # should be usual case: ref file is in afs
- my $lslash = rindex $newfile, '/';
- $newfile = substr($newfile, $lslash+1 );
- if( $nightly ne "" ) {
- $newreffile = $reffile;
- # substitute e.g. devval/latest for latest
- $newreffile =~ s/latest/$nightly/ ;
- # check if the reference file for this nightly exists
- if ( -e $newreffile ) {
- $reffile = $newreffile;
- print "New reference file name $reffile \n";
- }
- }
- }
- print "$prog debug: truncated algoname $truncalgoname\n" if ($debug);
- # extract regression test lines for this algorithm from log file
- open NEW, ">$newfile"
- or die "$prog: error: failed opening $newfile to write: $!\n";
- if (! open LOG, "<$logfile"){
- print "$prog: error: failed opening $logfile to read: $!\n";
- print "-> $warnkey Aborting this test\n";
- return FALSE; # go on to next test
- }
- my $lines=0;
- if ($algoname eq $fullregtest){
- while (<LOG>){
- if (/$match/){
- print NEW;
- $lines++;
- }
- }
- print "$prog debug: fullregtest $lines lines matched $match in LOG\n" if ($debug);
- } elsif ($algoname eq $customregtest){
- $rc = systemcall("$match >> $regtestout", TRUE);
- $regtestresult = ( $rc==0 ? TRUE : FALSE );
- next REGTEST;
- }
- else {
- while (<LOG>){
- if (/$truncalgoname.*$match/){
- print NEW;
- $lines++;
- }
- }
- print "$prog debug: regtest $lines lines matched $truncalgoname $match in LOG\n" if ($debug);
- }
-
- close LOG;
- close NEW;
- # check whether any lines matched - if zero it's an error straight away
- # and no point in doing the diff
- if ($lines == 0){
- # print failure keyword here to flag it as an error
- print "=== Alert! $warnkey no lines matching $match were found for $truncalgoname in log file\n";
- $regtestresult = FALSE;
- next REGTEST;
- }
- # diff the output and the reference
- # even if verify is off
- my $rc = 0;
- $reffile = resolveSymlinks($reffile);
- print "old/reference file $reffile\n";
- print "new/test file $newfile\n";
- print "< old/reference\n> new/test\n";
- print substr($reffile, 0, 4);
-# identify location of ref file
- if( substr($reffile, 0, 4) eq "/tmp" ){
- print "=== This test looks for reference in /tmp directory\n";
- } elsif( substr($reffile, 0, 3) eq "../" ){
- print "=== This test looks for reference in another directory\n";
- } elsif (substr($reffile, 0, 1) eq "/" ){
- print "=== This test looks for reference in /afs or /localhome directory\n";
- } else {
- print "=== This test looks for reference from svn\n";
- }
- if (-e $reffile) {
- # print "old/reference file exists!\n";
- systemcall("echo -e 'total lines in old/reference:' `wc -l $reffile` >>$regtestout",TRUE);
- systemcall("echo -e 'total lines in new/test :' `wc -l $newfile` >>$regtestout",TRUE);
- systemcall("echo -e '< old/reference\n> new/test' >> $regtestout", TRUE);
- $rc = systemcall("diff $reffile $newfile", TRUE);
- $rc = systemcall("diff $reffile $newfile >> $regtestout", TRUE);
-
- # Do HTML diff if differences are small enough
- $difflines = `wc -l $regtestout | cut -d' ' -f1`;
- if ($difflines < 1000) {
- systemcall("htmldiff.py -w 80 $reffile $newfile > $htmldiffout 2>&1", TRUE);
- }
- if ($rc == 0){
- print "=== Output is the same as reference for $algoname\n";
- } else {
- # print failure keyword here to flag it as an error
- print "=== Alert! $warnkey Output differs from reference for $algoname\n";
- print " If this change is understood, please update the reference file";
- if(substr($reffile, 0, 4) eq "/afs" ){
- print "by typing:\n cp $newfile $reffile\n";
- } else {
- print ".\n";
- }
- $regtestresult = FALSE;
- next REGTEST;
- }
- }
- else {
- print "=== Alert! old/reference file: $reffile does not exist - check if this is a new release!\n";
- }
- }
- if (!$regtestresult){
- push @statuscodes, 'ATHENA_REGTEST_FAILED';
- }
-
- # compress log file
- if ($config{$id}->{'compresslog'}){
- systemcall("gzip -9 $logfile");
- }
-
-# print "$prog debug: returning result $result ("
-# . ($result ? "true" : "false") . ")\n" if ($debug);
- return;
-}
-
-
-# wrap system calls to provide for verify and debug modes.
-# second, optional argument overrides verify mode if TRUE
-sub systemcall($;$){
- my $override_verify = FALSE;
- my $command;
- ($command, $override_verify) = @_;
-
- my $rc = 0;
- if ($verify or $debug){
- print "$prog: command: $command\n";
- }
- if (!$verify or $override_verify){
- $rc = system ($command);
- }
- $rc = ($rc >> 8); # see http://perldoc.perl.org/functions/system.html
- if ($debug){
- print "$prog: return code " . $rc . "\n";
- }
- return $rc;
-}
-
-# Resolve all symlinks in given path
-sub resolveSymlinks() {
- my ($path) = @_;
- return $path if (length $path == 0);
- my $respath = `readlink -f $path`;
- if ($? != 0) {
- return $path; # failure: return original path
- }
- chomp $respath;
- return $respath;
-}
-
-# Read ReleaseData file and return dictionary with content
-sub release_metadata() {
- my %data;
- my @dir = grep(/\/$ENV{'AtlasProject'}\//, split(':',$ENV{'LD_LIBRARY_PATH'}));
- open RELDATA, "$dir[0]/../ReleaseData" or print "=== Alert! Cannot open ReleaseData file\n";
- while (<RELDATA>) {
- chomp;
- my @kv = split(':');
- $data{$kv[0]} = $kv[1];
- }
- return %data;
-}
diff --git a/Trigger/TrigValidation/TrigValTools/bin/trigtest_ART.pl b/Trigger/TrigValidation/TrigValTools/bin/trigtest_ART.pl
deleted file mode 100755
index 4e7729dfbd45c8cb5a0ecb714be5526406a81735..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/bin/trigtest_ART.pl
+++ /dev/null
@@ -1,1393 +0,0 @@
-#!/usr/bin/perl -w
-# Script to manage Trigger tests
-# $Id: trigtest.pl,v 1.16 2009-05-20 15:53:22 sgeorge Exp $
-
-use Getopt::Long;
-use File::Basename;
-use File::Spec;
-use File::Copy;
-use File::Path;
-use constant TRUE => 1;
-use constant FALSE => 0;
-use constant UNDEFINED => "undefined";
-$prog = basename $0;
-$config = {};
-$fullregtest = '<fullregtest>';
-$customregtest = '<customregtest>';
-# set some output file names
-$regtestout = "regtest.log";
-$htmldiffout = "regtest.html";
-$summaryout = "summary.log";
-$timerout = "timer.log";
-$checklogout = "checklog.log";
-$warnout = "warn.log";
-$rootcompout = "rootcompout.log";
-$checkcountout = "checkcountout.log";
-$checkmergeout = "checkmergeout.log";
-$edmcheckout = "edmcheckout.log";
-$postcmdout = "postcmd.log";
-$posttestrc = "post_test.exitcodes";
-$docout = "doc.txt";
-
-# define error codes - must match atn_summary.pl
-%ERROR = (
- OK => 0,
- SCRIPT_MISC => 1,
- POST_TEST_BAD_EXIT => 2,
- ROOTCOMP_MISMATCH => 4,
- ATHENA_BAD_EXIT => 8,
- CHECKCOUNTS_FAILED => 16,
- ATHENA_ERROR_IN_LOG => 32,
- ATHENA_REGTEST_FAILED => 64,
- ATN_TIME_LIMIT => 128,
- PRECONDITION_FAILED_SO_NOT_RUN => 256
- );
-# max bit: 128. Bash takes return codes 0-256.
-# Larger numbers are taken mod 256 so effectively masked off. Can be used for internal signalling only.
-
-# mask off those codes above which you do not want to flag in the exit code
-# i.e. so ATN does not interpret them as the test failing.
-# bit positions marked 1 will be used, 0 will not be used.
-# SCRIPT_MISC is on the right, ATN_TIME_LIMIT on the left
-# This default mask can be modified via the 'extra_failure_codes' test directive
-# only "shout" if we see/have: ATHENA_BAD_EXIT => 8 decimal 8 in bit is 0b00001000 thus
-$default_exitmask = 0b00001001;
-
-# Exit mask of the last run test. Not nice but the easiest way to implement
-# this on top of all the other ugly things in this script.
-$exitmask = $default_exitmask;
-
-# command to use for rootcomp
-$rootcomp_cmd = "rootcomp.py --pdf --noRoot";
-$checkcount_cmd = "trigtest_checkcounts.sh";
-$checkmerge_cmd = "trigtest_check_merge.sh";
-sub main();
-main();
-exit -10;
-####
-
-sub main(){
- # trap errors from here on
- $SIG{'INT'} = 'CLEANUP_INT';
- $SIG{'TERM'} = 'CLEANUP_TERM';
- $t0=time(); # timer
- $failures = 0; # count number of tests which fail
- $statuscode = 0; # combination of errors from last test
- command_line();
- parse_config();
- if ($verify){
- print_config();
- }
- exit if ($verifyconfig);
- check_tests();
- do_tests();
- results_summary();
- timer($t0);
- if ($statuscode != 0){
- prog_error_exit("at end",@statuscodes);
- }
- exit 0;
- # exit($statuscode); # status code of last test
- # exit($failures); # number of tests which fail
-}
-
-sub CLEANUP_INT {
- print "\n\n$prog: Caught Interrupt (^C), probably ATN time exceeded, finish up and exit\n";
- push @statuscodes, 'ATN_TIME_LIMIT';
- timer($t0);
- if ($statuscode != 0){
- prog_error_exit("at end",@statuscodes);
- }
- exit(1); # never reaches this line in principle
-}
-
-sub CLEANUP_TERM {
- print "\n\n$prog: Caught TERM signal, finish up and exit\n";
- push @statuscodes, 'ATN_TIME_LIMIT';
- timer($t0);
- if ($statuscode != 0){
- prog_error_exit("at end",@statuscodes);
- }
- exit(1); # never reaches this line in principle
-}
-
-sub prog_error_exit($$){
- my ($message,@error_strings) = @_ or die;
- my $exitcode_unmasked = process_error_codes(@error_strings);
- # for ATN purposes, mask less significant codes
- my $exitcode = $exitcode_unmasked & $exitmask;
- if ($exitcode!=0){
- printf "$prog: $failkey $message (unmasked=%#.8b exitcode=%#.8b)\n", $exitcode_unmasked, $exitcode;
- } else {
- printf "$prog: $warnkey $message (unmasked=%#.8b exitcode=%#.8b)\n", $exitcode_unmasked, $exitcode;
- }
- exit($exitcode);
-
-}
-
-sub process_error_codes(@) {
- my (@error_strings) = @_;
- my $exitcode=0;
- # | sort | uniq
- my %saw;
- undef %saw;
- @saw{@error_strings} = ();
- my @error_strings_uniq = sort keys %saw;
- print "$prog: debug: all statuscodes: @error_strings\n" if ($debug);
- print "$prog: debug: uniq statuscodes: @error_strings_uniq\n" if ($debug);
- # convert strings, keep numbers as they are, add together
- print "=== These errors occured: ";
- open SUMMARY, ">$summaryout";
- for (@error_strings_uniq){
- my $code;
- if (/^\d+$/){
- # it's already a number
- $code = $_;
- } else {
- # translate string
- $code = $ERROR{$_};
- }
- $exitcode += $code;
- if ($code != 0){ # print all except ok.
- print "$_ ($code) ";
- print SUMMARY "$_ ($code)\n";
- }
- }
- print "\n";
- my $maskedcode = $exitcode & $exitmask;
- print "$prog:process_error_codes() debug exitcode = $exitcode maskedcode = $maskedcode\n" if ($debug);
- print SUMMARY " exitcode = $exitcode\n";
- print SUMMARY " maskedcode = $maskedcode\n";
- close SUMMARY;
- return $exitcode;
-}
-
-# command line arguments
-sub command_line(){
- # parse command arguments and check usage
- $debug = FALSE;
- $verify = FALSE;
- $verifyconfig = FALSE;
- $configfile = 'trigtest.conf'; # default
- $failkey = 'FAILURE';
- $warnkey = 'WARNING';
- $showsummary = FALSE;
- @tests = ();
- $run_dir = '../run'; # working directory, relative to cmt dir
- $clear_dir = FALSE;
- print "=== Command to repeat this test:\n $prog @ARGV\n";
- my $result = GetOptions ('help' => \$help,
- 'debug!' => \$debug,
- 'verify!' => \$verify,
- 'verifyconfig!' => \$verifyconfig,
- 'showsummary' => \$showsummary,
- 'failkey=s' => \$failkey,
- 'warnkey=s' => \$warnkey,
- 'config=s' => \$configfile,
- 'test=s' => \@tests,
- 'rundir=s' => \$run_dir,
- 'cleardir!' => \$clear_dir,
- 'package=s' => \$testpackagefq);
- if ($help || !$result) {
- usage();
- prog_error_exit("usage",'SCRIPT_MISC');
- }
- $verify = TRUE if ($verifyconfig);
- if (defined $testpackagefq){
- print "\n$prog info: note that the --package option is deprecated and will be removed in a \nfuture release. It no longer does anything.\n";
- }
-}
-
-# usage message
-sub usage(){
- print "
- Usage: $prog [options]
-
- Testing tool for managing Trigger software tests
-
- Options:
-
- --help show this information
- --debug print debug information, for the script maintainer
- --verify verify config file and show what would be done
- for the tests but don't run athena (see tip below)
- --verifyconfig just verify config file and stop
- --showsummary print a short summary table of tests results at the end
- --failkey <string> keyword to be printed to indicate to the test
- framework that a test has failed, default $failkey
- --failkey <string> keyword to be printed to indicate a problem, but not
- seen as failure by test framework, default $warnkey
- --config <file> specify config file, default trigtest.conf
- tries with get_files from DATAPATH if it doesn't exist
- --rundir <dir> specify directory in which to run tests, default ../run
- --cleardir remove/clear rundir before running (FALSE by default)
- --package <string> (deprecated, does nothing, will be removed in future release)
- --test <test name|id> specify test to run, see below
-
- A test name or id can optionally be specified after the --test
- option to run only that test. By default, all tests will be run in
- the order they are defined in the config file. The verify option
- will list all the available tests that are defined in the config
- file. The --test option may be repeated, and tests will be run in the
- order the come on the command line.
-
- See the sample config file for test configuration information.
-
- It is expected that this tool be run from the cmt or run directory
- under TriggerTest, after the necessary cmt environment has been set
- up. If you changed any files in TriggerTest or checked out a
- version different from the release you are using, then you need to
- gmake before running these tests. The --package option can be used
- to change this default location to another package for reference
- files and the check_log config file.
-
- Output from $prog will always be preceeded by its name (for error
- and debug messages) or '===' for the few messages you get without
- debug. All other messages come from other programs and commands it
- has run.
-
- Tip: after running a test for the first time, run again in verify
- mode and the same log files will be re-used. This is a good way to
- quickly test the config file, regression tests, and for script
- development.
-
- The exit code refers only to the last test - be sure to read the
- output if you run multiple tests!
- The exit code can be any combination of these values:
-";
- my $errorcode;
- foreach $error_name (sort { $ERROR{$a} <=> $ERROR{$b} } keys %ERROR) {
- printf " %20s %4d\n", $error_name, $ERROR{$error_name};
- }
-}
-
-
-# If using a file for stdin,
-# try to find it with get_files
-# then check it is there
-# and return with < pre-pended,
-# or return empty string if failed
-sub getStdinFile($){
- my ($stdinfile) = @_;
- $stdinfile =~ s/^\s+$//; # kill file names that are only spaces
- $stdinfile = $stdinfile;
- if (length($stdinfile)>0){
- if (! -e "$stdinfile" ){
- print "$prog debug: $stdinfile does not exist, so copying it with get_files\n" if ($debug);
- systemcall("get_files -data $stdinfile");
- } else {
- print "$prog debug: $stdinfile already exists; not copying it\n" if ($debug);
- }
- if (! -e $stdinfile){
- prog_error_exit ("stdin defined as '$stdinfile' but this is not found", 'SCRIPT_MISC');
- $stdinfile = "";
- } else {
- $stdinfile = "< $stdinfile";
- }
- } else {
- $stdinfile = "";
- }
- return $stdinfile;
-}
-
-# parse config file
-sub parse_config(){
-
- # if specified config file does not exist, try get_files. If still not there, fail.
- print "$prog debug: config file is specified as $configfile\n" if ($debug);
- if (! -r $configfile) {
- print "$prog debug: $configfile does not exist, so try copying it with get_files\n" if ($debug);
- systemcall("get_files -data -symlink -remove $configfile",TRUE);
- if (! -r $configfile){
- prog_error_exit ("config file $configfile not found. Specify a config file with the option --config <filename>", 'SCRIPT_MISC');
- }
- }
- open CONFIG, "<$configfile"
- or prog_error_exit ("failed opening $configfile: $!\n", 'SCRIPT_MISC');
- print "\n$prog debug: start of config file\n" if ($debug);
- my $first = TRUE;
- my $this_test = {};
- my $current_test_id = '';
- while (<CONFIG>){
- chomp;
- # strip out comments
- $endofline = index $_, '#';
- if ($endofline == -1){
- $endofline = length;
- }
- $line = substr($_, 0, $endofline);
- # strip leading white space
- $line =~ s/^\s+//;
- # skip empty lines and lines with only spaces
- next if (length $line == 0);
- next if (/^\s+$/);
- #print "$prog debug: config $. >$line<\n" if ($debug);
- # test keyword
- if ($line =~ /^test/){
- if ($line =~ /^test\s+(\w+)/){
- my $id = $1;
- print "$prog debug: config id = >$id<\n" if ($debug);
- if ($current_test_id eq $id or exists $config{$id}){
- prog_error_exit ("test id $id is not unique",'SCRIPT_MISC');
- }
- # save old test config
- if (! $first){
- $config{$current_test_id} = $this_test;
- push @test_order, $current_test_id;
- }
- # new test config
- $first = FALSE;
- $current_test_id = $id;
- $this_test = {};
- # defaults
- $this_test->{'name'} = "test_$id";
- $this_test->{'disabled'} = FALSE;
- $this_test->{'checklog'} = FALSE;
-# $this_test->{'checklog_opts'} = "--config check_log.conf --showexcludestats";
- $this_test->{'checklog_opts'} = "--showexcludestats";
- $this_test->{'datafile'} = UNDEFINED;
- $this_test->{'datafilelink'} = 'ZEBRA.P';
- $this_test->{'joboptions'} = UNDEFINED;
- $this_test->{'pre_condition'} = ();
- $this_test->{'pre_command'} = ();
- $this_test->{'post_command'} = ();
- $this_test->{'post_test'} = ();
- $this_test->{'athena_env'} = 'export STAGE_SVCCLASS=atlascerngroupdisk;export STAGE_HOST=castoratlast3';
- $this_test->{'athena_args'} = UNDEFINED;
- $this_test->{'athena_cmd'} = 'athena.py -b';
- $this_test->{'exitmask'} = $default_exitmask;
- $this_test->{'stdinfile'} = '';
- $this_test->{'regtest'} = ();
- $this_test->{'filterlog'} = '';
- $this_test->{'compresslog'} = FALSE;
- $this_test->{'rootcomp'} = FALSE;
- $this_test->{'rootcomp_cmd'} = "";
- $this_test->{'rootcomp_file1'} = "";
- $this_test->{'rootcomp_file2'} = "";
- $this_test->{'checkcount'} = FALSE;
- $this_test->{'checkcount_file'} = "";
- $this_test->{'checkcount_tolerance'} = 1;
- $this_test->{'checkcount_level'} = "BOTH";
- $this_test->{'checkmerge'} = FALSE;
- $this_test->{'checkmerge_file'} = "";
- $this_test->{'checkmerge_reffile'} = "";
- $this_test->{'checkmerge_tolerance'} = 1;
- $this_test->{'emdcheck'} = ();
- $this_test->{'doc'} = "";
- next;
- }
- else {
- print "$prog: Error: config line $. incorrect, test definition invalid - ignoring line\n";
- next;
- }
- }
- if ($line =~ /^name\s+([^\s]+)/){
- $this_test->{'name'} = $1;
- print "$prog debug: config test name >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^datafile\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'datafile'} = $1;
- $this_test->{'datafilelink'} = $2;
- print "$prog debug: config datafile >$1< link >$2<\n" if ($debug);
- next;
- }
- if ($line =~ /^datafile\s+([^\s]+)/){
- $this_test->{'datafile'} = $1;
- print "$prog debug: config datafile >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^joboptions\s+([^\s]+)/){
- $this_test->{'joboptions'} = $1;
- print "$prog debug: config joboptions >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^pre_condition\s+(.+)$/){
- my $pre_condition = $1;
- push @{$this_test->{'pre_condition'}}, $pre_condition;
- print "$prog debug: config pre_condition >$pre_condition<\n" if ($debug);
- next;
- }
- if ($line =~ /^pre_command\s+(.+)$/){
- my $pre_command = $1;
- push @{$this_test->{'pre_command'}}, $pre_command;
- print "$prog debug: config pre_command >$pre_command<\n" if ($debug);
- next;
- }
- if ($line =~ /^post_command\s+(.+)$/){
- my $post_command = $1;
- push @{$this_test->{'post_command'}}, $post_command;
- print "$prog debug: config post_command >$post_command<\n" if ($debug);
- next;
- }
- if ($line =~ /^post_test\s+([^\s]+)\s+(.+)$/){
- my $post_test = {'name' => $1, 'cmd' => $2};
- push @{$this_test->{'post_test'}}, $post_test;
- print "$prog debug: config post_test >$1< >$2<\n" if ($debug);
- next;
- }
- if ($line =~ /^athena_args\s+(.+)$/){
- $this_test->{'athena_args'} = $1;
- print "$prog debug: config athena_args >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^athena_env\s+(.+)$/){
- $this_test->{'athena_env'} = $1;
- print "$prog debug: config athena_env >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^athena_cmd\s+(.+)$/){
- $this_test->{'athena_cmd'} = $1;
- print "$prog debug: config athena_cmd >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^extra_failure_codes\s+(.+)$/){
- $this_test->{'exitmask'} = $default_exitmask;
- my @codes = split('\s',$1);
- for (@codes) {
- if (exists $ERROR{$_}) {
- $this_test->{'exitmask'} |= $ERROR{$_};
- }
- else {
- my @tmp = keys %ERROR;
- prog_error_exit ("Exit code '$_' unknown. Allowed values are: @tmp",'SCRIPT_MISC');
- }
- }
- print "$prog debug: config extra_failure_codes >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^stdinfile\s+(.+)$/){
- $this_test->{'stdinfile'} = $1;
- print "$prog debug: config stdinfile >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^disable/){
- $this_test->{'disabled'} = TRUE;
- print "$prog debug: config disabled >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- next;
- }
- if ($line =~ /^checklog\s+(.+)$/){
- $this_test->{'checklog'} = TRUE;
- $this_test->{'checklog_opts'} = $1;
- print "$prog debug: config checklog >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checklog_opts >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^checklog\s*$/){
- $this_test->{'checklog'} = TRUE;
- print "$prog debug: config checklog >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- next;
- }
- if ($line =~ /^filterlog\s+(.+)$/){
- $this_test->{'filterlog'} = $1;
- print "$prog debug: config filterlog >$1<\n" if ($debug);
- next;
- }
- if ($line =~ /^compresslog/){
- $this_test->{'compresslog'} = TRUE;
- print "$prog debug: config compresslog >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- next;
- }
- if ($line =~ /^regtest\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- my $regtest = { 'algoname' => $1, 'match' => $2, 'reffile' => $3};
- push @{$this_test->{'regtest'}}, $regtest;
- print "$prog debug: config regtest >$1< >$2< >$3<\n" if ($debug);
- next;
- }
- if ($line =~ /^edmcheck\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- my $edmcheck = { 'algoname' => $1, 'edmfile' => $2, 'edmreffile' => $3};
- push @{$this_test->{'edmcheck'}}, $edmcheck;
- print "$prog debug: config edmcheck >$1< >$2< >$3<\n" if ($debug);
- next;
- }
- if ($line =~ /^fullregtest\s+([^\s]+)\s+([^\s]+)/){
- my $regtest = { 'algoname' => $fullregtest, 'match' => $1, 'reffile' => $2};
- push @{$this_test->{'regtest'}}, $regtest;
- print "$prog debug: config fullregtest >$1< >$2<\n" if ($debug);
- next;
- }
- if ($line =~ /^customregtest\s+(.+)$/){
- my $regtest = { 'algoname' => $customregtest, 'match' => $1, 'reffile' => ''};
- push @{$this_test->{'regtest'}}, $regtest;
- print "$prog debug: config customregtest >$1<\n" if ($debug);
- next;
- }
- #check merge
- if ($line =~ /^checkmerge\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'checkmerge'} = TRUE;
- $this_test->{'checkmerge_file'} = $1;
- $this_test->{'checkmerge_reffile'}= $2;
- $this_test->{'checkmerge_tolerance'}= $3;
- print "$prog debug: config checkmerge >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checkmerge_file >$1<\n" if ($debug);
- print "$prog debug: config checkmerge_reffile >$2<\n" if ($debug);
- print "$prog debug: config checkmerge_tolerance >$3<\n" if ($debug);
- next;
- }
- # check for 3rd argument (L2, EF or BOTH)
- if ($line =~ /^checkcount\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'checkcount'} = TRUE;
- $this_test->{'checkcount_file'} = $1;
- $this_test->{'checkcount_tolerance'}=$2;
- $this_test->{'checkcount_level'}=$3;
- print "$prog debug: config checkcount >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checkcount_file >$1<\n" if ($debug);
- print "$prog debug: config checkcount_tolerance >$2<\n" if ($debug);
- print "$prog debug: config checkcount_level >$3<\n" if ($debug);
- next;
- }
- # only 2 arguments, assume BOTH
- if ($line =~ /^checkcount\s+([^\s]+)\s+([^\s]+)/){
- $this_test->{'checkcount'} = TRUE;
- $this_test->{'checkcount_file'} = $1;
- $this_test->{'checkcount_tolerance'}=$2;
- print "$prog debug: config checkcount >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config checkcount_file >$1<\n" if ($debug);
- print "$prog debug: config checkcount_tolerance >$2<\n" if ($debug);
- next;
- }
- # optional 2nd argument
- if ($line =~ /^rootcomp\s+([^\s]+)\s*([^\s]*)$/){
- $this_test->{'rootcomp'} = TRUE;
- $this_test->{'rootcomp_cmd'} = $rootcomp_cmd;
- if ($2 eq "") {
- $this_test->{'rootcomp_file1'} = "expert-monitoring.root";
- $this_test->{'rootcomp_file2'} = $1;
- }
- else {
- $this_test->{'rootcomp_file1'} = $1;
- $this_test->{'rootcomp_file2'} = $2;
- }
- print "$prog debug: config rootcomp >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config rootcomp_file1 >$this_test->{'rootcomp_file1'}<\n" if ($debug);
- print "$prog debug: config rootcomp_file2 >$this_test->{'rootcomp_file2'}<\n" if ($debug);
- next;
- }
- # old style
- if ($line =~ /^customrootcomp\s+([^\s]+)\s+([^\s]+)$/){
- $this_test->{'rootcomp'} = TRUE;
- $this_test->{'rootcomp_cmd'} = $1;
- $this_test->{'rootcomp_file2'} = $2;
- print "$prog debug: config custom rootcomp >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config custom rootcomp_cmd >$1<\n" if ($debug);
- print "$prog debug: config custom rootcomp_file2 >$2<\n" if ($debug);
- next;
- }
- # optional 3rd argument
- if ($line =~ /^customrootcomp\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)$/){
- $this_test->{'rootcomp'} = TRUE;
- $this_test->{'rootcomp_cmd'} = $1;
- $this_test->{'rootcomp_file1'} = $2;
- $this_test->{'rootcomp_file2'} = $3;
- print "$prog debug: config custom rootcomp >" . ( $_ ? "true" : "false") . "<\n" if ($debug);
- print "$prog debug: config custom rootcomp_cmd >$1<\n" if ($debug);
- print "$prog debug: config custom rootcomp_file1 >$2<\n" if ($debug);
- print "$prog debug: config custom rootcomp_file2 >$3<\n" if ($debug);
- next;
- }
- if ($line =~ /^doc\s+(.+)$/){
- $this_test->{'doc'} = $1;
- print "$prog debug: config doc >$1<\n" if ($debug);
- next;
- }
- else {
- print "$prog: Warning: config line $. not recognised, ignoring it: $line\n";
- next;
- }
- }
- close CONFIG;
- print "$prog debug: end of config file\n\n" if ($debug);
- # save last test config
- if (! $first){
- $config{$current_test_id} = $this_test;
- push @test_order, $current_test_id;
- }
-
-}
-
-# display details of the configured tests
-sub print_config(){
- print "=== Test Configuration\n";
- foreach (keys %config){
- print "test: $_\n";
- print " name '" . $config{$_}->{'name'} . "' \n";
- print " doc '" . $config{$_}->{'doc'} . "'\n";
- print " disabled '" . ( $config{$_}->{'disabled'} ? "true" : "false") . "'\n";
- print " checklog '" . ( $config{$_}->{'checklog'} ? "true" : "false") . "'\n";
- print " checklog_opts '" . $config{$_}->{'checklog_opts'} . "'\n";
- print " filterlog '" . $config{$_}->{'filterlog'} . "'\n";
- print " compresslog '" . ( $config{$_}->{'compresslog'} ? "true" : "false") . "'\n";
- print " rootcomp '" . ( $config{$_}->{'rootcomp'} ? "true" : "false") . "'\n";
- print " rootcomp_cmd '" . $config{$_}->{'rootcomp_cmd'} . "'\n";
- print " rootcomp_file1 '" . $config{$_}->{'rootcomp_file1'} . "'\n";
- print " rootcomp_file2 '" . $config{$_}->{'rootcomp_file2'} . "'\n";
- print " checkcount '" . ( $config{$_}->{'checkcount'} ? "true" : "false") . "'\n";
- print " checkcount_file '" . $config{$_}->{'checkcount_file'} . "'\n";
- print " checkcount_tolerance '" . $config{$_}->{'checkcount_tolerance'} . "'\n";
- print " checkcount_level '" . $config{$_}->{'checkcount_level'} . "'\n";
- print " checkmerge '" . ( $config{$_}->{'checkcount'} ? "true" : "false") . "'\n";
- print " checkmerge_file '" . $config{$_}->{'checkcount_file'} . "'\n";
- print " checkmerge_tolerance '" . $config{$_}->{'checkcount_tolerance'} . "'\n";
- print " checkmerge_reffile '" . $config{$_}->{'checkcount_file'} . "'\n";
- print " datafile '" . $config{$_}->{'datafile'} . "'\n";
- print " datafilelink '" . $config{$_}->{'datafilelink'} . "'\n";
- print " joboptions '" . $config{$_}->{'joboptions'} . "'\n";
- for (@{$config{$_}->{'pre_condition'}}){
- print " pre_condition $_'\n";
- }
- for (@{$config{$_}->{'pre_command'}}){
- print " pre_command $_'\n";
- }
- for (@{$config{$_}->{'post_command'}}){
- print " post_command $_'\n";
- }
- for (@{$config{$_}->{'post_test'}}){
- print " post_test $_'\n";
- }
- print " athena_env'" . $config{$_}->{'athena_env'} . "'\n";
- print " athena_cmd '" . $config{$_}->{'athena_cmd'} . "'\n";
- print " athena_args '" . $config{$_}->{'athena_args'} . "'\n";
- printf " exitmask %#.8b \n", $config{$_}->{'exitmask'};
- print " stdinfile '" . $config{$_}->{'stdinfile'} . "'\n";
- if ($#{$config{$_}->{'regtest'}} == -1){
- print " (no regtests defined)\n";
- }
- for (@{$config{$_}->{'regtest'}}){
- print " regtest: algorithm name '" . $_->{'algoname'} . "'\n";
- print " match message pattern '" . $_->{'match'} . "'\n";
- print " reference file '" . $_->{'reffile'} . "'\n";
- }
- if ($#{$config{$_}->{'edmcheck'}} == -1){
- print " (no edmtests defined)\n";
- }
- for (@{$config{$_}->{'edmcheck'}}){
- print " edmcheck: algorithm name '" . $_->{'algoname'} . "'\n";
- print " edmfile '" . $_->{'edmfile'} . "'\n";
- print " reference file '" . $_->{'edmreffile'} . "'\n";
- }
- }
-}
-
-# check that tests specified on command line exist
-# replace names by ids
-sub check_tests(){
-
- # build map of tests by name
- my $test_id_byname = {};
- foreach (keys %config){
- my $name = $config{$_}->{'name'};
- if (exists $test_id_byname{$name}){
- print "$prog: error: test name $name is not unique\n";
- } else {
- $test_id_byname{$name} = $_;
- }
- }
-
- # check that tests specified on command line exist
- # replace names by ids
- for ( my $i=0; $i<=$#tests; $i++ ){
- if ( exists $config{$tests[$i]} ){
- next;
- } elsif ( exists $test_id_byname{$tests[$i]} ) {
- $tests[$i] = $test_id_byname{$tests[$i]};
- next;
- } else {
- prog_error_exit ("test name/id $tests[$i] is not defined in the config file", 'SCRIPT_MISC');
- }
- }
-
- # if no tests are specified, do them all in the order they were read in.
- if ($#tests == -1){
- @tests = @test_order;
- }
-}
-
-
-# loop over tests, skip those that are disabled
-sub do_tests(){
- my $first = TRUE;
- for (@tests){
- my $id = $_;
- @statuscodes = ( 'OK' ); # reset for status code of latest test
- $exitmask = $config{$id}->{'exitmask'}; # exitmask of latest test
- #print "-------------------------------------------------------\n";
- print "=== Test $id: " . $config{$id}->{'name'};
- if ($config{$id}->{'disabled'}) {
- print " is disabled\n";
- } else {
- print "\n";
- if ($first){
- first_test_prep();
- $first = FALSE;
- }
- run_test($id);
- if ($#statuscodes>0){
- $failures++;
- }
- $statuscode = process_error_codes(@statuscodes);
- $testresults{$id}=$statuscode;
- }
- print "--------------------------------------------------------------------------------\n";
- }
-}
-
-# Timer subroutine
-# given an initial time t0 in seconds since the epoch (i.e. as given by perl time function), calculates and prints the total elapsed (aka wallclock) time, user time and system time. Do not expect these to add up, e.g. if the system is busy with other users or you have to wait for castor.
-# NB if called multiple times, the last call will overwrite previous output files.
-sub timer($){
- my ($t0) = @_;
- my $t1=time();
- my ($tuser,$tsystem,$tcuser,$tcsystem) = times;
- printf( "=== Timer: total elapsed %d s, total user %6.2f s, total system %6.2f s\n",
- $t1-$t0, $tuser+$tcuser, $tsystem+$tcsystem);
- open TIMER, ">$timerout";
- printf TIMER "%d %f %f\n",$t1-$t0, $tuser+$tcuser, $tsystem+$tcsystem;
- close TIMER;
-
-}
-
-sub results_summary(){
- return if (!$showsummary);
- print "=== Test results summary\n";
- printf " %3s %-20s %-10s\n", "Id", "Test Name", "Result";
- for (@tests){
- my $id = $_;
- printf " %3s %-20s ", $id, $config{$id}->{'name'};
- if ($config{$id}->{'disabled'}){
- print "(disabled)\n";
- next;
- }
- if ($testresults{$id} == 0){
- print "passed";
- } else {
- print "failed ($testresults{$id})";
- }
- print "\n";
- }
-}
-
-# preparations before first test is run
-sub first_test_prep {
-
- # create run dir if it doesn't already exist
- if ( $clear_dir ) {
- system "rm -fr $run_dir";
- }
- if ( ! -d $run_dir ){
- mkpath $run_dir
- #or die "$prog: error: failed mkpath $run_dir: $!\n";
- }
- chdir $run_dir or prog_error_exit( "failed chdir $run_dir: $!\n", 'SCRIPT_MISC');
-
- # get log file from env
- my $ajl = $ENV{'ATN_JOB_LOGFILE'};
- if (defined($ajl)){
- system "echo $ajl > atn_job_logfile_name";
- }
-
- # run script to get relevant file
- my $id = $_;
- my $jobopts = $config{$id}->{'joboptions'};
- print "$prog debug: job options:$jobopts\n" if ($debug);
-}
-
-# run a test
-sub run_test($){
- my ($id) = @_;
- my $name = $config{$id}->{'name'};
-
- # prepare file names
- my $jobopts = $config{$id}->{'joboptions'};
- my $logfile = "atn_test.log";
- my $logfiletail = "atn_tail.log";
- my $local_jobopts = "";
- print "$prog debug: job options:$jobopts\n" if ($debug);
- systemcall("echo \"$config{$id}->{'doc'}\" > $docout");
- if ( $jobopts ne 'None' and $jobopts ne UNDEFINED ){
- my @suffixlist = ( '.py', '.txt' );
- my ($filename,$path,$suffix) = fileparse($jobopts,@suffixlist);
- $local_jobopts = $filename . "_test" . $suffix;
- $logfile = "$filename" . "_test.log";
- $logfiletail = "$filename" . "_tail.log";
- print "$prog debug: $jobopts $local_jobopts $logfile\n" if ($debug);
-
- # get copy of joboptions file to customise for this job,
- # if it's not already there
- # allow for the case of no jobotions (AthanMT)
- if (! -e "$filename$suffix" ){
- print "$prog debug: $filename$suffix does not exist, so copying it with get_files\n" if ($debug);
- systemcall("get_files -jo $jobopts");
- }
- if (-e "$filename$suffix"){ # check: will not be there in verify mode
- copy "$filename$suffix", "$local_jobopts"
- or prog_error_exit( "failed copying $filename$suffix to $local_jobopts: $!\n", 'SCRIPT_MISC');
- }
- # check permissions on local joboptions file before trying to append to it
- if (! -w $local_jobopts){
- chmod 0644, $local_jobopts
- or prog_error_exit( "failed to set write permission for $local_jobopts: $!\n", 'SCRIPT_MISC');
- }
-
-
- # append joboptions to set algorithm output level to 2,
- # for algorithms to be regression tested.
- open JOBOPTS, ">> $local_jobopts"
- or prog_error_exit ("failed opening $local_jobopts: $!\n", 'SCRIPT_MISC');
- print JOBOPTS "\n";
-# for (@{$config{$id}->{'regtest'}}){
-# my $algoname = $_->{'algoname'};
- # require some alphanumeric chars for a valid algoname
-# if ($algoname =~ /\w/){
-# print "$prog debug: appending to joboptions file: $algoname.Outputlevel = 2\n" if ($debug);
-# print JOBOPTS "Algorithm(\"$algoname\").Outputlevel = DEBUG\n";
-# print JOBOPTS "MessageSvc.debugLimit = 2000\n";
-# print JOBOPTS "MessageSvc.defaultLimit = 2000\n";
-# } else {
-# print "$prog warning: not setting output level for algorithm \"$algoname\" since it doesn't look like a valid name (no alphanumeric chars)\n";
-# }
-# }
- close JOBOPTS;
- }
- # run any pre-condition - they must all succeeed or else the job won't run
- my $pre_condition;
- my $precondrc=TRUE;
- for $pre_condition (@{$config{$id}->{'pre_condition'}}){
- my $precondrc1=systemcall("$pre_condition");
- print "$prog debug: pre_condition \"$pre_condition\" returned $precondrc1\n" if ($debug);
- if ($precondrc1!=0){
- print "$prog info: pre_condition \"$pre_condition\" failed (exit code $precondrc1)\n";
- $precondrc=FALSE;
- }
- }
- if ($precondrc){
- print "$prog debug: pre-conditions met\n" if ($debug);
- } else {
- print "$prog info: pre-conditions failed so test cannot be run. This is not a test failure.\n";
- push @statuscodes, 'PRECONDITION_FAILED_SO_NOT_RUN';
- return;
- }
-
- # run any pre-command
- my $pre_command;
- for $pre_command (@{$config{$id}->{'pre_command'}}){
- systemcall("$pre_command");
- }
-
- # link data file if specified
- my $datafile = $config{$id}->{'datafile'};
- my $datafilelink = $config{$id}->{'datafilelink'};
- if ($datafile ne UNDEFINED){
- # expand environment variables in datafile
- while ($datafile =~ /\$\{(.+)\}/){
- my $var = $1;
- if (exists $ENV{$var}){
- my $sub=$ENV{$var};
- $datafile =~ s/\$\{$var\}/$sub/;
- print "$prog debug: expanding env var '$var' in datafile yields: $datafile\n" if ($debug);
- } else {
- print "$prog: Warning: env var '$var' used in datafile definition is undefined, replacing with blank\n";
- $datafile =~ s/\$\{$1\}//;
- }
- }
-
- print "$prog debug: linking data file to $datafilelink: $datafile\n"
- if ($debug);
- if (-e $datafilelink or -l $datafilelink){
- print "$prog debug: first removing $datafilelink\n" if ($debug);
- unlink $datafilelink
- or die "$prog: error: failed to delete $datafilelink: $!\n";
- }
- symlink $datafile, $datafilelink
- or die "$prog: error: failed to symlink $datafilelink: $!\n";
- }
-
- # run athena
- my $athena_env = $config{$id}->{'athena_env'};
- my $athena_cmd = $config{$id}->{'athena_cmd'};
- my $athena_args = $config{$id}->{'athena_args'};
- my $filter_cmd = $config{$id}->{'filterlog'};
- $filter_cmd = " 2>&1 | " . $filter_cmd if (length($filter_cmd)>0);
- $athena_args = "" if ($athena_args eq UNDEFINED);
- my $stdinfile = getStdinFile($config{$id}->{'stdinfile'});
- print "=== Athena env '$athena_env' \n";
- print "=== Running '$athena_cmd $athena_args $local_jobopts $stdinfile $filter_cmd'\n";
- # the stderr redirection needs to be exactly at this place
- my $athenarc = systemcall("$athena_env ; $athena_cmd $athena_args $local_jobopts $stdinfile $filter_cmd > $logfile 2>&1");
-
- # the way to recognise a timeout
- $timeout = FALSE;
- if (! open LOG, "tail -600 $logfile|"){
- print "$prog: error: failed opening $logfile to read: $!\n";
- print "-> $failkey Aborting this test\n";
- # will happen later: return; # go on to next test
- }
- while (<LOG>){
- if (/CRITICAL stopped by user interrupt/ or
- /ERROR Keyboard interruption caught/ or
- /^Signal handler: Killing [0-9]+ with 15/){
- $timeout = TRUE;
- last;
- }
-
- }
- close LOG;
-
- print "$prog: debug: timeout=$timeout " . ($timeout?"true":"false") . " athenarc=$athenarc \n" if ($debug);
-
- # check athena return code
- #print "-------------------------------------------------------\n";
- if ($athenarc == 0 and not $timeout){
- print "=== $name OK: Athena exited normally\n";
- print "art-result: 0 athena.$name\n";
- } elsif ($timeout){
- # or $athenarc == 35584 -> sometimes this exit code is just a seg fault
- print "=== $name $warnkey: Athena exceeded time limit and was killed\n";
- print "art-result: 1 athena.$name\n";
- push @statuscodes, 'ATN_TIME_LIMIT';
- } else {
- print "=== $name $failkey : Athena exited abnormally! Exit code: $athenarc\n";
- print "art-result: 2 athena.$name\n";
- push @statuscodes, 'ATHENA_BAD_EXIT';
- }
-
-
- # run any post-commands
- unlink "$postcmdout" if (-f "$postcmdout");
-# if
- if (defined $config{$id}->{'post_command'}
- and @{$config{$id}->{'post_command'}}>0) {
- my $post_command;
- @postrc=();
-
- for $post_command (@{$config{$id}->{'post_command'}}){
- # All post command share the same log file
- push @postrc, systemcall("($post_command) >> $postcmdout 2>&1");
- }
- systemcall("cat $postcmdout");
- print "$prog debug: post_command #commands: ".@postrc." return codes: @postrc \n" if ($debug);
- }
-
- my %reldata = release_metadata();
- my $nightly = (exists $reldata{'nightly name'} ? $reldata{'nightly name'} : "UNKNOWN");
- # modification for ART (ATR-17618)
- # $nightly = $nightly . "/latest";
- print "$prog: looking for histograms and references for nightly $nightly \n";
-
- # run any post-tests
- unlink "$posttestrc" if (-f "$posttestrc");
- if ( defined(@{$config{$id}->{'post_test'}}) ) {
- my $post_test;
- my $total_rc = 0;
- @postrc=();
- open (POSTTEST, '>', $posttestrc);
- for $post_test (@{$config{$id}->{'post_test'}}){
- # Each post test has its own log file
- my $post_test_log = "post_test_$post_test->{'name'}.log";
- # Replace '$logfile' with the actual file name
- my $post_test_cmd = $post_test->{'cmd'};
- $post_test_cmd =~ s/\$logfile/$logfile/;
- # If there is a comparison to a reference file, make sure that the correct path is used
- $post_test_cmd =~ s/latest/$nightly/g;
- my $rc = systemcall("($post_test_cmd) > $post_test_log 2>&1");
- $total_rc += $rc;
- # Save return codes in separate text file
- print POSTTEST "$post_test->{'name'} $rc\n";
- }
- close POSTTEST;
- if ($total_rc>0) {
- push @statuscodes, 'POST_TEST_BAD_EXIT';
- }
- }
-
- my $pwd = `pwd`;
- chomp $pwd;
- # make a URL by substituting the lxbuild local disk path for the web
- # server URL if it does not match the lxbuild local disk path then it
- # will be left as a file path instead.
- # NB gives wrong address for incremental nightlies because the build is always done in atlrel_0 then copied to altrel_1-5 as appropriate
- my $logfileURL = $logfile;
- $logfileURL =~ s%/pool/build/atnight/localbuilds/nightlies%http://atlas-computing.web.cern.ch/atlas-computing/links/buildDirectory/nightlies%;
- print "=== Log file: " . $pwd . "/$logfileURL\nNB replace rel_0 with actual nightly in this URL.\n";
- if (! -e $logfile or -z $logfile){
- print "=== Error: log file does not exist or is empty, skipping the rest of this test\n";
- return;
- }
- # get data file LFN/PFN from log file + pool file catalogue
- if (! open LOG, "<$logfile"){
- print "$prog: error: failed opening $logfile to read: $!\n";
- print "-> $warnkey Aborting this test\n";
- return; # go on to next test
- }
- my $dataLFN="unknown";
- my $dataPFN="";
- my $eventCounter=0;
- while (my $line = <LOG>){
- if ($line =~ /InputCollections\s+\= \['(.*)'\]/){ # athena
- $dataLFN=$1;
- }
- elsif ($line =~ /event stream from file list\s+\['(.*)'\]/){ # athenaHLT
- $dataLFN=$1;
- }
- # count events for athena job
- ++$eventCounter if ($line =~ /AthenaEventLoopMgr\s+INFO\s+===>>> done processing event/);
- # handle athenaHLT case
- if ($line =~ /Py:athenaHLT\s+INFO\s+Processed ([0-9]+) events/){
- $eventCounter=$1;
- }
- }
- close LOG;
-
- print "$prog debug: dataLFN=$dataLFN\n" if ($debug);
- if ($dataLFN ne "unknown"){
- my $dataLFNstripped = $dataLFN;
- $dataLFNstripped =~ s/^LFN\://;
- my $cmdout1 = qx(FClistPFN -u xmlcatalog_file:PoolFileCatalog.xml -l $dataLFNstripped);
- chomp $cmdout1;
- if (length($cmdout1)>0){
- $dataPFN = $cmdout1;
- }
- print "$prog debug: dataLFNstripped=$dataLFNstripped dataPFN=$dataPFN\n" if ($debug);
- print "$prog debug: cmdout1=$cmdout1\n" if ($debug);
- }
- print "=== Data file: $dataLFN $dataPFN\n";
-
- # write how many events processed
- print "=== Events processed: $eventCounter\n";
-
- # check log file for likely errors and known false positives
- if ($config{$id}->{'checklog'}){
- my $checklog_opts = $config{$id}->{'checklog_opts'};
- # ERRORs
- my $logrc = systemcall("check_log.pl $checklog_opts $logfile > $checklogout 2>&1");
- systemcall("cat $checklogout");
- if ($logrc != 0){
- print "=== $name $failkey : problem detected in log file\n";
- print "art-result: 1 $name.CheckLog\n";
- push @statuscodes, 'ATHENA_ERROR_IN_LOG';
- } else {
- print "art-result: 0 $name.CheckLog\n";
- }
- # WARNINGs
- $rc = systemcall("check_log.pl $checklog_opts --noerrors --warnings $logfile > $warnout 2>&1");
- # Ignore rc.
- }
-
- #make short file with last 600 lines only
- systemcall("tail -600 $logfile > $logfiletail");
-
-
- # rootcomp
- if ($config{$id}->{'rootcomp'}){
- my $rootcomp_file1 = $config{$id}->{'rootcomp_file1'};
- my $rootcomp_file2 = $config{$id}->{'rootcomp_file2'};
- if( $nightly ne "" ) {
- # allow for custom tests with two files
- $rootcomp_file2 =~ s/latest/$nightly/g ;
- }
- $rootcomp_file1 = resolveSymlinks($rootcomp_file1);
- $rootcomp_file2 = resolveSymlinks($rootcomp_file2);
-
- if (-e $rootcomp_file1) {
- if (-e $rootcomp_file2) {
- my $rc=systemcall("$config{$id}->{'rootcomp_cmd'} $rootcomp_file1 $rootcomp_file2 > $rootcompout 2>&1", TRUE);
- if ($rc != 0){
- print "=== $name WARNING: monitoring histogram mismatch detected by rootcomp\n";
- print "art-result: 1 $name.RootComp\n";
- push @statuscodes, 'ROOTCOMP_MISMATCH';
- } else {
- print "=== $name: rootcomp: monitoring histograms match. \n";
- print "art-result: 0 $name.RootComp\n";
- }
- }
- else {
- print "=== Alert: $rootcomp_file2 does not exist \n";
- print "art-result: 2 $name.RootComp\n";
- }
- }
- else {
- print "=== Alert: $rootcomp_file1 does not exist \n";
- print "art-result: 2 $name.RootComp\n";
- }
- #systemcall("cat $rootcompout");
- if (-e $rootcompout) {
- systemcall("grep -A 5 '^Summary' $rootcompout");
- }
- }
-
- # checkcount
- if ($config{$id}->{'checkcount'}){
- my $checkcount_file = $config{$id}->{'checkcount_file'};
- my $checkcount_tolerance = $config{$id}->{'checkcount_tolerance'};
- my $checkcount_level = $config{$id}->{'checkcount_level'};
- if( $nightly ne "" ) {
- $checkcount_file =~ s/latest/$nightly/ ;
- }
- $checkcount_file = resolveSymlinks($checkcount_file);
- print "$prog: checking trigger and TE counts \n";
- print "=== Running $checkcount_cmd $checkcount_tolerance $checkcount_file $checkcount_level > $checkcountout 2>&1 \n";
- my $rc=systemcall("$checkcount_cmd $checkcount_tolerance $checkcount_file $checkcount_level > $checkcountout 2>&1", TRUE);
- if ($rc != 0){
- print "=== $name WARNING: trigger count mismatch detected by checkcount\nSee $checkcountout for details.\n";
- print "art-result: 1 $name.CheckCounts\n";
- push @statuscodes, 'CHECKCOUNTS_FAILED';
- } else {
- print "=== $name: countcheck: trigger counts match. \n";
- print "art-result: 0 $name.CheckCounts\n";
- }
- #systemcall("cat $rootcompout");
- #Grep for FAILURE here so that bad runs will be flagged as such
- systemcall("grep 'FAILURE' $checkcountout");
- systemcall("grep 'test warning' $checkcountout");
- systemcall("grep 'tolerance' $checkcountout");
- }
-
- # checkmerge
- if ($config{$id}->{'checkmerge'}){
- my $checkmerge_file = $config{$id}->{'checkmerge_file'};
- my $checkmerge_tolerance = $config{$id}->{'checkmerge_tolerance'};
- my $checkmerge_reffile = $config{$id}->{'checkmerge_reffile'};
- if( $nightly ne "" ) {
- $checkmerge_file =~ s/latest/$nightly/ ;
- }
- $checkmerge_file = resolveSymlinks($checkmerge_file);
- print "$prog: checking trigger histograms for merged system \n";
- print "=== Running $checkmerge_cmd $checkmerge_file $checkmerge_reffile $checkmerge_tolerance > $checkmergeout 2>&1 \n";
- my $rc=systemcall("$checkmerge_cmd $checkmerge_file $checkmerge_reffile $checkmerge_tolerance > $checkmergeout 2>&1", TRUE);
-
- if ($rc != 0){
- print "=== $name WARNING: Errors detected by checkmerge\nSee $checkmergeout for details.\n";
- print "art-result: 1 $name.CheckMerge\n";
- push @statuscodes, 'POST_TEST_BAD_EXIT';
- } else {
- print "=== $name: mergecheck: the test passed successfully. \n";
- print "art-result: 0 $name.CheckMerge\n";
- }
- systemcall("grep 'ERROR' $checkmergeout");
- systemcall("grep 'WARNING' $checkmergeout");
- }
-
- # EDM tests
- my $emdcheckresult=TRUE;
- EDMCHECK:
- for (@{$config{$id}->{'edmcheck'}}){
- # truncate algorithm name for 30 characters
- my $algoname = $_->{'algoname'};
- my $truncalgoname = substr($algoname, 0, 30);
- my $edmfile = $_->{'edmfile'};
- my $edmreffile = $_->{'edmreffile'};
- # if file exist for this sepecfic nightly use it, otherwise
- # use default
- if( $nightly ne "" ) {
- $newedmreffile = $edmreffile;
- # substitute e.g. devval/latest for latest
- $newedmreffile =~ s/latest/$nightly/ ;
- # check if the reference file for this nightly exists
- if ( -e $edmreffile ) {
- $edmreffile = $newedmreffile;
- print "New reference file name $edmreffile \n";
- }
- }
- $edmreffile = resolveSymlinks($edmreffile);
- my $rc=systemcall("$truncalgoname -f $edmfile -r $edmreffile >>$edmcheckout 2>&1", TRUE);
- if ($rc != 0){
- print "=== $name WARNING: trigger edmcheck mismatch detected by $truncalgoname\nSee $edmcheckout for details.\n";
- print "=== $name if differences are understood cp $edmfile $edmreffile \n";
- print "art-result: 1 $name.EdmCheck\n";
- } else {
- print "=== $name: edmcheck: files matched \n";
- print "art-result: 0 $name.EdmCheck\n";
- }
- }
-
- # regression tests
- my $regtestresult=TRUE;
- REGTEST:
- for (@{$config{$id}->{'regtest'}}){
- # truncate algorithm name for 15 characters
- my $algoname = $_->{'algoname'};
- my $truncalgoname = substr($algoname, 0, 30);
- my $match = $_->{'match'};
- my $reffile = $_->{'reffile'};
- my $newfile = $reffile . ".new";
- # reference file caser
- if( substr($newfile, 0, 5) eq "/tmp/" ){
- # ref file is in /tmp, eg. from another tst (due to tmp filling up, avoid this)
- $newfile = substr($newfile, 5);
- } elsif ( substr($newfile,0,3) eq "../"){
- # reference is to another test -- other test must be first in test/xxx_TestConfigruation.xml
- my $lslash = rindex $newfile, '/';
- $newfile = substr($newfile, $lslash+1 );
- # in this case ref-file for an existing test will end in .new
- $reffile = $reffile . ".new";
- } elsif ( substr($newfile, 0, 7) eq "/cvmfs/" ){
- # should be usual case: ref file is in cvmfs for ART (was /afs/ for ATN)
- my $lslash = rindex $newfile, '/';
- $newfile = substr($newfile, $lslash+1 );
- if( $nightly ne "" ) {
- $newreffile = $reffile;
- # substitute e.g. devval/latest for latest
- $newreffile =~ s/latest/$nightly/ ;
- # check if the reference file for this nightly exists
- if ( -e $newreffile ) {
- $reffile = $newreffile;
- print "New reference file name $reffile \n";
- }
- }
- }
- print "$prog debug: truncated algoname $truncalgoname\n" if ($debug);
- # extract regression test lines for this algorithm from log file
- open NEW, ">$newfile"
- or die "$prog: error: failed opening $newfile to write: $!\nart-result: 2 $name.Regtest\n";
- if (! open LOG, "<$logfile"){
- print "$prog: error: failed opening $logfile to read: $!\n";
- print "-> $warnkey Aborting this test\nart-result: 2 $name.Regtest\n";
- return FALSE; # go on to next test
- }
- my $lines=0;
- if ($algoname eq $fullregtest){
- while (<LOG>){
- if (/$match/){
- print NEW;
- $lines++;
- }
- }
- print "$prog debug: fullregtest $lines lines matched $match in LOG\n" if ($debug);
- } elsif ($algoname eq $customregtest){
- $rc = systemcall("$match >> $regtestout", TRUE);
- $regtestresult = ( $rc==0 ? TRUE : FALSE );
- next REGTEST;
- }
- else {
- while (<LOG>){
- if (/$truncalgoname.*$match/){
- print NEW;
- $lines++;
- }
- }
- print "$prog debug: regtest $lines lines matched $truncalgoname $match in LOG\n" if ($debug);
- }
-
- close LOG;
- close NEW;
- # check whether any lines matched - if zero it's an error straight away
- # and no point in doing the diff
- if ($lines == 0){
- # print failure keyword here to flag it as an error
- print "=== Alert! $warnkey no lines matching $match were found for $truncalgoname in log file\n";
- print "art-result: 2 $name.Regtest\n";
- $regtestresult = FALSE;
- next REGTEST;
- }
- # diff the output and the reference
- # even if verify is off
- my $rc = 0;
- $reffile = resolveSymlinks($reffile);
- print "old/reference file $reffile\n";
- print "new/test file $newfile\n";
- print "< old/reference\n> new/test\n";
- print substr($reffile, 0, 4);
-# identify location of ref file
- if( substr($reffile, 0, 4) eq "/tmp" ){
- print "=== This test looks for reference in /tmp directory\n";
- } elsif( substr($reffile, 0, 3) eq "../" ){
- print "=== This test looks for reference in another directory\n";
- } elsif (substr($reffile, 0, 1) eq "/" ){
- print "=== This test looks for reference in /cvmfs or /afs or /localhome directory\n";
- } else {
- print "=== This test looks for reference from svn\n";
- }
- if (-e $reffile) {
- # print "old/reference file exists!\n";
- systemcall("echo -e 'total lines in old/reference:' `wc -l $reffile` >>$regtestout",TRUE);
- systemcall("echo -e 'total lines in new/test :' `wc -l $newfile` >>$regtestout",TRUE);
- systemcall("echo -e '< old/reference\n> new/test' >> $regtestout", TRUE);
- $rc = systemcall("diff $reffile $newfile", TRUE);
- $rc = systemcall("diff $reffile $newfile >> $regtestout", TRUE);
-
- # Do HTML diff if differences are small enough
- $difflines = `wc -l $regtestout | cut -d' ' -f1`;
- if ($difflines < 1000) {
- systemcall("htmldiff.py -w 80 $reffile $newfile > $htmldiffout 2>&1", TRUE);
- }
- if ($rc == 0){
- print "=== Output is the same as reference for $algoname\n";
- print "art-result: 0 $name.Regtest\n";
- } else {
- # print failure keyword here to flag it as an error
- print "=== Alert! $warnkey Output differs from reference for $algoname\n";
- print " If this change is understood, please update the reference file";
- if(substr($reffile, 0, 6) eq "/cvmfs" ){
- print "by typing:\n cp $newfile $reffile\n";
- } else {
- print ".\n";
- }
- print "art-result: 1 $name.Regtest\n";
- $regtestresult = FALSE;
- next REGTEST;
- }
- }
- else {
- print "=== Alert! old/reference file: $reffile does not exist - check if this is a new release!\n";
- print "art-result: 2 $name.Regtest\n";
- }
- }
- if (!$regtestresult){
- push @statuscodes, 'ATHENA_REGTEST_FAILED';
- }
-
- # compress log file
- if ($config{$id}->{'compresslog'}){
- systemcall("gzip -9 $logfile");
- }
-
-# print "$prog debug: returning result $result ("
-# . ($result ? "true" : "false") . ")\n" if ($debug);
- return;
-}
-
-
-# wrap system calls to provide for verify and debug modes.
-# second, optional argument overrides verify mode if TRUE
-sub systemcall($;$){
- my $override_verify = FALSE;
- my $command;
- ($command, $override_verify) = @_;
-
- my $rc = 0;
- if ($verify or $debug){
- print "$prog: command: $command\n";
- }
- if (!$verify or $override_verify){
- $rc = system ($command);
- }
- $rc = ($rc >> 8); # see http://perldoc.perl.org/functions/system.html
- if ($debug){
- print "$prog: return code " . $rc . "\n";
- }
- return $rc;
-}
-
-# Resolve all symlinks in given path
-sub resolveSymlinks() {
- my ($path) = @_;
- return $path if (length $path == 0);
- my $respath = `readlink -f $path`;
- if ($? != 0) {
- return $path; # failure: return original path
- }
- chomp $respath;
- return $respath;
-}
-
-# Read ReleaseData file and return dictionary with content
-sub release_metadata() {
- my %data;
- my @dir = grep(/\/$ENV{'AtlasProject'}\//, split(':',$ENV{'LD_LIBRARY_PATH'}));
- open RELDATA, "$dir[0]/../ReleaseData" or print "=== Alert! Cannot open ReleaseData file\n";
- while (<RELDATA>) {
- chomp;
- my @kv = split(':');
- $data{$kv[0]} = $kv[1];
- }
- return %data;
-}
diff --git a/Trigger/TrigValidation/TrigValTools/bin/trigtestlink.py b/Trigger/TrigValidation/TrigValTools/bin/trigtestlink.py
deleted file mode 100755
index 99c2c0e97578b76d224677bb8991cc55628b0aec..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/bin/trigtestlink.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import os,re,sys
-
-if len(sys.argv)==1:
- print "This creates a soft link to the specified test in the nightly directory\n"
- print "%s <testname> ... to link a test" % os.path.basename(sys.argv[0])
- print "%s -l ... to show all tests" % os.path.basename(sys.argv[0])
- sys.exit(1)
-
-testname = sys.argv[1]
-
-path = os.environ['PATH']
-
-projects = '|'.join(["AtlasP1HLT","AtlasCAFHLT","AtlasTestHLT","AtlasTrigger","AtlasAnalysis","AtlasHLT","AtlasProduction"])
-
-for p in path.split(':'):
-
- #m = re.match('(?P<base>/afs/cern.ch/atlas/software/.*\.X.*/(?:%s)/.*)/InstallArea/share/bin' % projects, p)
- m = re.match('(?P<base>/afs/cern.ch/atlas/software/.*/(?:%s)/.*)/InstallArea/share/bin' % projects, p)
- if not m: continue
- nicosarea = "%s/NICOS_area" % m.groupdict()['base']
-
- for dirname, subdirs, files in os.walk(nicosarea):
-
- basename = os.path.basename(dirname)
-
- if basename == "NICOS_area":
- # pick out the atntest area (only exists for nigthly releases)
- subdirs[:] = [x for x in subdirs if re.match("NICOS_atntest.*",x)]
- if len(subdirs)>0:
- atnarea = subdirs[0] # usually the opt build
- else:
- atnarea = ""
- continue
-
- if basename == atnarea:
- subdirs[:] = ["trigp1test_testconfiguration_work", "triggertest_testconfiguration_work", "triganalysistest_testconfiguration_work"]
- continue
-
-
- if basename in ["trigp1test_testconfiguration_work", "triggertest_testconfiguration_work", "triganalysistest_testconfiguration_work"]:
- if testname == "-l":
- conf = { "trigp1test_testconfiguration_work" : "TrigP1Test.conf",
- "triggertest_testconfiguration_work" : "TriggerTest.conf",
- "triganalysistest_testconfiguration_work" : "TrigAnalysisTest.conf" }[basename]
- # list all tests
- print "\n"+basename+":"
- print len(basename)*"=" + "="
- w = max(len(x) for x in subdirs)
- for test in sorted(subdirs):
- print "%-*s ==> trigtest.pl --cleardir --test %s --rundir %s --conf %s" % (w, test,test,test,conf)
- continue
-
- if basename == testname:
- try:
- os.symlink(dirname,basename)
- print "Linking to",dirname
- except OSError, e:
- print "File can't be linked, because:",e
- sys.exit(1)
-
- sys.exit(0)
-
-
-if testname != "-l":
- print "Did not find %s in %s/%s/trig{p1,ger,analysis}test_testconfiguration_work" % (testname,nicosarea,atnarea)
diff --git a/Trigger/TrigValidation/TrigValTools/share/leakCheck.py b/Trigger/TrigValidation/TrigValTools/share/leakCheck.py
deleted file mode 100644
index bd580ea6a6a13f1435b6048717f846126140d83a..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/share/leakCheck.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# add for memory tracking
-import Hephaestus.MemoryTracker as memtrack
-# Try to write the leaks into separate file
-try:
- memtrack.depth( 22 ) # sets the total search depth
- memtrack.MemoryTrace.size( 19 ) # size of traces kept in memory
- memtrack.outstream( open("LeakCheck.txt","w") )
-except:
- print "ERROR setting memory depth"
-
diff --git a/Trigger/TrigValidation/TrigValTools/share/trig_counts_summary.py b/Trigger/TrigValidation/TrigValTools/share/trig_counts_summary.py
deleted file mode 100755
index ceea9269bf9e54a0c23d771adbe2797d76d7ea9f..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigValTools/share/trig_counts_summary.py
+++ /dev/null
@@ -1,523 +0,0 @@
-#!/bin/env python
-#
-# atn basepath
-# /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasTrigger/$rel/NICOS_area/NICOS_qmtest15X0VAL32BS4TrgOpt/triggertest_testconfiguration_work/$test/$ref
-
-
-import glob
-from itertools import chain
-import ROOT
-import os
-from datetime import datetime
-import logging as log
-import xml.etree.cElementTree as ET
-import re
-
-log.basicConfig(format='%(levelname)-15s %(message)s', level=log.ERROR)
-
-#exec (file("/afs/cern.ch/atlas/software/dist/AtlasLogin/python/atlconfiguration.py"))
-
-
-
-class CountsSummaryException:
- pass
-#atlconf = Configuration()
-class Utils:
- @staticmethod
- def today():
- return datetime.today().isoweekday()%7
-
- @staticmethod
- def testdate(file):
- """
- Returnd date when the test was run.
- """
- return datetime.fromtimestamp(os.path.getmtime(file))
-
- @staticmethod
- def wildcarding(list_of_tests):
- def __can_be_wildcarded(str1, str2):
- if len(str1) == len(str2):
- different = ''.join([ (x[0], '*')[x[0] != x[1]] for x in zip(str1, str2)])
- if different.count('*') == 1:
- return different
- return None
-
- tests = sorted(list(list_of_tests), key=lambda x: str(len(x))+x)
- #print tests
-
- possible_wildcards = set()
- for pair in zip(tests[:-1], tests[1:]):
- pattern = __can_be_wildcarded(pair[0], pair[1])
- #print pattern, pair
- if pattern:
- possible_wildcards.add(pattern)
- tests.extend(possible_wildcards)
- return tests
-
-
-
-class CountsCheck:
- """
- Counts checkers.
- """
- def __init__(self, failed, text):
- self.failed = bool(failed)
- self.text = text
-
- @staticmethod
- def any_different(counts):
- return CountsCheck(len(set(counts)) != 1, 'diff')
-
- @staticmethod
- def two_perecnt(counts):
- day_to_day = zip(counts[:-1], counts[1:])
- diffs = map(lambda x: 1.0*abs(x[0]-x[1]) > 0.02*max(x), day_to_day)
- return CountsCheck(bool(diffs.count(True)), "day-to-day>2%" )
-
- @staticmethod
- def five_perecnt(counts):
- day_to_day = zip(counts[:-1], counts[1:])
- diffs = map(lambda x: 1.0*abs(x[0]-x[1]) > 0.05*max(x), day_to_day)
- return CountsCheck(bool(diffs.count(True)), "day-to-day>5%" )
-
- @staticmethod
- def went_to_zero(counts):
- return CountsCheck( CountsCheck.any_different(counts).failed and counts.count(0) , "hit zero")
-
- @staticmethod
- def disabled(counts):
- return CountsCheck( counts.count(-1) , "disabled")
-
- @staticmethod
- def rtt_robust_check(counts):
- day_to_day = zip(counts[:-1], counts[1:])
- diffs = map(lambda x: 1.*abs(x[0]-x[1])>5, day_to_day)
- return CountsCheck(bool(diffs.count(True)) and CountsCheck.five_perecnt(counts), "rtt check" )
-
-class Atn:
-
- def location(self, build, test, rel):
- """ Finds the location of the ATN test
-
- It needs to know build, test name and release. It searches 4 possible projects
- AtlasTrigger, AtlasHLT, AtlasP1HLt, AtlasCAFHLT (this is this nasty piece with square brackets ..
- I could not make glow working with (Atlas|HLT|...).
-
- Returned value is list of matching paths, and list of actual test names
- """
- tog = '/afs/cern.ch/atlas/software/builds/nightlies/'+build+'/Atlas[TPCH][r1AL]*/'+\
- rel+'/NICOS_area/NICOS_atntest*32BS5G4*Opt/*/'+test
- #print tog
- g = glob.glob(tog)
- return g, [x.split('/')[-1] for x in g]
-
-
-
- def available_tests(self, build='*'):
- #tog='/afs/cern.ch/atlas/software/builds/nightlies/*/Atlas[TPCH][r1AL]*/rel_*/'
- def basic_from_path(path):
- return path.split('/')[7:10]
-
- def build_test_from_path(path):
- return tuple(path.split('/')[7:14:6]) # the build is at position 7 and at 13 is the test dir (7+6 == 13)
-
- tog='/afs/cern.ch/atlas/software/builds/nightlies/'+build+'/Atlas[TPCH][r1AL]*/rel_*/'
- stage1 = glob.glob(tog)
- #print stage1
-
- tests = {}
- for path in stage1:
- details = basic_from_path(path)
- #print details
- tog = '/afs/cern.ch/atlas/software/builds/nightlies/'+details[0]+'/'+details[1]+'/'+details[2]+'/NICOS_area/NICOS_atntest*32BS5G4*Opt/trig*configuration_work/*/expert-monitoring.root'
- # print '.... scanning ', tog
- stage2 = glob.glob(tog)
- for zz in stage2:
- build, test_name = build_test_from_path(zz)
- # print build, testdir
- tests.setdefault(build, set()).add(test_name)
- return tests
-
- def checks(self):
- return [ CountsCheck.any_different,
- CountsCheck.went_to_zero,
- CountsCheck.disabled ]
-
-
-
-class Rtt:
- __domain='*'
- def __init__(self, domain):
- self.__memoized_tests = {} # keyed by the test_name
- self.__memoized_test_names = []
- Rtt.__domain=domain
-
- @staticmethod
- def __test_name(path):
- br = path.split('/')
- f = '/'.join(br[:-1])+'/rttjobinfo.xml'
- name = None
- try:
- et = ET.parse(f)
- name = et.getroot().findall('.//jobDisplayName')[0].text.strip('\n\t ')
- if name == '':
- name = et.getroot().findall('.//jobName')[0].text.strip('\n\t ')
- del et
- except:
- log.warning("... problem finding jobDisplayName in: %s, ignoring this test" % f)
- return name
-
- @staticmethod
- def __details(path):
- br = path.split('/')
- # get info from the path
- rel = br[9]
- build = br[10]
- return rel, build
-
- @staticmethod
- def __path(build, rel='*'):
- #p = '/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/%s/%s/build/i686-slc5-gcc43-opt/%s/Trig*Test/*/*/*/expert-monitoring.root' % (rel, build, Rtt.__domain)
- p = '/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/%s/%s/build/i686-slc5-gcc43-opt/%s/Trig*Test/*/expert-monitoring.root' % (rel, build, Rtt.__domain)
- log.debug('rtt path: %s' % p)
- return p
-
- def location(self, build, test, rel, domain='*'):
- """
- Return locations and actual test names (the test param can be wildcard).
-
- """
- key = test+build
- if key not in self.__memoized_test_names:
- #print ".... memoizing test name", test, build, rel
- self.__memoized_test_names.append(key)
- tog = Rtt.__path(build)
- dirs = glob.glob(tog)
- for path in dirs:
- test_name = Rtt.__test_name(path)
- if test_name != None:
- self.__memoized_tests.setdefault(test_name, []).append(path)
-
- cre = re.compile(test)
- paths = []
- real_names = []
-
- for test_name, allp in self.__memoized_tests.iteritems():
- for p in allp:
- r, b = Rtt.__details(p)
- if cre.match(test_name) and rel == r and build == b:
- log.debug(".... test matching keyword: %s - (%s) (%s) (%s) (%s) " % (test, test_name, build, rel, p) )
- paths.append('/'.join(p.split('/')[:-1]))
- real_names.append(test_name)
-
- return paths, real_names
-
- def available_tests(self, build='*'):
- tog = Rtt.__path(build)
- log.debug('scanning RTT dir: ' + tog )
- dirs = glob.glob(tog)
- log.debug('found '+str(len(dirs))+ ' directories')
- tests = {}
- for path in dirs:
- test_name = Rtt.__test_name(path)
- if test_name != None and test_name != '':
- tests.setdefault(build, set()).add(test_name)
- return tests
-
- def checks(self):
- return [ CountsCheck.rtt_robust_check,
- CountsCheck.disabled ]
-
-
-
-
-class TestSystem:
- def __init__(self):
- self.__system = None
-
- def set(self, system):
- self.__system = system
-
- def __call__(self):
- return self.__system
-
-TestSystem = TestSystem()
-
-
-class Counts:
- def __init__(self, build, test_name, rel):
- """ crates access point to L2 and EF counts given build (i.e. dev), test name (i.e. AthenaTrigRDO), and release/nighly (rel_1)
-
- """
- self.__build = build
- self.__rel = rel
- self.__test_name = test_name
-
- self.__dirnames, self.__tests = TestSystem().location(build, test_name, rel)
- if len(self.__dirnames) == 0:
- log.warning("No data for the "+build+" "+test_name+" "+rel)
- raise CountsSummaryException
-
- log.debug('... Counts dirctories seems to be ok: %s' % str(self.__dirnames))
-
- self.__date = max([Utils.testdate(d) for d in self.__dirnames])
-
-
- self.__counts = {'L2': None, 'EF': None}
- self.__events = {'L2': None, 'EF': None}
-
- def datetime(self):
- return self.__date
-
- def build(self):
- return self.__build
-
- def rel(self):
- return self.__rel
-
- def tests(self):
- return self.__tests
-
- def reduce_pool_of_tests(self, test_names):
- self.__dirnames, self.__tests = zip(*[ t for t in zip(self.__dirnames, self.__tests) if t[1] in test_names ])
- self.__counts = {'L2': None, 'EF': None} # scratch so far summed up counts counts
- self.__events = {'L2': None, 'EF': None}
-
- def scale(self, level, factor):
-
- if self.events(level) == 0.:
- return
- scale_by = factor/self.events(level)
- log.info("scalling up by:%f", scale_by)
- for k,v in self.counts(level).iteritems():
- self.__counts[level][k] = int(v*scale_by)
-
- def events(self, level):
- counts = self.counts(level)
- return self.__events[level]
-
- def counts(self, level='L2'):
- """
- Gives back dictionary where key is chain name and value is count of passed events.
-
- Counts are teken from L2Chain.txt or EFChain.txt if they exist. Else stright from the expert-monitoring.root file.
- If none exists ... empty dict is returned.
-
- It is expensive call for the first time. Then it uses it's own cache.
- """
- if self.__counts[level] != None:
- return self.__counts[level]
-
-
- self.__counts[level] = {}
-
- rootnames = [ d+'/expert-monitoring.root' for d in self.__dirnames]
- #print '... rootfiles ', rootnames
-
- for counts_file in rootnames:
- ROOT.gErrorIgnoreLevel =7000;
- r = ROOT.TFile(counts_file, "OLD")
- ROOT.gErrorIgnoreLevel =0;
- hist = r.Get('TrigSteer_'+level+'/ChainAcceptance');
- if hist:
- #print hist
- this_test_counts = [[hist.GetXaxis().GetBinLabel(bin), int(hist.GetBinContent(bin))] for bin in range(1, 1+hist.GetNbinsX()) ]
- for cnt in this_test_counts:
- self.__counts[level].setdefault(cnt[0], 0)
- self.__counts[level][cnt[0]] += cnt[1]
- log.debug("looking for the SignatureAcceptance hist in: %s" % counts_file)
- hist = r.Get('TrigSteer_'+level+'/SignatureAcceptance_runsummary')
- if hist:
- if self.__events[level] == None:
- self.__events[level] = 0.
- self.__events[level] += hist.GetBinContent(1,2) # there we have total number of input events
-
- r.Close()
-
- return self.__counts[level]
-
-
-class Overview:
- def __init__(self, builds, test_name, options):
- whole_week = []
- for build in builds:
- for day in range(7):
- try:
- c = Counts(build=build, test_name=test_name, rel='rel_%d' % day)
- whole_week.append(c)
- except CountsSummaryException :
- log.debug( '.. missing test for: %d test %s build %s' % (day, test_name, build) )
- except:
- raise
-
- # and assure that the tests intersect
- if options.intersect:
- tests_across_week = [set(d.tests()) for d in whole_week]
- tests_running_every_day = tests_across_week[0]
- tests_running_any_day = tests_across_week[0]
-
- for t in tests_across_week:
- tests_running_every_day = tests_running_every_day.intersection(t)
- tests_running_any_day.update(t)
-
- log.debug('tests running whole week : '+' '.join(tests_running_every_day))
- log.debug('tests running at least once a week: '+' '.join(tests_running_any_day))
- [ d.reduce_pool_of_tests(list(tests_running_every_day)) for d in whole_week ]
-
- # eliminate days when test gave no counts
- self.__week = [d for d in whole_week if d.counts('L2') != {} or d.counts('EF') != {} ]
- del whole_week
-
- # normalize counts to the best day
- if options.normalize:
- log.info('Will normalize the counts')
- ev_max = max([d.events('L2') for d in self.__week ])
- [d.scale('L2', ev_max) for d in self.__week ]
- ev_max = max([d.events('EF') for d in self.__week ])
- [d.scale('EF', ev_max) for d in self.__week ]
-
- self.sort(options)
-
-
- def chains(self, level):
- ch = list(set(reduce( lambda x,y: x+y, [ d.counts(level).keys() for d in self.__week ], [])))
- #print ch
- return ch
- #return [set( chain.from_iterable([ d.counts(level).keys() for d in self.__week ]))]
-
- def sort(self, options):
- def __by_date_or_rel( d ):
- return "%05d" % ( ((d.datetime().month*31)+d.datetime().day)*24+d.datetime().hour)
-
- if 'rel' in options.ordering:
- log.info("Will sort the counts by nightly")
- __by_date_or_rel = lambda d: d.rel()
-
- __ordering = __by_date_or_rel
-
- if options.ordering == 'build':
- log.info("Will sort the counts by build")
- __ordering = lambda d: d.build()+__by_date_or_rel(d)
-
- self.__week.sort(key = __ordering )
-
- def __difference(self, counts):
- """
- Returns list of results for all registered checks which failed.
- """
- return [ c for c in map( lambda x: x(counts), TestSystem().checks() ) ]
-
- def ascii(self, print_all):
- """
- Print on the terminal.
-
- """
- week = self.__week
-
- print 'counts evolution for: ', opt.builds, opt.test
- print 'overall sum of tests: ', ' '.join(list(set(chain.from_iterable([w.tests() for w in self.__week]))))
- # figure out all tests which are summed up
- if len(set([len(w.tests()) for w in self.__week])) != 1:
- log.warning( '. number of summed up tests not equal for each week, consider using option -i' )
-
- print '-'*(40+1+7*len(week))
- format = '%-40s '+''.join([' %6d']*len(week))
- sformat = '%-40s '+''.join([' %6s']*len(week))
- print sformat % tuple(["build"] + [d.build().split('.')[-1] for d in week] )
- print format % tuple(["day of the month"] + [d.datetime().day for d in week] )
-
- print sformat % tuple(["rel"]+[ d.rel() for d in week ]), ' _checks which failed_'
- try:
- print sformat % tuple(["events L2"]+[ int(d.events('L2')) for d in week ])
- print sformat % tuple(["events EF"]+[ int(d.events('EF')) for d in week ])
- except: pass
-
- def __print_one_level(level):
- print sformat % tuple(['----'+level+'---------'] + ['----']*len(week))
- keys = set( chain.from_iterable([ d.counts(level).keys() for d in week ]))
- for k in sorted(keys):
- # figure out if there was any change
- # collect counts for this chain for all week
- counts = [ d.counts(level).setdefault(k, -1) for d in week]
- diff_checks = self.__difference(counts)
- diff = map( lambda x: x.failed, diff_checks).count(True)
-
- if print_all or diff:
- print format % tuple([k]+counts), ' & '.join([ (' '*len(c.text), c.text)[c.failed] for c in diff_checks ] )
-
- __print_one_level('L2')
- __print_one_level('EF')
-
- def dictionarize(self):
- ret = {}
-
- day = [d.datetime().day for d in self.__week]
- today = map(lambda x: [0, 1][Utils.today()==x], [int(d.rel()[-1]) for d in self.__week] )
- build = [d.build() for d in self.__week]
- rel = [ d.rel() for d in self.__week ]
- l2ev = [ d.events('L2') for d in self.__week ]
- efev = [ d.events('EF') for d in self.__week ]
-
- ret['meta'] = zip( day, today, build, rel, l2ev, efev)
- def __dict_counts(level):
- keys = self.chains(level)
- l = {}
- for k in keys:
- counts = [ d.counts(level).setdefault(k, -1) for d in self.__week]
- diff_checks = self.__difference(counts)
- l[k] = (counts, diff_checks)
- return l
- ret['L2'] = __dict_counts('L2')
- ret['EF'] = __dict_counts('EF')
- return ret
-
-
-if __name__ == "__main__":
- import optparse
- parser = optparse.OptionParser('show chain counts for tests')
-
- parser.add_option('-b', '--builds', default='dev',
- help='builds, coma separated list of '+' '.join( [ n.split('/')[-1] for n in glob.glob('/afs/cern.ch/atlas/software/builds/nightlies/*')]) , metavar='BUILD')
- parser.add_option('-d', '--domain', default='*',
- help='test suite domain [p1hlt|offline], if not specified test results will be merged')
- parser.add_option('-t', '--test', default='AthenaTrigRDO',
- help='test name, look at NICOS test page for test names', metavar='TEST')
- parser.add_option('-a', '--all', default=False, action='store_true',
- help='print all chains (not only those changing)')
- parser.add_option('-l', '--list', default=False, action='store_true',
- help='print all tests in all builds (takes long time to execute, and output is just huge)')
- parser.add_option('-s', '--sys', default='ATN',
- help='Test system, either ATN (default) or RTT')
- parser.add_option('-v', '--verbose', default=0, action='store_true',
- help='More verbose output')
- parser.add_option('-i', '--intersect', default=0, action='store_true',
- help='from the set of tests (when wildcard is used) ')
- parser.add_option('-n', '--normalize', default=0, action='store_true',
- help='normalize (scaling up to the day wiht highest number of processed events) the counts before comparison')
- parser.add_option('-o', '--ordering', default='date',
- help='results ordering: date(default), build, rel')
-
- (opt,args) = parser.parse_args()
- if opt.verbose:
- log.getLogger().setLevel(log.DEBUG)
- log.debug('... more debug ')
-
- TestSystem.set(Atn())
- if opt.sys == 'RTT':
- TestSystem.set(Rtt(opt.domain))
-
- if opt.list:
- log.debug('... scanning for available tests')
- tests = TestSystem().available_tests(opt.builds)
- for build, tests in tests.iteritems():
- print '-'*80
- print 'Build: ', build
- print '\n'.join(sorted(Utils.wildcarding(tests)))
- import sys
- sys.exit(0)
-
- over = Overview(opt.builds.split(','), opt.test, opt)
- over.ascii(opt.all)
-
-
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
index 1860061ee18421d06dbcf97e3b8a767f4c52adab..cc3b00049c213c7ab3baf137fd4dc36d79b44ac2 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
@@ -610,6 +610,10 @@ TriggerHLTList = [
('xAOD::JetContainer#HLT_a4sktclcwnojcalibFS', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetTrigAuxContainer#HLT_a4sktclcwnojcalibFSAux.', 'BS ESD AODFULL', 'Jet'),
+ # SoftKiller
+ ('xAOD::JetContainer#HLT_a4_sktclcwnojcalibFS', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::JetTrigAuxContainer#HLT_a4_sktclcwnojcalibFSAux.', 'BS ESD AODFULL', 'Jet'),
+
#GSC
('xAOD::JetContainer#HLT_GSCJet', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
('xAOD::JetTrigAuxContainer#HLT_GSCJetAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 16edb349cb7f3b4a8947114885f8e44c59bdfa08..9fbf72f64a17698d05e01c90944b93e1a575fe94 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -7,7 +7,7 @@ from AthenaCommon.Logging import logging
__log = logging.getLogger('TriggerConfig')
def collectHypos( steps ):
- """
+ """
Method iterating over the CF and picking all the Hypothesis algorithms
Returned is a map with the step name and list of all instances of hypos in that step.
@@ -21,11 +21,11 @@ def collectHypos( steps ):
if "filter" in stepSeq.name():
__log.info("Skipping filtering steps " +stepSeq.name() )
continue
-
+
__log.info( "collecting hypos from step " + stepSeq.name() )
# start = {}
for seq,algs in flatAlgorithmSequences( stepSeq ).iteritems():
-
+
for alg in algs:
# will replace by function once dependencies are sorted
if 'HypoInputDecisions' in alg.getProperties():
@@ -38,7 +38,7 @@ def collectHypos( steps ):
def __decisionsFromHypo( hypo ):
""" return all chains served by this hypo and the key of produced decision object """
if hypo.getType() == 'ComboHypo':
- return hypo.MultiplicitiesMap.keys(), hypo.HypoOutputDecisions[0]
+ return hypo.MultiplicitiesMap.keys(), hypo.HypoOutputDecisions[0]
else: # regular hypos
return [ t.name() for t in hypo.HypoTools ], hypo.HypoOutputDecisions
@@ -46,11 +46,11 @@ def __decisionsFromHypo( hypo ):
def collectFilters( steps ):
"""
- Similarly to collectHypos but works for filter algorithms
+ Similarly to collectHypos but works for filter algorithms
- The logic is simpler as all filters are grouped in step filter sequences
+ The logic is simpler as all filters are grouped in step filter sequences
Returns map: step name -> list of all filters of that step
- """
+ """
__log.info("Collecting hypos")
from collections import defaultdict
filters = defaultdict( list )
@@ -68,29 +68,29 @@ def collectDecisionObjects( hypos, filters, l1decoder ):
decisionObjects = set()
__log.info("Collecting decision obejcts from L1 decoder instance")
decisionObjects.update([ d.Decisions for d in l1decoder.roiUnpackers ])
- decisionObjects.update([ d.Decisions for d in l1decoder.rerunRoiUnpackers ])
+ decisionObjects.update([ d.Decisions for d in l1decoder.rerunRoiUnpackers ])
+
-
__log.info("Collecting decision obejcts from hypos")
__log.info(hypos)
for step, stepHypos in hypos.iteritems():
for hypoAlg in stepHypos:
__log.debug( "Hypo %s with input %s and output %s " % (hypoAlg.getName(), str(hypoAlg.HypoInputDecisions), str(hypoAlg.HypoOutputDecisions) ) )
- __log.debug( "and hypo tools %s " % (str( [ t.getName() for t in hypoAlg.HypoTools ] ) ) )
+ __log.debug( "and hypo tools %s " % (str( [ t.getName() for t in hypoAlg.HypoTools ] ) ) )
decisionObjects.add( hypoAlg.HypoInputDecisions )
decisionObjects.add( hypoAlg.HypoOutputDecisions )
-
+
__log.info("Collecting decision obejcts from filters")
for step, stepFilters in filters.iteritems():
for filt in stepFilters:
decisionObjects.update( filt.Input )
decisionObjects.update( filt.Output )
-
+
return decisionObjects
-
+
def triggerSummaryCfg(flags, hypos):
- """
+ """
Configures an algorithm(s) that should be run after the slection process
Returns: ca, algorithm
"""
@@ -101,15 +101,15 @@ def triggerSummaryCfg(flags, hypos):
for stepName, stepHypos in sorted( hypos.items() ):
for hypo in stepHypos:
hypoChains,hypoOutputKey = __decisionsFromHypo( hypo )
- allChains.update( dict.fromkeys( hypoChains, hypoOutputKey ) )
+ allChains.update( dict.fromkeys( hypoChains, hypoOutputKey ) )
for c, cont in allChains.iteritems():
- __log.info("Final decision of chain " + c + " will be red from " + cont )
+ __log.info("Final decision of chain " + c + " will be red from " + cont )
decisionSummaryAlg.FinalDecisionKeys = list(set(allChains.values()))
decisionSummaryAlg.FinalStepDecisions = allChains
decisionSummaryAlg.DecisionsSummaryKey = "HLTSummary" # Output
return acc, decisionSummaryAlg
-
+
def triggerMonitoringCfg(flags, hypos, l1Decoder):
@@ -131,21 +131,21 @@ def triggerMonitoringCfg(flags, hypos, l1Decoder):
for hypo in stepHypos:
hypoChains, hypoOutputKey = __decisionsFromHypo( hypo )
stepDecisionKeys.append( hypoOutputKey )
- allChains.update( hypoChains )
-
+ allChains.update( hypoChains )
+
dcTool = DecisionCollectorTool( "DecisionCollector" + stepName, Decisions=stepDecisionKeys )
__log.info( "The step monitoring decisions in " + dcTool.name() + " " +str( dcTool.Decisions ) )
mon.CollectorTools += [ dcTool ]
-
+
#mon.FinalChainStep = allChains
mon.L1Decisions = l1Decoder.getProperties()['L1DecoderSummaryKey'] if l1Decoder.getProperties()['L1DecoderSummaryKey'] != '<no value>' else l1Decoder.getDefaultProperty('L1DecoderSummary')
allChains.update( l1Decoder.ChainToCTPMapping.keys() )
- mon.ChainsList = list( allChains )
+ mon.ChainsList = list( allChains )
return acc, mon
def triggerOutputStreamCfg( flags, decObj, outputType ):
- """
+ """
Configure output stream according to the menu setup (decision objects)
and TrigEDMCOnfig
"""
@@ -161,7 +161,7 @@ def triggerOutputStreamCfg( flags, decObj, outputType ):
from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTList
EDMCollectionsToRecord=filter( lambda x: outputType in x[1] and "TrigCompositeContainer" not in x[0], TriggerHLTList )
itemsToRecord.extend( [ el[0] for el in EDMCollectionsToRecord ] )
-
+
# summary objects
__log.debug( outputType + " trigger content "+str( itemsToRecord ) )
acc = OutputStreamCfg( flags, outputType, ItemList=itemsToRecord )
@@ -169,10 +169,10 @@ def triggerOutputStreamCfg( flags, decObj, outputType ):
streamAlg.ExtraInputs = [("xAOD::TrigCompositeContainer", "HLTSummary")]
return acc
-
+
def triggerAddMissingEDMCfg( flags, decObj ):
- from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
+ from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
EDMFillerAlg = TriggerSummaryAlg( "EDMFillerAlg" )
EDMFillerAlg.InputDecision = "L1DecoderSummary"
@@ -186,7 +186,7 @@ def triggerAddMissingEDMCfg( flags, decObj ):
for c in collectionsThatNeedMerging:
tool = HLTEDMCreator(c[0].split("#")[1]+"merger")
ctype, cname = c[0].split("#")
- ctype = ctype.split(":")[-1]
+ ctype = ctype.split(":")[-1]
viewsColl = c[3].split(":")[-1]
setattr(tool, ctype+"Views", [ viewsColl ] )
setattr(tool, ctype+"InViews", [ cname ] )
@@ -197,8 +197,8 @@ def triggerAddMissingEDMCfg( flags, decObj ):
#egammaViewsMerger.TrigEMClusterContainer = [ clustersKey ]
return EDMFillerAlg
-
-
+
+
def setupL1DecoderFromMenu( flags, l1Decoder ):
""" Post setup of the L1Decoder, once approved, it should be moved to L1DecoderCfg function """
@@ -207,16 +207,18 @@ def setupL1DecoderFromMenu( flags, l1Decoder ):
def triggerRunCfg( flags, menu=None ):
- """
+ """
top of the trigger config (for real triggering online or on MC)
Returns: ca only
"""
if flags.Trigger.doLVL1:
# conigure L1 simulation
pass
-
+
acc = ComponentAccumulator()
+ acc.merge( triggerIDCCacheCreatorsCfg( flags ) )
+
from L1Decoder.L1DecoderConfig import L1DecoderCfg
#TODO
# information about the menu has to be injected into L1 decoder config
@@ -224,53 +226,65 @@ def triggerRunCfg( flags, menu=None ):
# and item to threshold (the later can be maybe extracted from L1 config file)
l1DecoderAcc, l1DecoderAlg = L1DecoderCfg( flags )
setupL1DecoderFromMenu( flags, l1DecoderAlg )
- acc.merge( l1DecoderAcc )
-
+ acc.merge( l1DecoderAcc )
+
# detour to the menu here, (missing now, instead a temporary hack)
if menu:
menuAcc = menu( flags )
HLTSteps = menuAcc.getSequence( "HLTAllSteps" )
__log.info( "Configured menu with "+ str( len(HLTSteps.getChildren()) ) +" steps" )
-
-
+
+
# collect hypothesis algorithms from all sequence
- hypos = collectHypos( HLTSteps )
+ hypos = collectHypos( HLTSteps )
filters = collectFilters( HLTSteps )
-
+
summaryAcc, summaryAlg = triggerSummaryCfg( flags, hypos )
- acc.merge( summaryAcc )
-
+ acc.merge( summaryAcc )
+
#once menu is included we should configure monitoring here as below
-
+
monitoringAcc, monitoringAlg = triggerMonitoringCfg( flags, hypos, l1DecoderAlg )
acc.merge( monitoringAcc )
decObj = collectDecisionObjects( hypos, filters, l1DecoderAlg )
__log.info( "Number of decision objects found in HLT CF %d" % len( decObj ) )
__log.info( str( decObj ) )
-
+
HLTTop = seqOR( "HLTTop", [ l1DecoderAlg, HLTSteps, summaryAlg, monitoringAlg ] )
acc.addSequence( HLTTop )
-
+
acc.merge( menuAcc )
# output
# if any output stream is requested, schedule "gap" filling algorithm
if flags.Output.ESDFileName != "" or flags.Output.AODFileName != "":
acc.addEventAlgo( triggerAddMissingEDMCfg( flags, decObj ), sequenceName= "HLTTop" )
-
+
# configure streams
if flags.Output.ESDFileName != "":
acc.merge( triggerOutputStreamCfg( flags, decObj, "ESD" ) )
- if flags.Output.AODFileName != "":
+ if flags.Output.AODFileName != "":
acc.merge( triggerOutputStreamCfg( flags, decObj, "AOD" ) )
-
-
+
+
return acc
+def triggerIDCCacheCreatorsCfg(flags):
+ """
+ Configures IDC cache loading, for now unconditionally, may make it menu dependent in future
+ """
+ acc = ComponentAccumulator()
+ from MuonConfig.MuonBytestreamDecodeConfig import MuonCacheCfg
+ acc.merge( MuonCacheCfg() )
+
+ from TrigUpgradeTest.InDetConfig import InDetIDCCacheCreatorCfg
+ acc.merge( InDetIDCCacheCreatorCfg() )
+
+ return acc
def triggerPostRunCfg(flags):
"""
@@ -279,7 +293,7 @@ def triggerPostRunCfg(flags):
"""
acc = ComponentAccumulator()
# configure in order BS decodnig, EDM gap filling, insertion of trigger metadata to ESD
-
+
return acc
@@ -290,16 +304,15 @@ if __name__ == "__main__":
ConfigFlags.Trigger.L1Decoder.forceEnableAllChains = True
ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1",]
- ConfigFlags.lock()
+ ConfigFlags.lock()
def testMenu(flags):
menuCA = ComponentAccumulator()
menuCA.addSequence( seqAND("HLTAllSteps") )
return menuCA
-
+
acc = triggerRunCfg( ConfigFlags, testMenu )
f=open("TriggerRunConf.pkl","w")
acc.store(f)
f.close()
-
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
index 19fbda2c9b69cc991d50212a0186f11f4970d32b..5894c321ffd3ab5048b2cb6f295ee21457077e1e 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
@@ -99,6 +99,10 @@ def _get_energy_density_radius():
"""Provide a common source for the energy density akt radius"""
return 0.4
+def _get_soft_killer_grid_size():
+ """Provide a common source for the SoftKiller grid size"""
+ return 0.4,0.4
+
class AlgFactory(object):
def __init__(self, chain_config):
@@ -645,6 +649,30 @@ class AlgFactory(object):
return [Alg(factory, (), kwds)]
+ def softKillerAlg(self):
+ factory = 'TrigHLTSoftKiller'
+
+ # assign a name which identifies the fex sequence and
+ # the python class to be instantiated.
+ sk_grid_param_eta,sk_grid_param_phi = _get_soft_killer_grid_size()
+
+ name = '"%s_%s%s"' % (
+ factory,
+ str(int(10*sk_grid_param_eta))+str(int(10*sk_grid_param_phi)),
+ self.fex_params.cluster_calib,
+ )
+
+ # we do not carry the SoftKiller grid sizes
+ # so hard wire it here (to be fixed)
+ kwds = {'name': name,
+ 'cluster_calib': '"%s"' %self.fex_params.cluster_calib_fex,
+ 'sk_grid_param_eta': sk_grid_param_eta,
+ 'sk_grid_param_phi': sk_grid_param_phi
+ }
+
+ return [Alg(factory, (), kwds)]
+
+
def dataScoutingAlg1(self, manual_attrs):
factory = 'ScoutingStreamWriter'
manual_attrs = manual_attrs
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
index 3dd7f4fa65860fbb0c92c1ad8c89e12d72e345c0..f50e03545c4b806befa4c70c08f8d556d2de2330 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
@@ -77,7 +77,7 @@ def _check_values(chain_parts):
raise RuntimeError(msg)
dataTypes = [p['dataType'] for p in chain_parts]
- bad = [r for r in dataTypes if r not in ('TT', 'tc', 'ion')]
+ bad = [r for r in dataTypes if r not in ('TT', 'tc', 'ion', 'sktc')]
if bad:
msg = '%s unknown dataType(s): %s' % (err_hdr, ' '.join(bad))
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
index a765f83ddb5181fccfb79a9daf9e2600069070e5..dd23eca9b51b0863f1ad1f825c6d47964bc7750c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
@@ -91,6 +91,7 @@ class JetSequencesBuilder(object):
'cmfs1': self.make_cmfs1, # cell maker full scan
'cmfs2': self.make_cmfs2, # cluster maker full scan
'ed': self.make_ed, # energy density
+ 'sk': self.make_sk, # SoftKiller
'ftk': self.make_ftk, # run algos for ftk track finding and xaod conversion
'tm': self.make_tm, # track moments helper
'jr': self.make_jr_clusters, # jet rec
@@ -161,9 +162,14 @@ class JetSequencesBuilder(object):
('tc', 'PS', False, 'notrk'): ['ps', 'cm', 'jr'],
('ion', 'FS', False, 'notrk'): ['fs2','cmfs1','hicm','hijr'],
('TT', 'FS', False, 'notrk'): ['tt', 'jt'],
- ('tc', 'FS', True, 'notrk'): ['fs2', 'cmfs1', 'cmfs2','ed', 'tr']}.get((data_type,
- scan_type,
- do_trimming,trkopt), [])
+ ('tc', 'FS', True, 'notrk'): ['fs2', 'cmfs1', 'cmfs2','ed', 'tr'],
+ # SoftKiller topoclusters, no need for EventDensity for rho*area subtraction
+ ('sktc','FS',False, 'notrk'): ['fs2','cmfs1','cmfs2','sk','jr'],
+ ('sktc','FS',False, 'ftk'): ['fs2','cmfs1','cmfs2','sk','ftk','tm','jr'],
+ ('sktc','FS',False,' ftkrefit'): ['fs2','cmfs1','cmfs2','sk','ftk','tm','jr'],
+ }.get((data_type,
+ scan_type,
+ do_trimming,trkopt), [])
if not seq_order:
msg = '%s._make_sequence_list: cannot determine sequence'\
@@ -312,6 +318,16 @@ class JetSequencesBuilder(object):
return AlgList(alg_list=self.alg_factory.trackmoment_helpers(), alias=alias)
+ def make_sk(self):
+ """Return SoftKiller Alg"""
+ fex_params = self.chain_config.menu_data.fex_params
+ alias = 'softkiller_%s' % fex_params.cluster_calib
+
+ algs = []
+ [algs.extend(f()) for f in (self.alg_factory.softKillerAlg,)]
+
+ return AlgList(algs,alias=alias)
+
def make_cm(self):
"""Return cellmaker for non partial scan running.
CellMaker does not use certain read-out optimization,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py
index c795faae88102729931067c27b048c09d55b01b2..d0f17e660d2df90e16ae327b877b7a6ad2ab7a0d 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py
@@ -43,6 +43,7 @@ from TrigHLTJetRec.TrigHLTJetRecConfig import (TrigHLTJetDiagnostics_named,
TrigHLTHypoDiagnostics_named,
TrigHLTJetDebug,
TrigHLTEnergyDensity,
+ TrigHLTSoftKiller,
TrigHLTJetDSSelector,
TrigHLTTrackMomentHelpers,)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
index 0426c0ba1d8cec0a3449efb8703d0bacd053b8e4..9d546c5bab985b8521a59c358313037bb236413b 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
@@ -254,6 +254,14 @@ def setupMenu():
['j175_lcw_subjesIS', 'L1_J100', [], [PhysicsStream], ['Rate:SingleJet', 'BW:Jet'], -1],
['j420_subjesIS', 'L1_J100', [], [PhysicsStream], ['Rate:SingleJet', 'BW:Jet'], -1],
['j420_lcw_subjesIS', 'L1_J100', [], [PhysicsStream], ['Rate:SingleJet', 'BW:Jet'], -1],
+
+ # SoftKiller test and comparison chains
+ ['j60_sktc_em_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_em_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_em_sub', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_sktc_lcw_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_lcw_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_lcw_sub', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
# data scouting
['j0_perf_ds1_L1All', 'L1_All', [], ['DataScouting_05_Jets'], ['RATE:Cosmic_Jets_DS', 'BW:Jet'], -1],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index ecafb3edeb6b2608fba0087abd5e00c449935a29..05193311046d990f6603e37a81df3ad05504ba5e 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -115,7 +115,7 @@ JetChainParts = {
'cleanLA','cleanTA','cleanLLPA', 'noCleaning'
],
'recoAlg' : ["a3","a4", "a10", "a10r", "a10t"],
- 'dataType' : ['TT', 'tc', 'cc', 'ion'],
+ 'dataType' : ['TT', 'tc', 'cc', 'ion', 'sktc'],
'calib' : ["had","lcw","em"],
'jetCalib' : ["jes","sub","subjes","subjesIS", "nojcalib"],
'scan' : ['FS','PS'],
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
index 4c47e67a74067a4c1e4877f95eccd6f75168cb2d..bdd64dd97058a9b083d953ee1149bc17022018ba 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
@@ -2,7 +2,8 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.CFElements import seqAND
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import decisionTree_From_Chains, \
- generateDecisionTree
+ generateDecisionTreeOld
+from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig_newJO import generateDecisionTree
from AthenaCommon.Logging import logging
from AthenaCommon.Constants import VERBOSE,INFO,DEBUG
@@ -40,10 +41,6 @@ def generateMenu( flags ):
menuChains = []
allChainDicts =[]
- menuAcc = ComponentAccumulator()
- mainSequenceName = 'HLTAllSteps'
- menuAcc.addSequence( seqAND(mainSequenceName) )
-
chainAccumulators = []
for name, cfgFlag in list(flags._flagdict.iteritems()):
@@ -80,15 +77,22 @@ def generateMenu( flags ):
_log.info('Obtained Menu Chain objects')
- # pass all menuChain to CF builder
-
+ # pass all menuChain to CF builder
+ useReworked = True
- chainsAcc = generateDecisionTree(menuAcc.getSequence(mainSequenceName), menuChains, allChainDicts)
- chainsAcc.printConfig()
+ if useReworked:
+ menuAcc = generateDecisionTree(menuChains, allChainDicts)
+ else:
+ menuAcc = ComponentAccumulator()
+ mainSequenceName = 'HLTAllSteps'
+ menuAcc.addSequence( seqAND(mainSequenceName) )
+ chainsAcc = generateDecisionTreeOld(menuAcc.getSequence(mainSequenceName), menuChains, allChainDicts)
+ menuAcc.merge(chainsAcc)
- menuAcc.merge( chainsAcc )
menuAcc.printConfig()
+ # kaboom
+
_log.info('CF is built')
return menuAcc
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
index a58680657daedd0b9700531c9fd00da969d4ddd7..32d650c939522aa800dba327c15c557466312cbb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
@@ -6,7 +6,6 @@ from AthenaCommon.Logging import logging
from AthenaCommon.AlgSequence import dumpSequence
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFDot import stepCF_DataFlow_to_dot, stepCF_ControlFlow_to_dot, all_DataFlow_to_dot
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
import sys
import copy
@@ -65,6 +64,7 @@ def createCFTree(CFseq):
for menuseq in CFseq.step.sequences:
ath_sequence = menuseq.sequence.Alg
name = ath_sequence.name()
+ print('5555555 ATH SEQUENCE NAME ---- ', name)
if name in already_connected:
log.debug("AthSequencer %s already in the Tree, not added again",name)
else:
@@ -330,7 +330,11 @@ def decisionTree_From_Chains(HLTNode, chains, allDicts):
return finalDecisions
-def generateDecisionTree(HLTNode, chains, allChainDicts):
+"""
+Not used, kept for reference and testing purposes
+To be removed in future
+"""
+def generateDecisionTreeOld(HLTNode, chains, allChainDicts):
log.debug("Run decisionTree_From_Chains on %s", HLTNode.name())
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = ComponentAccumulator()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
new file mode 100644
index 0000000000000000000000000000000000000000..707c700706c080c4aad8d9514fd625358d7ca8bc
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
@@ -0,0 +1,117 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from collections import defaultdict
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import CFSequence
+from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import buildFilter, makeSummary
+from AthenaCommon.CFElements import parOR, seqAND, seqOR, findOwningSequence
+from AthenaCommon.Logging import logging
+from AthenaCommon.Constants import VERBOSE
+
+log = logging.getLogger('HLTCFConfig_newJO')
+log.setLevel( VERBOSE )
+
+
+def connectStepToFilter(chainStep, filterNode):
+ filter_output = filterNode.getOutputList()
+ if len(filter_output) == 0:
+ raise ValueError('ERROR: no filter outputs are set')
+
+ if len(filter_output) != len(chainStep.sequences):
+ msg = 'ERROR: found {} filter outputs and {} MenuSequences in step {}'.format(len(filter_output),
+ len(chainStep.sequences), chainStep.name)
+ raise ValueError(msg)
+
+ for nseq, sequence in enumerate(chainStep.sequences):
+ output = filter_output[nseq]
+ log.debug("Found input %s to sequence::%s from Filter::%s (from seed %s)", output,
+ sequence.name, filterNode.Alg.name(), sequence.seed)
+ sequence.connectToFilter(output)
+
+
+def generateDecisionTree(chains, allChainDicts):
+ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+ from collections import defaultdict
+ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import CFSequence
+ from AthenaCommon.CFElements import findOwningSequence
+
+ acc = ComponentAccumulator()
+ mainSequenceName = 'HLTAllSteps'
+ acc.addSequence( seqAND(mainSequenceName) )
+
+ log.debug('Generating decision tree with main sequence: {}'.format(mainSequenceName))
+
+ chainStepsMatrix = defaultdict(lambda: defaultdict(list))
+
+ ## Fill chain steps matrix
+ for chain in chains:
+ for stepNumber, chainStep in enumerate(chain.steps):
+ chainName = chainStep.name.split('_')[0]
+ chainStepsMatrix[stepNumber][chainName].append(chain)
+
+ allSequences = []
+
+ ## Matrix with steps lists generated. Creating filters for each cell
+ for nstep in chainStepsMatrix:
+ stepDecisions = []
+
+ stepName = 'Step{}'.format(nstep)
+
+ stepFilterNodeName = '{}{}'.format(stepName, CFNaming.FILTER_POSTFIX)
+ filterAcc = ComponentAccumulator()
+ filterAcc.addSequence( parOR(stepFilterNodeName) )
+
+ stepRecoNodeName = '{}_{}'.format(mainSequenceName, stepName)
+ recoAcc = ComponentAccumulator()
+ recoAcc.addSequence( parOR(stepRecoNodeName) )
+
+ for chainName in chainStepsMatrix[nstep]:
+ chainsInCell = chainStepsMatrix[nstep][chainName]
+
+ if not chainsInCell:
+ # If cell is empty, there is nothing to do
+ continue
+
+ firstChain = chainsInCell[0]
+ if nstep == 0:
+ filter_input = firstChain.group_seed
+ else:
+ filter_input = [output for sequence in firstChain.steps[nstep - 1].sequences for output in sequence.outputs]
+
+ # One aggregated filter per chain (one per column in matrix)
+ filterName = 'Filter_{}'.format( firstChain.steps[nstep].name )
+ sfilter = buildFilter(filterName, filter_input)
+ filterAcc.addEventAlgo(sfilter.Alg, sequenceName = stepFilterNodeName)
+
+ chainStep = firstChain.steps[nstep]
+ stepReco = parOR('{}{}'.format(chainStep.name, CFNaming.RECO_POSTFIX))
+ stepView = seqAND('{}{}'.format(chainStep.name, CFNaming.VIEW_POSTFIX), [stepReco])
+ viewWithFilter = seqAND(chainStep.name, [sfilter.Alg, stepView])
+ recoAcc.addSequence(viewWithFilter, parentName = stepRecoNodeName)
+
+ stepsAcc = ComponentAccumulator()
+
+ for chain in chainsInCell:
+ for seq in chain.steps[nstep].sequences:
+ if seq.ca is None:
+ raise ValueError('ComponentAccumulator missing in sequence {} in chain {}'.format(seq.name, chain.name))
+ stepsAcc.merge( seq.ca )
+ recoAcc.addEventAlgo( seq.hypo.Alg, sequenceName = stepView.getName() )
+ sfilter.setChains(chain.name)
+
+ recoAcc.merge(stepsAcc, sequenceName = stepReco.getName())
+
+ connectStepToFilter(chainStep, sfilter)
+
+ for sequence in chainStep.sequences:
+ stepDecisions += sequence.outputs
+
+ acc.merge(filterAcc, sequenceName = mainSequenceName)
+ acc.merge(recoAcc, sequenceName = mainSequenceName)
+
+ summary = makeSummary('TriggerSummary{}'.format(stepName), stepDecisions)
+ acc.addSequence(summary, parentName = mainSequenceName)
+
+ return acc
\ No newline at end of file
diff --git a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
index bac60a9e21fcbb5e4e9f02a37651d12fae81b131..ec8fb3174470386cc27d4ff9cd7dda83650bf4cd 100644
--- a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
+++ b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
@@ -213,10 +213,13 @@ VP1ExecutionScheduler::VP1ExecutionScheduler( QObject * parent,
m_d->scheduler = this;
m_d->prioritiser = new VP1Prioritiser(this);
m_d->mainwindow = new VP1MainWindow(this,availEvents);//mainwindow takes ownership of available events
- m_d->batchMode = false;
+
+ m_d->batchMode = false;
m_d->batchUtilities = nullptr;
m_d->batchModeAllEvents = false;
m_d->batchModeNEvents = 0;
+ m_d->batchModeRandomConfig = false;
+
m_d->allSystemsRefreshed = false;
m_d->goingtonextevent=true;
m_d->currentsystemrefreshing=0;
@@ -386,12 +389,15 @@ VP1ExecutionScheduler* VP1ExecutionScheduler::init( StoreGateSvc* eventStore,
if (joboptions.empty()) {
//scheduler->m_d->mainwindow->tabManager()->addNewTab("My Tab");
} else {
+ qDebug() << "config files: " << joboptions; // DEBUG
foreach(QString opt,joboptions)
scheduler->m_d->mainwindow->loadConfigurationFromFile(opt);
if ( scheduler->m_d->batchMode ) {
if (scheduler->m_d->batchModeRandomConfig ) {
- scheduler->m_d->batchUtilities = new VP1BatchUtilities( qstringlistToVecString(joboptions) );
+ if (joboptions.size() != 0 ) {
+ scheduler->m_d->batchUtilities = new VP1BatchUtilities( qstringlistToVecString(joboptions) );
+ }
}
QString batchNevents = VP1QtUtils::environmentVariableValue("VP1_BATCHMODE_NEVENTS");
if (batchNevents > 0 ) {