diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
index ae4f9f7ee23b2d2cd4cdc24ceb934432383988ea..7304d2e28d81e76870148ec56d7fb75dde42af64 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
@@ -6,9 +6,7 @@
atlas_subdir( AthenaPoolMultiTest )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms
- PRIVATE
+atlas_depends_on_subdirs( PRIVATE
AtlasTest/DatabaseTest/AthenaPoolTestData
Control/AthenaBaseComps
Control/SGTools
@@ -22,7 +20,6 @@ atlas_depends_on_subdirs( PUBLIC
Database/AthenaPOOL/DBDataModel
Event/ByteStreamCnvSvc
Event/ByteStreamData
- Event/EventInfo
Event/xAOD/xAODEventInfo
GaudiKernel
TestPolicy )
@@ -31,17 +28,11 @@ atlas_depends_on_subdirs( PUBLIC
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
# Component(s) in the package:
-atlas_add_library( AthenaPoolMultiTestLib
- src/*.cxx
- PUBLIC_HEADERS AthenaPoolMultiTest
- PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib SGtests GoodRunsListsLib ByteStreamData_test
- PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaPoolTestData AthenaBaseComps SGTools CollectionBase CollectionUtilities AthenaPoolExampleData AthenaPoolUtilities PersistentDataModel DBDataModel ByteStreamData EventInfo xAODEventInfo GaudiKernel )
-
atlas_add_component( AthenaPoolMultiTest
+ src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaPoolTestData AthenaBaseComps SGTools StoreGateLib SGtests GoodRunsListsLib CollectionBase CollectionUtilities AthenaPoolExampleData AthenaPoolUtilities DBDataModel ByteStreamData ByteStreamData_test EventInfo xAODEventInfo GaudiKernel AthenaPoolMultiTestLib )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaPoolTestData AthenaBaseComps SGTools StoreGateLib SGtests GoodRunsListsLib CollectionBase CollectionUtilities AthenaPoolExampleData AthenaPoolUtilities PersistentDataModel DBDataModel ByteStreamData ByteStreamData_test xAODEventInfo GaudiKernel )
# Install files from the package:
atlas_install_joboptions( share/*.py )
@@ -67,24 +58,12 @@ endfunction (athenapoolmultitest_run_test)
athenapoolmultitest_run_test( AthenaPoolMultiTestBuildInput SplittableData_jo
post_check_bi )
-#athenapoolmultitest_run_test( AthenaPoolMultiTestCollectInput TestSimpleCollection
-# post_check_ci
-# DEPENDS AthenaPoolMultiTestBuildInput )
athenapoolmultitest_run_test( AthenaPoolMultiTestEventSplit EventSplit_jo
post_check_es
DEPENDS AthenaPoolMultiTestBuildInput )
-#athenapoolmultitest_run_test( AthenaPoolMultiTestCheckCollections CheckExplicit_jo
-# post_check_co
-# DEPENDS AthenaPoolMultiTestEventSplit )
athenapoolmultitest_run_test( AthenaPoolMultiTestCheckNull CheckNull_jo
post_check_cn
DEPENDS AthenaPoolMultiTestEventSplit )
athenapoolmultitest_run_test( AthenaPoolMultiTestCheckOutput CheckImplicit_jo
post_check_co
DEPENDS AthenaPoolMultiTestEventSplit )
-
-#athenapoolmultitest_run_test( AthenaPoolMultiTestBSMetaWrite BSMetaWrite
-# post_check_bs )
-#athenapoolmultitest_run_test( AthenaPoolMultiTestBSMetaWriteNone BSMetaWriteNone
-# post_check_bs
-# DEPENDS AthenaPoolMultiTestBSMetaWrite )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
index 4fc2e00c3a247a9d744def931cb33b49a6647ffb..331f7187c1045471eb4a7f76cff49abe46e7b638 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/BSMetaWriteNone.py
@@ -25,7 +25,6 @@ theApp.EvtMax = 200000
# Load ByteStream support
#--------------------------------------------------------------
from AthenaPoolMultiTest.AthenaPoolMultiTestConf import *
-#from TagCollectionTest.TagCollectionTestConf import EventTagWriter
PassNoneFilter = PassNoneFilter("PassNoneFilter")
topSequence += PassNoneFilter
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py
index 8597eeeb6f3b41a995e99ea008963b3dc0b8db4e..21ff7008b4decbf8a2131f00548cfabd51008a99 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/CheckNull_jo.py
@@ -36,10 +36,6 @@ svcMgr.PoolSvc.ReadCatalog = ["xmlcatalog_file:SplittableData.xml"]
svcMgr.EventSelector.InputCollections = [ "PFN:NullableCollection.root" ]
svcMgr.EventSelector.CollectionType = "ExplicitROOT"
-#from AthenaPoolExampleAlgorithms.AthenaPoolExampleAlgorithmsConf import AthPoolEx__QueryTag
-#QueryTag = AthPoolEx__QueryTag("QueryTag")
-#svcMgr.EventSelector.HelperTools = [ QueryTag ]
-
#--------------------------------------------------------------
# Private Application Configuration options
#--------------------------------------------------------------
@@ -54,7 +50,6 @@ topSequence += AthPoolEx__ReadData("ReadData")
from AthenaPoolMultiTest.AthenaPoolMultiTestConf import *
RunEventTagWriter = RunEventTagWriter("RunEventTagWriter")
-#RunEventTagWriter.OutputLevel = DEBUG
topSequence += RunEventTagWriter
@@ -69,7 +64,6 @@ FullColl.WriteInputDataHeader = TRUE
FullColl.OutputCollection = "CheckNull.root"
FullColl.ItemList += [ "DataHeader#*" ]
FullColl.ItemList += [ "AthenaAttributeList#RunEventTag" ]
-#FullColl.Tool = TagTool
FullColl.OutputLevel = DEBUG
FullColl.Tool.OutputLevel = INFO
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py
index 5e6fadb71cecd573547e50027e6f1585bd8e31e5..651310b9753c7d81b0203dd2b47482b2fb70ef7b 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py
@@ -21,8 +21,12 @@ topSequence = AthSequencer("AthAlgSeq")
athOutSeq = AthSequencer("AthOutSeq")
athRegSeq = AthSequencer("AthRegSeq")
-from AthenaCommon.AppMgr import theApp
+from xAODEventInfoCnv.xAODEventInfoCnvConf import xAODMaker__EventInfoCnvAlg
+alg = xAODMaker__EventInfoCnvAlg()
+topSequence += alg
+
+from AthenaCommon.AppMgr import theApp
theApp.EvtMax = 200000
#--------------------------------------------------------------
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.cxx
index 09f2a6098adced9fc07a57bd634cb30d3bafce98..963ce7ee5fbe25f4504e1ac3662f19df9b87e2d0 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.cxx
@@ -11,17 +11,14 @@
// the user data-class defintions
#include "AthenaPoolTestData/TrigPath.h"
-//#include "AthenaPoolTestData/FauxTriggerMap.h"
#include <string>
-//#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
#include "CxxUtils/make_unique.h"
AddTrigMap::AddTrigMap(const std::string& name,
ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator),
- m_evt("McEventInfo"),
+ m_evt("EventInfo"),
m_wftm("MultiTestTrigMap"),
m_wftm2("ExcludeTestTrigMap")
{}
@@ -43,18 +40,18 @@ StatusCode AddTrigMap::execute()
ATH_MSG_DEBUG( "in execute()" );
// Check for event header
- SG::ReadHandle<EventInfo> evt (m_evt);
+ SG::ReadHandle<xAOD::EventInfo> evt (m_evt);
if (!evt.isValid()) {
- ATH_MSG_FATAL( "Could not find event" );
+ ATH_MSG_FATAL( "Could not find event info" );
return(StatusCode::FAILURE);
}
- ATH_MSG_INFO( "EventInfo event: " << evt->event_ID()->event_number()
- << " run: " << evt->event_ID()->run_number() );
+ ATH_MSG_INFO( "EventInfo event: " << evt->eventNumber()
+ << " run: " << evt->runNumber() );
//
// Since we have an event, add the dummy trigger object
//
- int event = evt->event_ID()->event_number();
+ int event = evt->eventNumber();
auto ftm = std::make_unique<FauxTriggerMap>();
// Add some paths
ftm->addPath(TrigPath(event%3, 2,event%6)); // repeats with period 3
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.h
index 9aa16c7650639e75e5f220f41f136ee48250054d..c8ede031e51f23e4d79d4c730d0e5322ac382c33 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/AddTrigMap.h
@@ -27,7 +27,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandleKey.h"
-#include "EventInfo/EventInfo.h"
+#include "xAODEventInfo/EventInfo.h"
//#include "AthenaPoolTestData/TrigPath.h"
#include "AthenaPoolTestData/FauxTriggerMap.h"
@@ -47,7 +47,7 @@ public:
virtual StatusCode finalize();
private:
- SG::ReadHandleKey<EventInfo> m_evt;
+ SG::ReadHandleKey<xAOD::EventInfo> m_evt;
SG::WriteHandleKey<FauxTriggerMap> m_wftm;
SG::WriteHandleKey<FauxTriggerMap> m_wftm2;
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
index d2b16fd2438188a6f0720d3beee07eda25fba716..a548b3fc0ebc4c144588dd0b8c40431d6d05d30c 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.cxx
@@ -19,9 +19,6 @@
#include "GaudiKernel/MsgStream.h"
-//#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
#include "StoreGate/StoreGateSvc.h"
//___________________________________________________________________________
@@ -29,7 +26,7 @@ EventSplit::EventSplit(const std::string& name, ISvcLocator* pSvcLocator) :
AthFilterAlgorithm(name, pSvcLocator),
m_l1bits(0),
m_l2bits(0),
- m_evt("McEventInfo"),
+ m_evt("EventInfo"),
m_rftm("MultiTestTrigMap")
{
// Declare the properties
@@ -53,13 +50,13 @@ StatusCode EventSplit::execute()
ATH_MSG_DEBUG( "in execute()" );
// Get the event header, print out event and run number
- SG::ReadHandle<EventInfo> evt (m_evt);
+ SG::ReadHandle<xAOD::EventInfo> evt (m_evt);
if (!evt.isValid()) {
- ATH_MSG_FATAL( "Could not find event" );
+ ATH_MSG_FATAL( "Could not find event info" );
return(StatusCode::FAILURE);
}
- ATH_MSG_INFO( "EventInfo event: " << evt->event_ID()->event_number()
- << " run: " << evt->event_ID()->run_number() );
+ ATH_MSG_INFO( "EventInfo event: " << evt->eventNumber()
+ << " run: " << evt->runNumber() );
this->setFilterPassed(false);
// Let's look for the TriggerMap information
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.h
index c681ed72f08a56cf4224bf5b04bab386f807f22d..f8c40cd7b4f4011a35061170f1c8085d45393204 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventSplit.h
@@ -27,7 +27,7 @@
#include "AthenaBaseComps/AthFilterAlgorithm.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/ReadHandleKey.h"
-#include "EventInfo/EventInfo.h"
+#include "xAODEventInfo/EventInfo.h"
#include "AthenaPoolTestData/FauxTriggerMap.h"
class string;
@@ -45,7 +45,7 @@ public:
private:
unsigned int m_l1bits; /// level 1 bit mask
unsigned int m_l2bits; /// level 2 bit mask
- SG::ReadHandleKey<EventInfo> m_evt;
+ SG::ReadHandleKey<xAOD::EventInfo> m_evt;
SG::ReadHandleKey<FauxTriggerMap> m_rftm;
};
#endif
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.cxx
index 562aa717d00f625b0b6f7277e0633bcd8b2fde24..154e76db42f4f2f0b285e5d21d9c7796bcd6782e 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.cxx
@@ -12,8 +12,6 @@
#include "EventTagWriter.h"
#include "StoreGate/StoreGateSvc.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "GaudiKernel/RndmGenerators.h"
@@ -29,6 +27,7 @@
EventTagWriter::EventTagWriter(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
+ m_evt("EventInfo"),
m_attribListSpec(0),
m_maxNum(5)
{
@@ -52,6 +51,8 @@ StatusCode EventTagWriter::initialize()
ATH_MSG_DEBUG( "Initializing " << name() );
+ ATH_CHECK( m_evt.initialize() );
+
ATH_MSG_DEBUG( "Defining the attribute list specification." );
m_attribListSpec = new coral::AttributeListSpecification;
@@ -202,7 +203,6 @@ StatusCode EventTagWriter::initialize()
StatusCode EventTagWriter::execute()
{
- StatusCode sc = StatusCode::SUCCESS;
char attribNum[128];
std::string attribName = "";
int randInt = 0;
@@ -271,15 +271,14 @@ StatusCode EventTagWriter::execute()
ATH_MSG_DEBUG( "Finished adding type test data to AthenaAttributeList." );
ATH_MSG_DEBUG( "Retrieving event info from TDS." );
- const EventInfo* eventInfo;
- sc = evtStore()->retrieve(eventInfo);
- if (sc.isFailure())
- {
- ATH_MSG_ERROR( "Could not retrieve event info from TDS." );
+ SG::ReadHandle<xAOD::EventInfo> evt (m_evt);
+ if (!evt.isValid()) {
+ ATH_MSG_FATAL( "Could not find event info" );
+ return(StatusCode::FAILURE);
}
- unsigned short runNumber = eventInfo->event_ID()->run_number();
- unsigned short eventNumber = eventInfo->event_ID()->event_number();
+ unsigned short runNumber = evt->runNumber();
+ unsigned short eventNumber = evt->eventNumber();
ATH_MSG_DEBUG( "Adding AOD global data to AthenaAttributeList." );
unsigned short nGlobal = 0;
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.h
index eebef6412f77360f412aecf8c0767ccfa1bf33d6..47628c812c9c5e34309eef5e1757cfd4acd3a85a 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagWriter.h
@@ -12,9 +12,9 @@
* $Id: EventTagWriter.h,v 1.1 2009-02-19 22:04:49 cranshaw Exp $
*/
-//#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-
+#include "StoreGate/ReadHandle.h"
+#include "xAODEventInfo/EventInfo.h"
#include <string>
namespace coral
@@ -65,6 +65,8 @@ class EventTagWriter : public AthAlgorithm
virtual StatusCode finalize();
private:
+ SG::ReadHandleKey<xAOD::EventInfo> m_evt;
+
/// Specification of event tag metadata schema
coral::AttributeListSpecification* m_attribListSpec;
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.cxx
index ea281f34f02a590d45c12923556c2eb3a414db85..d6ce95284a6cb821e726b1fb66bab0f4b51afe12 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.cxx
@@ -13,13 +13,7 @@
#include "RunEventTagWriter.h"
#include "StoreGate/StoreGateSvc.h"
-//#include "EventInfo/EventInfo.h"
-//#include "xAODEventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-//#include "AthenaPoolUtilities/AthenaAttributeList.h"
-//#include "AthenaPoolUtilities/AthenaAttributeListSpecification.h"
#include "CoralBase/AttributeListSpecification.h"
-//#include "AthenaPoolUtilities/MinimalEventInfoAttributeList.h"
#include "CxxUtils/make_unique.h"
@@ -31,8 +25,7 @@
RunEventTagWriter::RunEventTagWriter(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
- m_evt("McEventInfo"),
- m_evtx("McEventInfo"),
+ m_evt("EventInfo"),
m_attribList("RunEventTag"),
m_attribListSpec(0)
{}
@@ -52,7 +45,6 @@ StatusCode RunEventTagWriter::initialize()
std::string attribName;
ATH_CHECK( m_evt.initialize() );
- ATH_CHECK( m_evtx.initialize() );
ATH_CHECK( m_attribList.initialize() );
ATH_MSG_DEBUG( "Initializing " << name() );
@@ -100,22 +92,13 @@ StatusCode RunEventTagWriter::execute()
}
ATH_MSG_DEBUG( "Retrieving event info from TDS." );
- SG::ReadHandle<xAOD::EventInfo> evtx (m_evtx);
- SG::ReadHandle<EventInfo> evt (m_evt);
- if (!evtx.isValid())
- {
- if (!evt.isValid()) {
- ATH_MSG_ERROR( "Could not get event info from TDS." );
- }
- else {
- if(fillTag(evt.cptr(),attribList).isFailure()) {
- ATH_MSG_ERROR( "Could not build tag from old event info." );
- }
- }
+ SG::ReadHandle<xAOD::EventInfo> evt (m_evt);
+ if (!evt.isValid()) {
+ ATH_MSG_ERROR( "Could not get event info from TDS." );
}
else {
- if(fillTag(evtx.cptr(),attribList).isFailure()) {
- ATH_MSG_ERROR( "Could not build tag from xaod event info." );
+ if(fillTag(evt.cptr(),attribList).isFailure()) {
+ ATH_MSG_ERROR( "Could not build tag from event info." );
}
}
@@ -131,35 +114,6 @@ StatusCode RunEventTagWriter::execute()
return (StatusCode::SUCCESS);
}
-StatusCode RunEventTagWriter::fillTag(const EventInfo* eInfo, AthenaAttributeList* attribList)
-{
- unsigned int runNumber = eInfo->event_ID()->run_number();
- unsigned int eventNumber = eInfo->event_ID()->event_number();
-
- if (!attribList)
- {
- ATH_MSG_ERROR( "Attribute list object is NULL." );
- return (StatusCode::FAILURE);
- }
-
- ATH_MSG_DEBUG( "About to assign values to Tag Attrib List" );
- try
- {
- (*attribList)["RunNumber"].data<unsigned int>() = runNumber;
- (*attribList)["EventNumber"].data<unsigned int>() = eventNumber;
- }
- catch (const std::exception& e)
- {
- ATH_MSG_ERROR( "Caught exception from data() when setting AOD global "
- << "attributes; Message: " << e.what() );
- return (StatusCode::FAILURE);
- }
- ATH_MSG_DEBUG( "Finished adding Run,Event data to AthenaAttributeList." );
-
- return StatusCode::SUCCESS;
-
-}
-
StatusCode RunEventTagWriter::fillTag(const xAOD::EventInfo* eventInfo, AthenaAttributeList* attribList)
{
unsigned int runNumber = eventInfo->runNumber();
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.h
index 922a29b906d97ed460edac7ba3703315f7a7d796..20e9e51ff3e65926fad5a3ad8391a7e26dedb6e6 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/RunEventTagWriter.h
@@ -19,7 +19,6 @@
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandleKey.h"
-#include "EventInfo/EventInfo.h"
#include "xAODEventInfo/EventInfo.h"
#include "PersistentDataModel/AthenaAttributeList.h"
@@ -31,12 +30,6 @@ namespace coral
}
class AthenaAttributeListSpecification;
class AthenaAttributeList;
-class EventInfo;
-
-//namespace xAOD
-//{
-// class EventInfo;
-//}
/**
* @class RunEventTagWriter
@@ -82,11 +75,9 @@ class RunEventTagWriter : public AthAlgorithm
private:
- StatusCode fillTag(const EventInfo*, AthenaAttributeList*);
StatusCode fillTag(const xAOD::EventInfo*, AthenaAttributeList*);
- SG::ReadHandleKey<EventInfo> m_evt;
- SG::ReadHandleKey<xAOD::EventInfo> m_evtx;
+ SG::ReadHandleKey<xAOD::EventInfo> m_evt;
SG::WriteHandleKey<AthenaAttributeList> m_attribList;
/// Specification of the event tag metadata schema
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.cxx
index e81e54bd3d791817e10c9aa00dc59c6d8777a25a..0e0e502190b4cbe1a9e3f572c011bb22df3ad571 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.cxx
@@ -12,8 +12,6 @@
#include "TagEventTagWriter.h"
#include "StoreGate/StoreGateSvc.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
#include "AthenaPoolUtilities/TagAthenaAttributeList.h"
#include "AthenaPoolUtilities/AthenaAttributeListSpecification.h"
@@ -33,6 +31,7 @@
TagEventTagWriter::TagEventTagWriter(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
+ m_evt("EventInfo"),
m_attribListSpec(0),
m_maxNum(5)
{
@@ -56,6 +55,8 @@ StatusCode TagEventTagWriter::initialize()
ATH_MSG_DEBUG( "Initializing " << name() );
+ ATH_CHECK( m_evt.initialize() );
+
ATH_MSG_DEBUG( "Defining the attribute list specification." );
m_attribListSpec = new AthenaAttributeListSpecification;
@@ -234,7 +235,6 @@ StatusCode TagEventTagWriter::initialize()
StatusCode TagEventTagWriter::execute()
{
- StatusCode sc = StatusCode::SUCCESS;
char attribNum[128];
std::string attribName = "";
int randInt = 0;
@@ -303,15 +303,14 @@ StatusCode TagEventTagWriter::execute()
ATH_MSG_DEBUG( "Finished adding type test data to TagAthenaAttributeList." );
ATH_MSG_DEBUG( "Retrieving event info from TDS." );
- const EventInfo* eventInfo = nullptr;
- sc = evtStore()->retrieve(eventInfo);
- if (sc.isFailure())
- {
- ATH_MSG_ERROR( "Could not retrieve event info from TDS." );
+ SG::ReadHandle<xAOD::EventInfo> evt (m_evt);
+ if (!evt.isValid()) {
+ ATH_MSG_FATAL( "Could not find event info" );
+ return(StatusCode::FAILURE);
}
- unsigned int runNumber = eventInfo->event_ID()->run_number();
- unsigned int eventNumber = eventInfo->event_ID()->event_number();
+ unsigned short runNumber = evt->runNumber();
+ unsigned short eventNumber = evt->eventNumber();
ATH_MSG_DEBUG( "Adding AOD global data to TagAthenaAttributeList." );
unsigned short nGlobal = 0;
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.h
index f9db518e55a6b211c53771602d504ad5e3a196ca..2ba35f2e39619b6a096d64d617e48e189fae766a 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/TagEventTagWriter.h
@@ -14,8 +14,9 @@
//#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
+#include "StoreGate/ReadHandle.h"
#include "StoreGate/StoreGateSvc.h"
-
+#include "xAODEventInfo/EventInfo.h"
#include <string>
class AthenaAttributeListSpecification;
@@ -63,6 +64,8 @@ class TagEventTagWriter : public AthAlgorithm
virtual StatusCode finalize();
private:
+ SG::ReadHandleKey<xAOD::EventInfo> m_evt;
+
/// Specification of event tag metadata schema
AthenaAttributeListSpecification* m_attribListSpec;
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx
index 0f88d1b818afe4ba8ef6c03d7d9252fe441d2b9a..de845cfd38d1acfcf33136143f303a86bdfb9b7b 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx
@@ -22,11 +22,10 @@
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/IToolSvc.h"
-// Event Info
+// Event Incident
#include "EventInfo/EventIncident.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
-#include "EventInfo/EventType.h"
// AttributeList
#include "CoralBase/Attribute.h"
@@ -223,82 +222,15 @@ StatusCode IOVDbTestAlg::readWithBeginRun(){
MsgStream log(msgSvc(), name());
log <<MSG::INFO <<"in readWithBeginRun()" <<endmsg;
- // Get Run/Event/Time from EventSelector
-
- IProperty* propertyServer(0);
- // Access EventSelector to check if run/event/time are being
- // explicitly set. This may be true for simulation
- status = serviceLocator()->service("EventSelector", propertyServer);
- if (status != StatusCode::SUCCESS ) {
- log << MSG::ERROR
- << " Cannot get EventSelector "
- << endmsg;
- return status ;
- }
-
- // Get run/event/time if OverrideRunNumber flag is set
- BooleanProperty boolProperty("OverrideRunNumber", false);
- status = propertyServer->getProperty(&boolProperty);
- if (!status.isSuccess()) {
- log << MSG::ERROR << "unable to get OverrideRunNumber flag: found "
- << boolProperty.value()
- << endmsg;
- return status;
- }
+ // As a result of the restructuring the EventIncident class (dropping the reference to EventInfo)
+ // the old mechanism of overriding run&event&time is no longer working.
+ // If we need this functionality, then we need to find a new way of implementing it.
+ // For the time being this function simply fires a BeginRun incident using the EventContext, without overriding anything
- uint32_t event, run;
- uint64_t time;
- if (boolProperty.value()) {
- // Overriding run number, get run/event/time from EventSelector
- IntegerProperty intProp("RunNumber", 0);
- status = propertyServer->getProperty(&intProp);
- if (!status.isSuccess()) {
- log << MSG::ERROR << "unable to get RunNumber: found "
- << intProp.value()
- << endmsg;
- return status;
- }
- else {
- run = intProp.value();
- }
- intProp = IntegerProperty("FirstEvent", 0);
- status = propertyServer->getProperty(&intProp);
- if (!status.isSuccess()) {
- log << MSG::ERROR << "unable to get event number: found "
- << intProp.value()
- << endmsg;
- return status;
- }
- else {
- event = intProp.value();
- }
- intProp = IntegerProperty("InitialTimeStamp", 0);
- status = propertyServer->getProperty(&intProp);
- if (!status.isSuccess()) {
- log << MSG::ERROR << "unable to get time stamp: found "
- << intProp.value()
- << endmsg;
- return status;
- }
- else {
- time = intProp.value();
- }
- }
- else {
- log << MSG::DEBUG << "Override run number NOT set" << endmsg;
- return StatusCode::SUCCESS;
- }
-
- // Now send BeginRun incident
- IIncidentSvc* incSvc;
- status = service( "IncidentSvc", incSvc );
- if (status.isFailure()) {
- log << MSG::ERROR << "Unable to get the IncidentSvc" << endmsg;
- return status;
- }
+ ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", name() );
+ ATH_CHECK( incSvc.retrieve() );
- EventInfo evt(new EventID(run, event, time), new EventType);
- EventIncident evtInc(evt, name(), "BeginRun");
+ EventIncident evtInc(name(), "BeginRun",getContext());
incSvc->fireIncident( evtInc );
return StatusCode::SUCCESS;
diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt
index e849dae5f78fe399ae1eb8ecf1962de180139bc9..f42d89022e3ec3c1c9b4c15ef08c1f1488530bfc 100644
--- a/Control/AthenaConfiguration/CMakeLists.txt
+++ b/Control/AthenaConfiguration/CMakeLists.txt
@@ -17,6 +17,10 @@ atlas_add_test( ComponentAccumulatorTest
SCRIPT python -m unittest -v AthenaConfiguration.ComponentAccumulator
POST_EXEC_SCRIPT nopost.sh )
+atlas_add_test( UnifyPropertiesTest
+ SCRIPT python -m unittest -v AthenaConfiguration.UnifyProperties
+ POST_EXEC_SCRIPT nopost.sh )
+
atlas_add_test( AthConfigFlagsTest
SCRIPT python -m unittest AthenaConfiguration.AthConfigFlags
POST_EXEC_SCRIPT nopost.sh )
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 8aeb13c5ff584292c11268eaad4aa31207f62dcd..4e46c593caaa252b7f16d2062561700edc65dd0e 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -18,16 +18,16 @@ class DeduplicationFailed(RuntimeError):
pass
class ConfigurationError(RuntimeError):
- pass
+ pass
_servicesToCreate=frozenset(('GeoModelSvc','TileInfoLoader'))
-class ComponentAccumulator(object):
+class ComponentAccumulator(object):
- def __init__(self,sequenceName='AthAlgSeq'):
+ def __init__(self,sequenceName='AthAlgSeq'):
self._msg=logging.getLogger('ComponentAccumulator')
- self._sequence=AthSequencer(sequenceName) #(Nested) sequence of event processing algorithms per sequence + their private tools
- self._conditionsAlgs=[] #Unordered list of conditions algorithms + their private tools
+ self._sequence=AthSequencer(sequenceName) #(Nested) sequence of event processing algorithms per sequence + their private tools
+ self._conditionsAlgs=[] #Unordered list of conditions algorithms + their private tools
self._services=[] #List of service, not yet sure if the order matters here in the MT age
self._eventInputs=set() #List of items (as strings) to be read from the input (required at least for BS-reading).
self._outputPerStream={} #Dictionary of {streamName,set(items)}, all as strings
@@ -44,7 +44,7 @@ class ComponentAccumulator(object):
def empty(self):
return len(self._sequence)+len(self._conditionsAlgs)+len(self._services)+\
- len(self._publicTools)+len(self._outputPerStream)+len(self._theAppProps) == 0
+ len(self._publicTools)+len(self._outputPerStream)+len(self._theAppProps) == 0
def __del__(self):
if not self._wasMerged and not self.empty():
@@ -52,7 +52,7 @@ class ComponentAccumulator(object):
#log = logging.getLogger("ComponentAccumulator")
#log.error("The ComponentAccumulator listed below was never merged!")
#pass
-
+
def printConfig(self, withDetails=False, summariseProps=False):
@@ -82,12 +82,12 @@ class ComponentAccumulator(object):
return
if withDetails:
- self._msg.info( self._sequence )
+ self._msg.info( self._sequence )
else:
def printSeqAndAlgs(seq, nestLevel = 0):
def __prop(name):
if name in seq.getValuedProperties():
- return seq.getValuedProperties()[name]
+ return seq.getValuedProperties()[name]
return seq.getDefaultProperties()[name]
self._msg.info( " "*nestLevel +"\\__ "+ seq.name() +" (seq: %s %s)" %( "SEQ" if __prop("Sequential") else "PAR", "OR" if __prop("ModeOR") else "AND" ) )
@@ -99,7 +99,7 @@ class ComponentAccumulator(object):
self._msg.info( " "*nestLevel +"\\__ "+ c.name() +" (alg)" )
if summariseProps:
printProperties(c, nestLevel)
- printSeqAndAlgs(self._sequence)
+ printSeqAndAlgs(self._sequence)
self._msg.info( "Condition Algorithms" )
self._msg.info( [ a.getName() for a in self._conditionsAlgs ] )
@@ -131,6 +131,7 @@ class ComponentAccumulator(object):
return newseq
+
def moveSequence(self, sequence, destination ):
""" moves sequence from one sub-sequence to another, primary use case HLT Control Flow """
seq = findSubSequence(self._sequence, sequence )
@@ -151,23 +152,23 @@ class ComponentAccumulator(object):
return seq
- def getSequence(self,sequenceName=None):
+ def getSequence(self,sequenceName=None):
if sequenceName is None:
return self._sequence
else:
return findSubSequence(self._sequence,sequenceName)
-
+
def addEventAlgo(self, algorithms,sequenceName=None):
- if not isinstance(algorithms,collections.Sequence):
+ if not isinstance(algorithms,collections.Sequence):
#Swallow both single algorithms as well as lists or tuples of algorithms
algorithms=[algorithms,]
if sequenceName is None:
seq=self._sequence
else:
- seq = findSubSequence(self._sequence, sequenceName )
+ seq = findSubSequence(self._sequence, sequenceName )
if seq is None:
raise ConfigurationError("Can not find sequence %s" % sequenceName )
@@ -190,9 +191,9 @@ class ComponentAccumulator(object):
seq=self._sequence
else:
seq = findSubSequence(self._sequence, seqName )
-
+
algo = findAlgorithm( seq, name )
- if algo is None:
+ if algo is None:
raise ConfigurationError("Can not find an algorithm of name %s "% name)
return algo
@@ -203,7 +204,7 @@ class ComponentAccumulator(object):
pass
self._deduplicate(algo,self._conditionsAlgs) #will raise on conflict
return algo
-
+
def getCondAlgo(self,name):
hits=[a for a in self._conditionsAlgs if a.getName()==name]
@@ -228,7 +229,7 @@ class ComponentAccumulator(object):
return
-
+
def _deduplicate(self,newComp,compList):
@@ -245,7 +246,7 @@ class ComponentAccumulator(object):
#end if same name & type
#end loop over existing components
- #No component of the same type & name found, simply append
+ #No component of the same type & name found, simply append
self._msg.debug("Adding component %s to the job", newComp.getFullName())
#The following is to work with internal list of service as well as gobal svcMgr as second parameter
@@ -255,7 +256,7 @@ class ComponentAccumulator(object):
compList+=newComp
pass
return True #True means something got added
-
+
def _deduplicateComponent(self,newComp,comp):
@@ -273,8 +274,8 @@ class ComponentAccumulator(object):
newprop=None
if type(oldprop) != type(newprop):
- raise DeduplicationFailed(" '%s' defined multiple times with conflicting types %s and %s" % \
- (comp.getJobOptName(),type(oldprop),type(newprop)))
+ raise DeduplicationFailed("Property '%s' of component '%s' defined multiple times with conflicting types %s and %s" % \
+ (prop,comp.getJobOptName(),type(oldprop),type(newprop)))
propid = "%s.%s" % (comp.getType(), str(prop))
@@ -328,15 +329,15 @@ class ComponentAccumulator(object):
#self._msg.error("component '%s' defined multiple times with mismatching configuration", svcs[i].getJobOptName())
raise DeduplicationFailed("component '%s' defined multiple times with mismatching property %s" % \
(comp.getJobOptName(),str(prop)))
- pass
+ pass
#end if prop-mismatch
pass
#end if startswith("_")
pass
-
-
+
+
def getService(self,name):
- for svc in self._services:
+ for svc in self._services:
if svc.getName()==name:
return svc
raise KeyError("No service with name %s known" % name)
@@ -360,7 +361,7 @@ class ComponentAccumulator(object):
self._outputsPerStream[streamName].update(set(outputs))
else:
self._outputsPerStream[streamName]=set(outputs)
-
+
pass
@@ -369,7 +370,7 @@ class ComponentAccumulator(object):
self._theAppProps[key]=value
else:
if isinstance(self._theAppProps[key],collections.Sequence) and not isinstance(self._theAppProps[key],str):
- value=unifySet(self._theAppProps[key],value)
+ value=unifySet(self._theAppProps[key],value)
self._msg.info("ApplicationMgr property '%s' already set to '%s'. Overwriting with %s", key, self._theAppProps[key], value)
self._theAppProps[key]=value
else:
@@ -382,7 +383,7 @@ class ComponentAccumulator(object):
def mergeAll(self,others, sequenceName=None):
if isinstance(others,ComponentAccumulator):
return self.merge(others)
-
+
elif isinstance(others,collections.Sequence):
for other in others:
if isinstance (other,ComponentAccumulator):
@@ -403,7 +404,7 @@ class ComponentAccumulator(object):
def merge(self,other, sequenceName=None):
""" Merging in the other accumulator """
- if other is None:
+ if other is None:
raise RuntimeError("merge called on object of type None: did you forget to return a CA from a config function?")
if isinstance(other,collections.Sequence):
@@ -414,18 +415,18 @@ class ComponentAccumulator(object):
raise RuntimeError("Merge can not handle a sequence: " + ", ".join([ str(type(x).__name__) for x in other]) +", call mergeAll instead" )
else:
raise RuntimeError("Merge can not handle a sequence: " + ", ".join([ str(type(x).__name__) for x in other]) +"" )
-
+
if not isinstance(other,ComponentAccumulator):
raise TypeError("Attempt merge wrong type %s. Only instances of ComponentAccumulator can be added" % type(other).__name__)
-
-
+
+
if not Configurable.configurableRun3Behavior:
raise ConfigurationError("discoverd Configurable.configurableRun3Behavior=False while working woth ComponentAccumulator")
#destSubSeq = findSubSequence(self._sequence, sequence)
#if destSubSeq == None:
- # raise ConfigurationError( "Nonexistent sequence %s in %s (or its sub-sequences)" % ( sequence, self._sequence.name() ) ) #
- def mergeSequences( dest, src ):
+ # raise ConfigurationError( "Nonexistent sequence %s in %s (or its sub-sequences)" % ( sequence, self._sequence.name() ) ) #
+ def mergeSequences( dest, src ):
for c in src.getChildren():
if isSequence( c ):
sub = findSubSequence( dest, c.name() ) #depth=1 ???
@@ -442,6 +443,7 @@ class ComponentAccumulator(object):
else: # absent, adding
self._msg.debug(" Merging algorithm %s to a sequence %s", c.name(), dest.name() )
dest += c
+
checkSequenceConsistency(self._sequence)
@@ -452,7 +454,7 @@ class ComponentAccumulator(object):
else:
destSeq=findSubSequence(self._sequence,other._sequence.name()) or self._sequence
mergeSequences(destSeq,other._sequence)
-
+
#self._conditionsAlgs+=other._conditionsAlgs
@@ -471,14 +473,14 @@ class ComponentAccumulator(object):
self._outputPerStream[k].update(other._outputPerStream[k])
else: #New stream type
self._outputPerStream[k]=other._outputPerStream[k]
-
+
#Merge AppMgr properties:
for (k,v) in other._theAppProps.iteritems():
self.setAppProperty(k,v) #Will warn about overrides
pass
other._wasMerged=True
-
-
+
+
def appendToGlobals(self):
@@ -488,19 +490,19 @@ class ComponentAccumulator(object):
#Turn configurable behavior to old-style (eg return pre-existing instances instead of new'ing them)
Configurable.configurableRun3Behavior=0
from AthenaCommon.AppMgr import ToolSvc, ServiceMgr, theApp
-
+
for s in self._services:
self._deduplicate(s,ServiceMgr)
-
+
if s.getJobOptName() in _servicesToCreate \
and s.getJobOptName() not in theApp.CreateSvc:
theApp.CreateSvc.append(s.getJobOptName())
-
+
for t in self._publicTools:
self._deduplicate(t,ToolSvc)
-
+
condseq=AthSequencer ("AthCondSeq")
for c in self._conditionsAlgs:
self._deduplicate(c,condseq)
@@ -509,7 +511,7 @@ class ComponentAccumulator(object):
seq=AthSequencer(seqName)
for alg in algoList:
seq+=alg
-
+
for (k,v) in self._theAppProps.iteritems():
if k not in [ 'CreateSvc', 'ExtSvc']:
@@ -525,8 +527,8 @@ class ComponentAccumulator(object):
# if self._jocat.has_key(name):
# self._msg.info("Not adding duplicate configurable: %s" % name )
# return
-
- #Hack for public Alg tools, drop multiple mentions of ToolSvc
+
+ #Hack for public Alg tools, drop multiple mentions of ToolSvc
nTS=0
for n in name.split("."):
if n=="ToolSvc":
@@ -535,7 +537,7 @@ class ComponentAccumulator(object):
break
if nTS>2:
name=".".join(name.split(".")[nTS-1:])
- for k, v in confElem.getValuedProperties().items():
+ for k, v in confElem.getValuedProperties().items():
if isinstance(v,Configurable):
self._jocat[name][k]=v.getFullName()
elif isinstance(v,GaudiHandles.GaudiHandleArray):
@@ -555,7 +557,7 @@ class ComponentAccumulator(object):
import glob
# first load basics from the bootstrap-pickle
# a better solution to be discussed
- # prefer local file
+ # prefer local file
localbs = glob.glob("bootstrap.pkl")
if len( localbs ) == 0:
# if local bootstrap is missing, use one from the release
@@ -578,11 +580,11 @@ class ComponentAccumulator(object):
evtalgseq.append( alg.getFullName() )
- for seqName, algoList in flatSequencers( self._sequence ).iteritems():
+ for seqName, algoList in flatSequencers( self._sequence ).iteritems():
# part of the sequence may come from the bootstrap, we need to retain the content, that is done here
- mergedSequence = ast.literal_eval(self._jocat[seqName]["Members"]) + [alg.getFullName() for alg in algoList]
+ mergedSequence = ast.literal_eval(self._jocat[seqName]["Members"]) + [alg.getFullName() for alg in algoList]
self._jocat[seqName]["Members"] = str( mergedSequence )
-
+
#Conditions Algorithms:
condalgseq=[]
@@ -599,11 +601,11 @@ class ComponentAccumulator(object):
- #Hack for now:
+ #Hack for now:
self._jocfg["ApplicationMgr"]["CreateSvc"]=['ToolSvc/ToolSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc']
-
+
svcList=ast.literal_eval(self._jocfg["ApplicationMgr"]["ExtSvc"])
-
+
for svc in self._services:
if svc.getJobOptName() in _servicesToCreate:
self._jocfg["ApplicationMgr"]["CreateSvc"].append( svc.getFullName() )
@@ -624,11 +626,17 @@ class ComponentAccumulator(object):
#from pprint import pprint
#pprint (self._jocat)
- pickle.dump( self._jocat, outfile )
- pickle.dump( self._jocfg, outfile )
- pickle.dump( self._pycomps, outfile )
+ pickle.dump( self._jocat, outfile )
+ pickle.dump( self._jocfg, outfile )
+ pickle.dump( self._pycomps, outfile )
self._wasMerged=True
+ def wasMerged(self):
+ """ Declares CA as merged
+
+ This is temporarily needed by HLT and should not be used elsewhere
+ """
+ self._wasMerged=True
def createApp(self,OutputLevel=3):
log = logging.getLogger("ComponentAccumulator")
@@ -636,7 +644,7 @@ class ComponentAccumulator(object):
from Gaudi.Main import BootstrapHelper
bsh=BootstrapHelper()
app=bsh.createApplicationMgr()
-
+
for (k,v) in self._theAppProps.iteritems():
app.setProperty(k,str(v))
@@ -648,13 +656,13 @@ class ComponentAccumulator(object):
extSvc+=[svc.getFullName(),]
if svc.getJobOptName() in _servicesToCreate:
svcToCreate+=[svc.getFullName(),]
-
+
#print self._services
#print extSvc
- #print svcToCreate
+ #print svcToCreate
app.setProperty("ExtSvc",str(extSvc))
app.setProperty("CreateSvc",str(svcToCreate))
-
+
print "CONFIGURE STEP"
app.configure()
@@ -662,7 +670,7 @@ class ComponentAccumulator(object):
bsh.setProperty(msp,"OutputLevel",str(OutputLevel))
#Feed the jobO service with the remaining options
jos=app.getService("JobOptionsSvc")
-
+
def addCompToJos(comp):
name=comp.getJobOptName()
for k, v in comp.getValuedProperties().items():
@@ -687,7 +695,7 @@ class ComponentAccumulator(object):
addCompToJos(svc)
pass
- #Add tree of algorithm sequences:
+ #Add tree of algorithm sequences:
for seqName, algoList in flatSequencers( self._sequence ).iteritems():
log.debug("Members of %s : %s" % (seqName,str([alg.getFullName() for alg in algoList])))
bsh.addPropertyToCatalogue(jos,seqName,"Members",str( [alg.getFullName() for alg in algoList]))
@@ -704,7 +712,7 @@ class ComponentAccumulator(object):
bsh.addPropertyToCatalogue(jos,"AthCondSeq","Members",str(condalgseq))
pass
-
+
#Public Tools:
for pt in self._publicTools:
addCompToJos(pt)
@@ -716,7 +724,7 @@ class ComponentAccumulator(object):
def run(self,maxEvents=None,OutputLevel=3):
log = logging.getLogger("ComponentAccumulator")
app = self.createApp (OutputLevel)
-
+
#Determine maxEvents
if maxEvents is None:
if "EvtMax" in self._theAppProps:
@@ -726,24 +734,24 @@ class ComponentAccumulator(object):
print "INITIALIZE STEP"
sc = app.initialize()
- if not sc.isSuccess():
+ if not sc.isSuccess():
log.error("Failed to initialize AppMgr")
return sc
-
+
app.printAlgsSequences() #could be removed later ....
sc = app.start()
- if not sc.isSuccess():
+ if not sc.isSuccess():
log.error("Failed to start AppMgr")
return sc
sc = app.run(maxEvents)
- if not sc.isSuccess():
+ if not sc.isSuccess():
log.error("Failure running application")
return sc
app.stop().ignore()
-
+
app.finalize().ignore()
sc1 = app.terminate()
@@ -761,12 +769,12 @@ def CAtoGlobalWrapper(cfgmethod,flags):
-# self test
+# self test
import unittest
class TestComponentAccumulator( unittest.TestCase ):
def setUp(self):
-
+
Configurable.configurableRun3Behavior+=1
# trivial case without any nested sequences
from AthenaCommon.Configurable import ConfigurablePyAlgorithm # guinea pig algorithms
@@ -775,10 +783,10 @@ class TestComponentAccumulator( unittest.TestCase ):
from AthenaCommon.Constants import DEBUG
log.setLevel(DEBUG)
-
+
dummyCfgFlags=AthConfigFlags()
dummyCfgFlags.lock()
-
+
class Algo(ConfigurablePyAlgorithm):
def __init__(self, name):
super( ConfigurablePyAlgorithm, self ).__init__( name )
@@ -798,7 +806,7 @@ class TestComponentAccumulator( unittest.TestCase ):
return acc,algs
acc = ComponentAccumulator()
-
+
# top level algs
acc1,algs=AlgsConf2(dummyCfgFlags)
acc.merge(acc1)
@@ -806,7 +814,7 @@ class TestComponentAccumulator( unittest.TestCase ):
def AlgsConf3(flags):
acc = ComponentAccumulator()
- na1=Algo("NestedAlgo1")
+ na1=Algo("NestedAlgo1")
return acc,na1
def AlgsConf4(flags):
@@ -827,7 +835,7 @@ class TestComponentAccumulator( unittest.TestCase ):
acc.merge(accNA1[0])
acc.addEventAlgo(accNA1[1:],"sub2Sequence1" )
acc.store(open("testFile.pkl", "w"))
- self.acc = acc
+ self.acc = acc
def test_algorihmsAreAdded( self ):
@@ -835,7 +843,7 @@ class TestComponentAccumulator( unittest.TestCase ):
self.assertEqual( findAlgorithm( self.acc.getSequence(), "Algo2", 1).name(), "Algo2", "Algorithm not added to a top sequence" )
self.assertEqual( findAlgorithm( self.acc.getSequence(), "Algo3", 1).name(), "Algo3", "Algorithm not added to a top sequence" )
- def test_sequencesAreAdded( self ):
+ def test_sequencesAreAdded( self ):
self.assertIsNotNone( self.acc.getSequence("subSequence1" ), "Adding sub-sequence failed" )
self.assertIsNotNone( self.acc.getSequence("subSequence2" ), "Adding sub-sequence failed" )
self.assertIsNotNone( self.acc.getSequence("sub2Sequence1"), "Adding sub-sequence failed" )
@@ -855,8 +863,8 @@ class TestComponentAccumulator( unittest.TestCase ):
class TestHLTCF( unittest.TestCase ):
def runTest( self ):
- # replicate HLT issue, it occured because the sequnces were recorded in the order of storing in the dict and thus the
- # some of them (in this case hltSteps) did not have properties recorded
+ # replicate HLT issue, it occured because the sequnces were recorded in the order of storing in the dict and thus the
+ # some of them (in this case hltSteps) did not have properties recorded
from AthenaCommon.CFElements import seqAND, seqOR, parOR
from AthenaCommon.Configurable import ConfigurablePyAlgorithm # guinea pig algorithms
Configurable.configurableRun3Behavior=1
@@ -869,7 +877,7 @@ class TestHLTCF( unittest.TestCase ):
acc.addSequence( seqAND("L2CaloEgammaSeq"), "hltStep_1" )
acc.addSequence( parOR("hltStep_2"), parentName="hltSteps" )
acc.moveSequence( "L2CaloEgammaSeq", "hltStep_2" )
-
+
acc.store(open("testFile2.pkl", "w"))
import pickle
f = open("testFile2.pkl")
@@ -885,23 +893,23 @@ class MultipleParentsInSequences( unittest.TestCase ):
from AthenaCommon.CFElements import seqAND
from AthenaCommon.Configurable import ConfigurablePyAlgorithm # guinea pig algorithms
accTop = ComponentAccumulator()
-
+
recoSeq = seqAND("seqReco")
recoAlg = ConfigurablePyAlgorithm( "recoAlg" )
recoSeq += recoAlg
-
+
acc1 = ComponentAccumulator()
acc1.addSequence( seqAND("seq1") )
acc1.addSequence( recoSeq, parentName="seq1" )
-
+
acc2 = ComponentAccumulator()
acc2.addSequence( seqAND("seq2") )
acc2.addSequence( recoSeq, parentName="seq2" )
-
+
accTop.merge( acc1 )
accTop.merge( acc2 )
-
- #accTop.printConfig()
+
+ accTop.printConfig()
self.assertIsNotNone( findAlgorithm( accTop.getSequence( "seq1" ), "recoAlg" ), "Algorithm missing in the first sequence" )
self.assertIsNotNone( findAlgorithm( accTop.getSequence( "seq2" ), "recoAlg" ), "Algorithm missing in the second sequence" )
@@ -929,7 +937,7 @@ class ForbidRecursiveSequences( unittest.TestCase ):
Configurable.configurableRun3Behavior=1
from AthenaCommon.CFElements import seqAND
accTop = ComponentAccumulator()
- accTop.store( open("test.pkl", "w") )#silence RuntimeError
+ accTop.wasMerged()
seq1 = seqAND("seq1")
seq1_again = seqAND("seq1")
accTop.addSequence(seq1)
@@ -945,14 +953,14 @@ class ForbidRecursiveSequences( unittest.TestCase ):
Configurable.configurableRun3Behavior=1
from AthenaCommon.CFElements import seqAND
accTop = ComponentAccumulator()
- accTop.store( open("test.pkl", "w") )#silence RuntimeError
+ accTop.wasMerged()
seq1 = seqAND("seq1")
seq2 = seqAND("seq2")
seq2_again = seqAND("seq1")
accTop.addSequence(seq1)
accTop.addSequence(seq2, parentName = "seq1")
accTop.addSequence(seq2_again, parentName = "seq1")
- accTop.store( open("test.pkl", "w") )
+ accTop.wasMerged()
#Can't add a sequence with the same name two steps below itself, e.g.
@@ -971,7 +979,7 @@ class ForbidRecursiveSequences( unittest.TestCase ):
accTop.addSequence(seq1)
accTop.addSequence(seq2, parentName = "seq1")
accTop.addSequence(seq1_again, parentName = "seq2")
- accTop.store(open("test.pkl", "w"))
+ accTop.wasMerged()
#Can't merge sequences with the same name two steps below itself, e.g.
# \__ AthAlgSeq (seq: PAR AND)
@@ -982,10 +990,10 @@ class ForbidRecursiveSequences( unittest.TestCase ):
Configurable.configurableRun3Behavior=1
from AthenaCommon.CFElements import seqAND
acc1=ComponentAccumulator()
- acc1.store( open("test.pkl", "w") )#silence RuntimeError
+ acc1.wasMerged()
acc1.addSequence(seqAND("seq1"))
acc2=ComponentAccumulator()
- acc2.store( open("test.pkl", "w") )#silence RuntimeError
+ acc2.wasMerged()
acc2.addSequence(seqAND("seq2"))
acc2.addSequence(seqAND("seq1"), "seq2")
acc1.merge(acc2)
@@ -997,13 +1005,14 @@ class ForbidRecursiveSequences( unittest.TestCase ):
class FailedMerging( unittest.TestCase ):
def runTest( self ):
topCA = ComponentAccumulator()
-
+
def badMerge():
someCA = ComponentAccumulator()
topCA.merge( (someCA, 1, "hello") )
self.assertRaises(RuntimeError, badMerge )
-
-
+ topCA.wasMerged()
+
+
class MergeMovingAlgorithms( unittest.TestCase ):
def runTest( self ):
Configurable.configurableRun3Behavior=1
@@ -1019,13 +1028,15 @@ class MergeMovingAlgorithms( unittest.TestCase ):
sourceCA.addEventAlgo(ConfigurablePyAlgorithm("alg3"), sequenceName="innerSeq" )
destinationCA.merge( sourceCA, sequenceName="dest" )
- #destinationCA.merge( sourceCA )
- destinationCA.store(open("test.pkl", "w"))#silence RuntimeError
- sourceCA.store(open("test.pkl", "w"))#silence RuntimeError
+
+ #destinationCA.merge( sourceCA )
self.assertIsNotNone( findAlgorithm( destinationCA.getSequence("dest"), "alg1" ), "Algorithm not placed in sub-sequence" )
self.assertIsNotNone( findSubSequence( destinationCA.getSequence(), "innerSeq" ), "The sequence is not added" )
self.assertIsNotNone( findAlgorithm( destinationCA.getSequence("dest"), "alg3" ), "Algorithm deep in thesource CA not placed in sub-sequence of destiantion CA" )
+ destinationCA.wasMerged()
+ sourceCA.wasMerged()
-
if __name__ == "__main__":
unittest.main()
+
+
diff --git a/Control/AthenaConfiguration/python/UnifyProperties.py b/Control/AthenaConfiguration/python/UnifyProperties.py
index 2781f6d40a1cf5bfa0100dff59849e8f64562b78..2978bca78ec1fc0dd78512478738560b006025e3 100644
--- a/Control/AthenaConfiguration/python/UnifyProperties.py
+++ b/Control/AthenaConfiguration/python/UnifyProperties.py
@@ -1,8 +1,10 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# A collection of methods to unify/merge list-properties
# ToDo: Define the merging-method when defining the property
+from AthenaCommon.Logging import logging
+log=logging.getLogger('ComponentAccumulator')
def unifySet(prop1,prop2):
#May want to strip whitespace in case the params are lists of strings
@@ -11,6 +13,13 @@ def unifySet(prop1,prop2):
su=s1 | s2
return list(su)
+def unifySetVerbose(prop1,prop2):
+ log.debug("In UnifyProperties: unifying sets" )
+ log.debug( str(prop1) )
+ log.debug( "and" )
+ log.debug( str(prop2) )
+ return unifySet(prop1,prop2)
+
def unifySetOfPairs(prop1,prop2):
def getPairs(seq):
@@ -19,7 +28,7 @@ def unifySetOfPairs(prop1,prop2):
if (2*nPairs!=len(seq)):
from AthenaConfiguration.ComponentAccumulator import ConfigurationError
raise ConfigurationError("Expected a sequence with even number of elements")
-
+
for i in range(0,nPairs):
r.add((seq[2*i],seq[2*i+1]))
return r
@@ -32,6 +41,9 @@ def unifySetOfPairs(prop1,prop2):
finallist+=p
return finallist
+
+
+
_propsToUnify={"GeoModelSvc.DetectorTools":unifySet,
"CondInputLoader.Load":unifySet,
"IOVDbSvc.Folders":unifySet,
@@ -48,6 +60,8 @@ _propsToUnify={"GeoModelSvc.DetectorTools":unifySet,
"AtRndmGenSvc.Seeds": unifySet,
}
+def setUnificationFunction(key, function):
+ _propsToUnify[key] = function
def getUnificationKey(propname):
if propname in _propsToUnify:
@@ -88,3 +102,17 @@ def unifyProperty(propname,prop1,prop2):
+ str(prop1) +"\n and \n" +str(prop2) \
+ "\nIf this property should be merged, consider adding it to AthenaConfiguration/UnifyProperties.py")
return unificationFunc(prop1,prop2)
+
+
+# self test
+import unittest
+
+class BasicTest( unittest.TestCase ):
+ def runTest( self ):
+ unified = unifyProperty("Alg.HypoTools", ["a", "b"], ["c", "b"])
+ self.assertEqual( sorted(unified), sorted(["a", "b", "c"]), "Hypo tools unification failed" )
+
+ setUnificationFunction("*.HypoTools", unifySetVerbose)
+ log.setLevel(7)
+ unified = unifyProperty("Alg.HypoTools", ["a", "b"], ["c", "b"])
+ self.assertEqual( sorted(unified), sorted(["a", "b", "c"]), "Hypo tools unification failed" )
diff --git a/Control/AthenaExamples/AthExHive/share/AthExHiveCond_test.ref b/Control/AthenaExamples/AthExHive/share/AthExHiveCond_test.ref
index ecb06f9fffc20ad13c4484f8ae6a92c3cedc3735..9e18700a2ac6dce7388ce3b0be221c3d47b8e538 100644
--- a/Control/AthenaExamples/AthExHive/share/AthExHiveCond_test.ref
+++ b/Control/AthenaExamples/AthExHive/share/AthExHiveCond_test.ref
@@ -1,20 +1,20 @@
0 13301 1 11
-1 13401 1 11
-2 13501 1 13
-3 13602 3 13
-4 13702 3 13
-5 13802 3 13
-6 13903 3 13
-7 14003 3 13
-8 14103 7 13
-9 14204 7 13
-10 14304 7 13
-11 14404 7 13
-12 14505 7 13
-13 14605 7 13
-14 14705 7 13
-15 14806 5 13
-16 14906 5 13
-17 15006 5 13
-18 15107 5 25
-19 15207 5 25
+1 13402 1 11
+2 13503 1 13
+3 13604 3 13
+4 13705 3 13
+5 13806 3 13
+6 13907 3 13
+7 14008 3 13
+8 14109 7 13
+9 14210 7 13
+10 14311 7 13
+11 14412 7 13
+12 14513 7 13
+13 14614 7 13
+14 14715 7 13
+15 14816 5 13
+16 14917 5 13
+17 15018 5 13
+18 15119 5 25
+19 15220 5 25
diff --git a/Control/AthenaExamples/AthExHive/src/AlgA.cxx b/Control/AthenaExamples/AthExHive/src/AlgA.cxx
index 50e8a53575639024cc4095d742bc2f3503536234..303387f5df9e30778e5980e548ecababc03303d3 100644
--- a/Control/AthenaExamples/AthExHive/src/AlgA.cxx
+++ b/Control/AthenaExamples/AthExHive/src/AlgA.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 "AlgA.h"
@@ -17,7 +17,7 @@
AlgA::AlgA( const std::string& name,
ISvcLocator* pSvcLocator ) :
- ::AthAlgorithm( name, pSvcLocator ), m_i(1)
+ ::AthAlgorithm( name, pSvcLocator )
{
}
@@ -50,24 +50,25 @@ StatusCode AlgA::execute() {
SG::ReadHandle<EventInfo> evt(m_evt);
ATH_MSG_INFO(" EventInfo: r: " << evt->event_ID()->run_number()
- << " e: " << evt->event_ID()->event_number() );
+ << " e: " << evt->event_ID()->event_number()
+ << " evt: " << Gaudi::Hive::currentContextEvt() );
+ unsigned int i = Gaudi::Hive::currentContextEvt() + 1;
+
SG::WriteHandle<HiveDataObj> wh1(m_wrh1);
ATH_CHECK( wh1.record( std::make_unique<HiveDataObj>
( HiveDataObj(10000 +
evt->event_ID()->event_number()*100 +
- m_i) ) )
+ i) ) )
);
ATH_MSG_INFO(" write: " << wh1.key() << " = " << wh1->val() );
SG::WriteHandle<HiveDataObj> wh2(m_wrh2);
- ATH_CHECK( wh2.record( std::make_unique< HiveDataObj >( HiveDataObj(10050+m_i) ) ) );
+ ATH_CHECK( wh2.record( std::make_unique< HiveDataObj >( HiveDataObj(10050+i) ) ) );
ATH_MSG_INFO(" write: " << wh2.key() << " = " << wh2->val() );
- m_i += 1;
-
return StatusCode::SUCCESS;
}
diff --git a/Control/AthenaExamples/AthExHive/src/AlgA.h b/Control/AthenaExamples/AthExHive/src/AlgA.h
index 0b161c0c38afdced8806cfd1f290072ff29cbdee..6e729b05434183862fcf45bada0224a296bd5b45 100644
--- a/Control/AthenaExamples/AthExHive/src/AlgA.h
+++ b/Control/AthenaExamples/AthExHive/src/AlgA.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 CONDALGS_ALGA_H
@@ -33,8 +33,5 @@ private:
SG::WriteHandleKey<HiveDataObj> m_wrh2 {this, "Key_W2", "a2", "write key 2"};
SG::ReadHandleKey<EventInfo> m_evt {this, "EvtInfo", "McEventInfo",
"EventInfo name"};
-
- std::atomic<int> m_i {1};
-
};
#endif
diff --git a/Control/AthenaMonitoring/doc/Monitored_page.h b/Control/AthenaMonitoring/doc/Monitored_page.h
index e2f86319ce3eb9b8e209ec40f27aa67827abf3af..a61cd1f1ff15c4e7df46f85f7e0f190de3c9f683 100644
--- a/Control/AthenaMonitoring/doc/Monitored_page.h
+++ b/Control/AthenaMonitoring/doc/Monitored_page.h
@@ -15,6 +15,8 @@
1) Add a GenericMonitoringTool instance to your component
\code
+ #include "AthenaMonitoring/Monitored.h"
+ [...]
private:
ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
\endcode
@@ -50,16 +52,14 @@
5) Configure the list of histograms in python
\code
- from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
+ from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool
monTool = GenericMonitoringTool('MonTool')
- monTool.Histograms = [defineHistogram('eta', path='EXPERT', type='TH1F', title='Eta;;Entries',
- xbins=40, xmin=-2, xmax=2),
- defineHistogram('phi', path='EXPERT', type='TH1F', title='Phi;;Entries',
- xbins=60, xmin=-3.2, xmax=3.2),
- defineHistogram('eta,phi', path='EXPERT', type='TH2F', title='Eta vs Phi',
- xbins=20, xmin=-2, xmax=2, ybins=30, ymin=-3.2, ymax=3.2)]
+ monTool.defineHistogram('eta', path='EXPERT', type='TH1F', title='Eta;;Entries', xbins=40, xmin=-2, xmax=2)
+ monTool.defineHistogram('phi', path='EXPERT', type='TH1F', title='Phi;;Entries', xbins=60, xmin=-3.2, xmax=3.2)
+ monTool.defineHistogram('eta,phi', path='EXPERT', type='TH2F', title='Eta vs Phi',
+ xbins=20, xmin=-2, xmax=2, ybins=30, ymin=-3.2, ymax=3.2)
- topSequence.myAlg.MonTool = monTool
+ topSequence.myAlg.MonTool = monTool
\endcode
\remark Without this python configuration, i.e. the last line, no monitoring tool is instantiated
@@ -74,6 +74,9 @@
If the collection contains objects, an accessor can be defined to retrieve the relevant quantity.
See the examples in Monitored::Collection.
+ ### Timing histograms ###
+ @copydetails Monitored::Timer
+
## Additional documentation ##
- The MonitoredAlg standalone example and its MonitoredOptions.py job
options
diff --git a/Control/AthenaMonitoring/python/GenericMonitoringTool.py b/Control/AthenaMonitoring/python/GenericMonitoringTool.py
index ec41c1758d456eb45f968bbef40187b50dff4ceb..f74bb1b276221263d4ad084faf17d99f6c4f06b8 100644
--- a/Control/AthenaMonitoring/python/GenericMonitoringTool.py
+++ b/Control/AthenaMonitoring/python/GenericMonitoringTool.py
@@ -32,7 +32,7 @@ def defineHistogram(varname, type='TH1F', path=None,
if path is None:
import warnings
- warnings.warn("Calling defineHistrogram without path is deprecated. Specify e.g. path='EXPERT'", stacklevel=2)
+ warnings.warn("WARNING: Calling defineHistrogram without path is deprecated. Specify e.g. path='EXPERT'", stacklevel=2)
path = 'EXPERT'
if title is None: title=varname
@@ -49,8 +49,9 @@ def defineHistogram(varname, type='TH1F', path=None,
# For backwards compatibility
elif labels is not None:
- log.warning("The 'label1:label2' syntax in defineHistogram is deprecated. "
- "Please use a list instead: ['label1','label2']")
+ import warnings
+ warnings.warn("WARNING: The 'label1:label2' syntax in defineHistogram is deprecated. "
+ "Please use a list instead: ['label1','label2']", stacklevel=2)
labels = labels.strip() # remove spurious white-spaces
if len(labels)>0:
if labels[-1]!=':': labels += ':'
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.cxx b/Control/AthenaServices/src/AthIncFirerAlg.cxx
index e7e115198156a5e0ca9eab19b856549b59cda090..69ac92f1107882e1d4d2da5fd2768e7089b783cc 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.cxx
+++ b/Control/AthenaServices/src/AthIncFirerAlg.cxx
@@ -4,7 +4,6 @@
#include "AthIncFirerAlg.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
-#include "EventInfo/EventInfo.h"
#include "EventInfo/EventIncident.h"
#include "AthenaKernel/errorcheck.h"
@@ -28,13 +27,8 @@ StatusCode AthIncFirerAlg::execute(const EventContext& ctx)const {
for(auto & i:m_incLists.value()){
ATH_MSG_VERBOSE("Firing incident "<<i);
if((i=="BeginEvent")||(i=="EndEvent")){
- const EventInfo* event = evtStore()->tryConstRetrieve<EventInfo>();
- if( event ) {
- m_incSvc->fireIncident(std::make_unique<EventIncident>(*event, name(),i,ctxcp));
- if(m_Serial.value())m_incSvc->fireIncident(EventIncident(*event, name(),i,ctxcp));
- } else {
- ATH_MSG_WARNING("EventInfo not found, not Firing incident "<<i);
- }
+ m_incSvc->fireIncident(std::make_unique<EventIncident>(name(),i,ctxcp));
+ if(m_Serial.value())m_incSvc->fireIncident(EventIncident(name(),i,ctxcp));
}else{
m_incSvc->fireIncident(std::make_unique<Incident>(name(),i,ctxcp));
if(m_Serial.value())m_incSvc->fireIncident(Incident( name(),i,ctxcp));
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
index a09eef98d06020856d9eb4a5b0b70fb0b54fd05a..109e9b856379f14c25bf4f8ec05b582da5f662c4 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
@@ -500,10 +500,10 @@ StatusCode AthenaEventLoopMgr::writeHistograms(bool force) {
//=========================================================================
// Run the algorithms beginRun hook
//=========================================================================
-StatusCode AthenaEventLoopMgr::beginRunAlgorithms(const EventInfo& event) {
+StatusCode AthenaEventLoopMgr::beginRunAlgorithms() {
// Fire BeginRun "Incident"
- m_incidentSvc->fireIncident(EventIncident(event, name(),"BeginRun"));
+ m_incidentSvc->fireIncident(EventIncident(name(),IncidentType::BeginRun,m_eventContext));
// Call the execute() method of all top algorithms
for ( ListAlg::iterator ita = m_topAlgList.begin();
@@ -528,7 +528,7 @@ StatusCode AthenaEventLoopMgr::beginRunAlgorithms(const EventInfo& event) {
StatusCode AthenaEventLoopMgr::endRunAlgorithms() {
// Fire EndRun Incident
- m_incidentSvc->fireIncident(Incident(name(),"EndRun"));
+ m_incidentSvc->fireIncident(Incident(name(),IncidentType::EndRun));
// Call the execute() method of all top algorithms
for ( ListAlg::iterator ita = m_topAlgList.begin();
@@ -701,7 +701,7 @@ StatusCode AthenaEventLoopMgr::executeEvent(void* /*par*/)
info() << " ===>>> start of run " << m_currentRun << " <<<==="
<< endmsg;
- if (!(this->beginRunAlgorithms(*pEvent)).isSuccess()) return (StatusCode::FAILURE);
+ if (!(this->beginRunAlgorithms()).isSuccess()) return (StatusCode::FAILURE);
}
bool toolsPassed=true;
@@ -1107,7 +1107,7 @@ void AthenaEventLoopMgr::handle(const Incident& inc)
return;
}
- sc = beginRunAlgorithms(*pEvent);
+ sc = beginRunAlgorithms();
if (!sc.isSuccess()) {
error() << "beginRunAlgorithms() failed" << endmsg;
return;
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.h b/Control/AthenaServices/src/AthenaEventLoopMgr.h
index 015be5173cacbddf523d2ff4f6575b4fa4caedb1..8cb6cf839c54c563b3779a183344bd4e091922d6 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.h
@@ -14,7 +14,6 @@
#include <string>
#include <vector>
-
#include "GaudiKernel/IEvtSelector.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -149,8 +148,8 @@ protected:
/// Run the algorithms for the current event
virtual StatusCode executeAlgorithms(const EventContext&);
- /// Fire BeginRun EventIncident, run the algorithms beginRun hook
- StatusCode beginRunAlgorithms(const EventInfo&);
+ /// Fire BeginRun Incident, run the algorithms beginRun hook
+ StatusCode beginRunAlgorithms();
/// Fire EndEvtLoop,EndRun, run the algorithms endRun hook
StatusCode endRunAlgorithms();
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
index 5eb6a92d6677e40cd24fc3fc56c830ca8dc23ed7..d5b6ecec8c75fcfa3856533abe5e0e19048596ee 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
@@ -555,10 +555,7 @@ StatusCode AthenaHiveEventLoopMgr::writeHistograms(bool force) {
//=========================================================================
// Run the algorithms beginRun hook
//=========================================================================
-StatusCode AthenaHiveEventLoopMgr::beginRunAlgorithms(const EventInfo& /*event */) {
-
- // Fire BeginRun "Incident"
- // m_incidentSvc->fireIncident(EventIncident(event, name(),"BeginRun"));
+StatusCode AthenaHiveEventLoopMgr::beginRunAlgorithms() {
return StatusCode::SUCCESS;
}
@@ -568,9 +565,6 @@ StatusCode AthenaHiveEventLoopMgr::beginRunAlgorithms(const EventInfo& /*event *
//=========================================================================
StatusCode AthenaHiveEventLoopMgr::endRunAlgorithms() {
- // Fire EndRun Incident
- // m_incidentSvc->fireIncident(Incident(name(),"EndRun"));
-
return StatusCode::SUCCESS;
}
@@ -652,8 +646,7 @@ StatusCode AthenaHiveEventLoopMgr::executeEvent(void* createdEvts_IntPtr )
<< endmsg;
// FIXME!!! Fire BeginRun "Incident"
- m_incidentSvc->fireIncident(EventIncident(*pEvent, name(),
- IncidentType::BeginRun));
+ m_incidentSvc->fireIncident(EventIncident(name(),IncidentType::BeginRun,*evtContext));
}
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
index 9a7844364b508de73d811c65279debf4388b17d3..15a93a89baa963b698841b42f9553fd668c2ee35 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
@@ -157,8 +157,8 @@ protected:
/// Run the algorithms for the current event
virtual StatusCode executeAlgorithms();
- /// Fire BeginRun EventIncident, run the algorithms beginRun hook
- StatusCode beginRunAlgorithms(const EventInfo&);
+ /// Fire BeginRun Incident, run the algorithms beginRun hook
+ StatusCode beginRunAlgorithms();
/// Fire EndEvtLoop,EndRun, run the algorithms endRun hook
StatusCode endRunAlgorithms();
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 308bdf6b983f21d7d3d94e833810cdba4011b328..5e5ecb043297ee3bb9078e9744e0f50df12df732 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.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 "AthenaOutputStream.h"
@@ -319,6 +319,7 @@ StatusCode AthenaOutputStream::initialize() {
StatusCode AthenaOutputStream::stop()
{
ATH_MSG_DEBUG("AthenaOutputStream " << this->name() << " ::stop()");
+/*
for (std::vector<ToolHandle<IAthenaOutputTool> >::iterator iter = m_helperTools.begin();
iter != m_helperTools.end(); iter++) {
if (!(*iter)->preFinalize().isSuccess()) {
@@ -370,6 +371,7 @@ StatusCode AthenaOutputStream::stop()
}
ATH_MSG_INFO("Records written: " << m_events);
}
+*/
return StatusCode::SUCCESS;
}
@@ -378,6 +380,60 @@ void AthenaOutputStream::handle(const Incident& inc) {
if (inc.type() == "MetaDataStop") {
// Moved preFinalize of helper tools to stop - want to optimize the
// output file in finalize RDS 12/2009
+ for (std::vector<ToolHandle<IAthenaOutputTool> >::iterator iter = m_helperTools.begin();
+ iter != m_helperTools.end(); iter++) {
+ if (!(*iter)->preFinalize().isSuccess()) {
+ ATH_MSG_ERROR("Cannot finalize helper tool");
+ }
+ }
+ // Make sure the metadata tools finalize their output
+ ServiceHandle<MetaDataSvc> mdsvc("MetaDataSvc", name());
+ if (mdsvc.retrieve().isFailure()) {
+ ATH_MSG_ERROR("Could not retrieve MetaDataSvc for stop actions");
+ }
+ else {
+ if (mdsvc->prepareOutput().isFailure()) {
+ ATH_MSG_ERROR("Failed on MetaDataSvc prepareOutput");
+ }
+ }
+ // Always force a final commit in stop - mainly applies to AthenaPool
+ if (m_writeOnFinalize) {
+ if (write().isFailure()) { // true mean write AND commit
+ ATH_MSG_ERROR("Cannot write on finalize");
+ }
+ ATH_MSG_INFO("Records written: " << m_events);
+ }
+
+ if (!m_metadataItemList.value().empty()) {
+ m_currentStore = &m_metadataStore;
+ StatusCode status = m_streamer->connectServices(m_metadataStore.type(), m_persName, false);
+ if (status.isFailure()) {
+ throw GaudiException("Unable to connect metadata services", name(), StatusCode::FAILURE);
+ }
+ m_checkNumberOfWrites = false;
+ m_outputAttributes = "[OutputCollection=MetaDataHdr][PoolContainerPrefix=MetaData][AttributeListKey=][DataHeaderSatellites=]";
+ m_p2BWritten->clear();
+ IProperty *pAsIProp(nullptr);
+ if ((m_p2BWritten.retrieve()).isFailure() ||
+ nullptr == (pAsIProp = dynamic_cast<IProperty*>(&*m_p2BWritten)) ||
+ (pAsIProp->setProperty("ItemList", m_metadataItemList.toString())).isFailure()) {
+ throw GaudiException("Folder property [metadataItemList] not found", name(), StatusCode::FAILURE);
+ }
+ if (write().isFailure()) { // true mean write AND commit
+ ATH_MSG_ERROR("Cannot write metadata");
+ }
+ m_outputAttributes.clear();
+ m_currentStore = &m_dataStore;
+ status = m_streamer->connectServices(m_dataStore.type(), m_persName, m_extendProvenanceRecord);
+ if (status.isFailure()) {
+ throw GaudiException("Unable to re-connect services", name(), StatusCode::FAILURE);
+ }
+ m_p2BWritten->clear();
+ if ((pAsIProp->setProperty(m_itemList)).isFailure()) {
+ throw GaudiException("Folder property [itemList] not found", name(), StatusCode::FAILURE);
+ }
+ ATH_MSG_INFO("Records written: " << m_events);
+ }
} else if (inc.type() == "UpdateOutputFile") {
const FileIncident* fileInc = dynamic_cast<const FileIncident*>(&inc);
if(fileInc!=nullptr) {
@@ -864,6 +920,8 @@ StatusCode AthenaOutputStream::io_reinit() {
}
return StatusCode::SUCCESS;
}
+
+
StatusCode AthenaOutputStream::io_finalize() {
ATH_MSG_INFO("I/O finalization...");
for (std::vector<ToolHandle<IAthenaOutputTool> >::iterator iter = m_helperTools.begin();
diff --git a/Control/AthenaServices/src/CoreDumpSvc.cxx b/Control/AthenaServices/src/CoreDumpSvc.cxx
index 90daeba62abb956572e1094844eb67f2e6bd430a..99b497277f74898dce1f7b79746f61eecf91c2b0 100644
--- a/Control/AthenaServices/src/CoreDumpSvc.cxx
+++ b/Control/AthenaServices/src/CoreDumpSvc.cxx
@@ -37,11 +37,11 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/System.h"
#include "GaudiKernel/ConcurrencyFlags.h"
+#include "GaudiKernel/EventContext.h"
// Athena includes
#include "AthenaKernel/IAthenaSummarySvc.h"
#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
#include "StoreGate/StoreGateSvc.h"
#include "CxxUtils/SealCommon.h"
#include "CxxUtils/SealSignal.h"
@@ -416,12 +416,10 @@ void CoreDumpSvc::handle(const Incident& incident)
const EventIncident* eventInc(nullptr);
if (nullptr != (eventInc = dynamic_cast<const EventIncident*>(&incident))) {
- const EventID* eventID = eventInc->eventInfo().event_ID();
- if (eventID) {
- std::ostringstream oss;
- oss << *eventID;
- currRec.EvId = oss.str();
- }
+ const EventIDBase& eventID = incident.context().eventID();
+ std::ostringstream oss;
+ oss << eventID;
+ currRec.EvId = oss.str();
}
if (incident.type()==IncidentType::BeginEvent) {
diff --git a/Control/AthenaServices/src/MetaDataSvc.cxx b/Control/AthenaServices/src/MetaDataSvc.cxx
index d9bd7e42f1a1aa689f679872dabf70a65865fc31..5c8b03b044db9a2fbb385d255ceb8d1da96547d4 100644
--- a/Control/AthenaServices/src/MetaDataSvc.cxx
+++ b/Control/AthenaServices/src/MetaDataSvc.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
*/
/** @file MetaDataSvc.cxx
@@ -185,6 +185,7 @@ StatusCode MetaDataSvc::finalize() {
}
//__________________________________________________________________________
StatusCode MetaDataSvc::stop() {
+ ATH_MSG_INFO("MetaDataSvc::stop()");
ServiceHandle<IJobOptionsSvc> joSvc("JobOptionsSvc", name());
if (!joSvc.retrieve().isSuccess()) {
ATH_MSG_WARNING("Cannot get JobOptionsSvc.");
@@ -205,8 +206,12 @@ StatusCode MetaDataSvc::stop() {
}
}
+ // Set to be listener for end of event
+ Incident metaDataStopIncident(name(), "MetaDataStop");
+ m_incSvc->fireIncident(metaDataStopIncident);
+
// finalizing tools via metaDataStop
- ATH_CHECK(this->prepareOutput());
+ //ATH_CHECK(this->prepareOutput());
return(StatusCode::SUCCESS);
}
@@ -318,6 +323,7 @@ StatusCode MetaDataSvc::retireMetadataSource(const Incident& inc)
StatusCode MetaDataSvc::prepareOutput()
{
+ ATH_MSG_DEBUG("prepareOutput");
StatusCode rc(StatusCode::SUCCESS);
for (auto it = m_metaDataTools.begin(); it != m_metaDataTools.end(); ++it) {
ATH_MSG_DEBUG(" calling metaDataStop for " << (*it)->name());
@@ -397,6 +403,9 @@ StatusCode MetaDataSvc::transitionMetaDataFile(bool ignoreInputFile) {
return(StatusCode::FAILURE);
}
+ Incident metaDataStopIncident(name(), "MetaDataStop");
+ m_incSvc->fireIncident(metaDataStopIncident);
+
// Set to be listener for end of event
ATH_CHECK(this->prepareOutput());
diff --git a/Control/IOVSvc/src/IOVSvcTool.cxx b/Control/IOVSvc/src/IOVSvcTool.cxx
index f498a6b8c0dcf58e1d0876366d6be65459e45528..31335af85d8c9d70b4888c2590c1d81d40316305 100644
--- a/Control/IOVSvc/src/IOVSvcTool.cxx
+++ b/Control/IOVSvc/src/IOVSvcTool.cxx
@@ -260,8 +260,6 @@ IOVSvcTool::initialize() {
return StatusCode::FAILURE;
}
- p_incSvc->addListener( this, "CheckIOV", pri, true);
-
if (m_preLoadData) {
m_log << MSG::INFO;
m_log.setColor(MSG::GREEN);
@@ -335,11 +333,11 @@ IOVSvcTool::handle(const Incident &inc) {
// Forcing IOV checks on the first event in the run for AthenaMP (ATEAM-439)
if(Gaudi::Concurrency::ConcurrencyFlags::numProcs()==0) {
- if (inc.type() == "BeginRun") {
+ if (inc.type() == IncidentType::BeginRun) {
m_firstEventOfRun = true;
}
- if (inc.type() == "BeginEvent" && m_firstEventOfRun) {
+ if (inc.type() == IncidentType::BeginEvent && m_firstEventOfRun) {
m_firstEventOfRun = false;
if (m_checkTrigger == "BeginEvent") {
return;
@@ -347,63 +345,40 @@ IOVSvcTool::handle(const Incident &inc) {
}
}
- if ( inc.type() == m_checkTrigger || inc.type() == "BeginRun" ||
- inc.type() == "CheckIOV" ) {
+ if ( inc.type() == m_checkTrigger || inc.type() == IncidentType::BeginRun ) {
- const EventInfo* evt(0);
-
- // try to get EventInfo object from incident for CheckIOV
- if (inc.type() == "CheckIOV") {
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if (eventInc != 0) {
- if (m_log.level() <= MSG::DEBUG) {
- m_log << MSG::DEBUG << " Got EventInfo object from CheckIOV incident"
- << endmsg;
- }
- evt = &eventInc->eventInfo();
- } else if (p_sgSvc->retrieve(evt).isFailure()) {
- m_log << MSG::ERROR << " Unable to get EventInfo from either "
- << "EventStore or CheckIOV incident" << endmsg;
- return;
+ EventContext context;
+ const EventInfo* evt = p_sgSvc->tryConstRetrieve<EventInfo>();
+ if( !evt ) {
+ // If EventInfo is not in the event store, check whether
+ // whether we can get event context via BeginRun incident
+ const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
+ if(!eventInc) {
+ m_log << MSG::ERROR
+ << " Unable to get event information from either EventStore (via EventInfo) or "
+ << inc.type() << " incident (via EventContext)"
+ << endmsg;
+ return;
} else {
- if (m_log.level() <= MSG::DEBUG) {
- m_log << MSG::DEBUG << " Got EventInfo object from StoreGate "
- << "for CheckIOV incident"
- << endmsg;
- }
- }
- } else {
-
- evt = p_sgSvc->tryConstRetrieve<EventInfo>();
- if( !evt ) {
- // If EventInfo is not in the event store, check whether it
- // has come via the BeginRun incident
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(!eventInc) {
- m_log << MSG::ERROR
- << " Unable to get EventInfo from either EventStore or "
- << inc.type() << " incident" << endmsg;
- return;
- } else {
- evt = &eventInc->eventInfo();
- if (m_log.level() <= MSG::DEBUG) {
- m_log << MSG::DEBUG << "Got EventIncident from " << inc.type()
- << " incident" << endmsg;
- }
- }
+ context = inc.context();
+ if (m_log.level() <= MSG::DEBUG) {
+ m_log << MSG::DEBUG << "Got event context from " << inc.type() << " incident" << endmsg;
+ }
}
}
m_curTime.reset();
-
- event = evt->event_ID()->lumi_block();
- run = evt->event_ID()->run_number();
+ const EventIDBase* eventID = (evt ? evt->event_ID() : &context.eventID());
+ event = eventID->lumi_block();
+ run = eventID->run_number();
+
+ m_log << MSG::DEBUG << "Got event info: " << "run="<< run << ", event=" << event << endmsg;
m_curTime.setRunEvent(run,event);
// get ns timestamp from event
- m_curTime.setTimestamp(1000000000L*(uint64_t)evt->event_ID()->time_stamp()+evt->event_ID()->time_stamp_ns_offset());
+ m_curTime.setTimestamp(1000000000L*(uint64_t)eventID->time_stamp() + eventID->time_stamp_ns_offset());
if (m_log.level() <= MSG::DEBUG) {
m_log << MSG::DEBUG;
@@ -411,7 +386,7 @@ IOVSvcTool::handle(const Incident &inc) {
m_log << inc.type() << ": [R/LB] = " << m_curTime << endmsg;
}
- if (inc.type() == "BeginRun") {
+ if (inc.type() == IncidentType::BeginRun) {
// Signal BeginRun directly to IOVDbSvc
IIOVDbSvc *iovDB = 0;
if (StatusCode::SUCCESS != service("IOVDbSvc", iovDB, false)) {
@@ -495,7 +470,7 @@ IOVSvcTool::handle(const Incident &inc) {
////// We need to check both R/E and Clocktime sets
//
- if (inc.type() == "BeginRun" && m_forceReset && !s_firstRun) {
+ if (inc.type() == IncidentType::BeginRun && m_forceReset && !s_firstRun) {
if (m_log.level() <= MSG::DEBUG) {
m_log << MSG::DEBUG
<< "Resetting all proxies on BeginRun incident for store \""
@@ -669,7 +644,7 @@ IOVSvcTool::handle(const Incident &inc) {
} // end if(inc.type() == m_checkTrigger)
- if ( inc.type() == "BeginRun") {
+ if ( inc.type() == IncidentType::BeginRun) {
s_firstRun = false;
}
diff --git a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
index 8643d39d59c33c15d1724d7eb951f8b18c5d5230..a8282e3455cfcb1f8e8b768355be278c4bc7e2cd 100644
--- a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
+++ b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
@@ -735,7 +735,7 @@ StatusCode PileUpEventLoopMgr::executeEvent(void* par)
// Fire EndRun incident unless this is the first run
if (!m_firstRun)
{
- m_incidentSvc->fireIncident(Incident(this->name(),IncidentType::EndRun));
+ m_incidentSvc->fireIncident(Incident(this->name(),IncidentType::EndRun));
CHECK(this->endRunAlgorithms());
}
m_firstRun=false;
@@ -744,12 +744,12 @@ StatusCode PileUpEventLoopMgr::executeEvent(void* par)
ATH_MSG_INFO ( " ===>>> start of run " << m_currentRun << " <<<===" );
// Fire BeginRun "Incident"
- m_incidentSvc->fireIncident(EventIncident(ei, this->name(), IncidentType::BeginRun));
+ m_incidentSvc->fireIncident(EventIncident(this->name(),IncidentType::BeginRun,*m_eventContext));
CHECK(this->beginRunAlgorithms());
}
// Fire BeginEvent "Incident"
- m_incidentSvc->fireIncident(EventIncident(ei, this->name(),IncidentType::BeginEvent));
+ //m_incidentSvc->fireIncident(EventIncident(ei, this->name(),IncidentType::BeginEvent));
// Execute Algorithms
// StatusCode sc = MinimalEventLoopMgr::executeEvent(par);
@@ -801,7 +801,7 @@ StatusCode PileUpEventLoopMgr::executeEvent(void* par)
}
// Fire EndEvent "Incident"
- m_incidentSvc->fireIncident( EventIncident(ei, this->name(), IncidentType::EndEvent) );
+ //m_incidentSvc->fireIncident( EventIncident(ei, this->name(), IncidentType::EndEvent) );
//------------------------------------------------------------------------
// Check if there was an error processing current event
diff --git a/Control/RngComps/CMakeLists.txt b/Control/RngComps/CMakeLists.txt
index 44ec2be9e3cd98301cd3642beb90f0f76ad8bddd..02205ecaa20781a4d89b77e19bbad9a0d2ae54e0 100644
--- a/Control/RngComps/CMakeLists.txt
+++ b/Control/RngComps/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs(
Control/AthenaBaseComps
Control/AthenaKernel
Control/StoreGate
- Event/EventInfo
GaudiKernel
Simulation/Tools/AtlasCLHEP_RandomGenerators )
@@ -25,7 +24,7 @@ find_package( CLHEP )
atlas_add_component( RngComps src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES}
- AthenaBaseComps AthenaKernel StoreGateLib EventInfo GaudiKernel
+ AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel
AtlasCLHEP_RandomGenerators )
# Test(s) in the package:
diff --git a/Control/RngComps/src/AtDSFMTGenSvc.cxx b/Control/RngComps/src/AtDSFMTGenSvc.cxx
index 1b2a73912d06f4eadadf3224e9d580f34ad733ba..91107fa462190c055104760dc23641c03cc2ade0 100644
--- a/Control/RngComps/src/AtDSFMTGenSvc.cxx
+++ b/Control/RngComps/src/AtDSFMTGenSvc.cxx
@@ -8,10 +8,6 @@
#include "GaudiKernel/DataIncident.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
#include "interpretSeeds.h"
#include "AtDSFMTGenSvc.h"
#include "crc_combine.h"
@@ -230,7 +226,8 @@ void AtDSFMTGenSvc::handle(const Incident &inc) {
print();
} else if (inc.type() == "BeginEvent") {
ATH_MSG_DEBUG (" Handle BeginEvent ");
- const EventID* pei((dynamic_cast<const EventIncident&>(inc)).eventInfo().event_ID());
+ EventContext context = inc.context();
+ const EventIDBase& ei = context.eventID();
//clear static RandGauss cache (generates two numbers per call to shoot()
CLHEP::RandGauss::setFlag(false);
//loop over generator streams, combining the stream name to the hash
@@ -239,14 +236,14 @@ void AtDSFMTGenSvc::handle(const Incident &inc) {
//by default (when no streams are specified in streamNames, seed all
//streams
if (i == e) {
- if (!(this->setAllOnDefinedSeeds(pei->event_number(),
- pei->run_number())))
+ if (!(this->setAllOnDefinedSeeds(ei.event_number(),
+ ei.run_number())))
throw GaudiException("can not reseed all streams ", name(), StatusCode::FAILURE);
} else {
while (i != e) {
const string& strName(*i++);
- if (0 == this->setOnDefinedSeeds(pei->event_number(),
- pei->run_number(),
+ if (0 == this->setOnDefinedSeeds(ei.event_number(),
+ ei.run_number(),
strName)) {
throw GaudiException(string("can not reseed stream ") + strName,
name(), StatusCode::FAILURE);
diff --git a/Control/RngComps/src/AtRanluxGenSvc.cxx b/Control/RngComps/src/AtRanluxGenSvc.cxx
index 8e8517cd5699f426f273e631d2be92cf4b09da2d..736ef519f12ee1ffc7d741518c101a7e03996b0b 100644
--- a/Control/RngComps/src/AtRanluxGenSvc.cxx
+++ b/Control/RngComps/src/AtRanluxGenSvc.cxx
@@ -11,10 +11,6 @@
#include "CLHEP/Random/Ranlux64Engine.h"
#include "CLHEP/Random/RandGauss.h"
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
#include "interpretSeeds.h"
#include "AtRanluxGenSvc.h"
#include "crc_combine.h"
@@ -246,7 +242,8 @@ AtRanluxGenSvc::handle(const Incident &inc) {
print();
} else if (inc.type() == "BeginEvent") {
ATH_MSG_DEBUG (" Handle BeginEvent ");
- const EventID* pei((dynamic_cast<const EventIncident&>(inc)).eventInfo().event_ID());
+ EventContext context = inc.context();
+ const EventIDBase& ei = context.eventID();
//clear static RandGauss cache (generates two numbers per call to shoot()
CLHEP::RandGauss::setFlag(false);
//loop over generator streams, combining the stream name to the hash
@@ -255,14 +252,14 @@ AtRanluxGenSvc::handle(const Incident &inc) {
//by default (when no streams are specified in streamNames, seed all
//streams
if (i == e) {
- if (!(this->setAllOnDefinedSeeds(pei->event_number(),
- pei->run_number())))
+ if (!(this->setAllOnDefinedSeeds(ei.event_number(),
+ ei.run_number())))
throw GaudiException("can not reseed all streams ", name(), StatusCode::FAILURE);
} else {
while (i != e) {
const string& strName(*i++);
- if (0 == this->setOnDefinedSeeds(pei->event_number(),
- pei->run_number(),
+ if (0 == this->setOnDefinedSeeds(ei.event_number(),
+ ei.run_number(),
strName)) {
throw GaudiException(string("can not reseed stream ") + strName,
name(), StatusCode::FAILURE);
diff --git a/Control/RngComps/src/AtRndmGenSvc.cxx b/Control/RngComps/src/AtRndmGenSvc.cxx
index 44806774a6acc0e4ecb6f1102f1285a6c42791d9..da515eec368bcd8e96af9a8a43647ccd5763a8da 100644
--- a/Control/RngComps/src/AtRndmGenSvc.cxx
+++ b/Control/RngComps/src/AtRndmGenSvc.cxx
@@ -11,10 +11,6 @@
#include "CLHEP/Random/RanecuEngine.h"
#include "CLHEP/Random/RandGauss.h"
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
#include "interpretSeeds.h"
#include "AtRndmGenSvc.h"
#include "crc_combine.h"
@@ -219,7 +215,8 @@ AtRndmGenSvc::handle(const Incident &inc) {
print();
} else if (inc.type() == "BeginEvent") {
ATH_MSG_DEBUG (" Handle BeginEvent ");
- const EventID* pei((dynamic_cast<const EventIncident&>(inc)).eventInfo().event_ID());
+ EventContext context = inc.context();
+ const EventIDBase& ei = context.eventID();
//clear static RandGauss cache (generates two numbers per call to shoot()
CLHEP::RandGauss::setFlag(false);
//loop over generator streams, combining the stream name to the hash
@@ -228,14 +225,14 @@ AtRndmGenSvc::handle(const Incident &inc) {
//by default (when no streams are specified in streamNames, seed all
//streams
if (i == e) {
- if (!(this->setAllOnDefinedSeeds(pei->event_number(),
- pei->run_number())))
+ if (!(this->setAllOnDefinedSeeds(ei.event_number(),
+ ei.run_number())))
throw GaudiException("can not reseed all streams ", name(), StatusCode::FAILURE);
} else {
while (i != e) {
const string& strName(*i++);
- if (0 == this->setOnDefinedSeeds(pei->event_number(),
- pei->run_number(),
+ if (0 == this->setOnDefinedSeeds(ei.event_number(),
+ ei.run_number(),
strName)) {
throw GaudiException(string("can not reseed stream ") + strName,
name(), StatusCode::FAILURE);
diff --git a/Control/StoreGate/share/ReadDecorHandleKeyArray_test.ref b/Control/StoreGate/share/ReadDecorHandleKeyArray_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..93ae16db3b25bd0a165cfe75afeec5865f51b99a
--- /dev/null
+++ b/Control/StoreGate/share/ReadDecorHandleKeyArray_test.ref
@@ -0,0 +1,16 @@
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Fri Dec 7 09:49:25 2018
+====================================================================================================================================
+ApplicationMgr INFO Application Manager Configured successfully
+EventLoopMgr WARNING Unable to locate service "EventSelector"
+EventLoopMgr WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+ClassIDSvc INFO getRegistryEntries: read 644 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1065 CLIDRegistry entries for module ALL
+test1a
+test2
diff --git a/Control/StoreGate/share/WriteDecorHandleKeyArray_test.ref b/Control/StoreGate/share/WriteDecorHandleKeyArray_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..c4571d53fdbe77d9ba8e8367996cbb43e6882d97
--- /dev/null
+++ b/Control/StoreGate/share/WriteDecorHandleKeyArray_test.ref
@@ -0,0 +1,16 @@
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Fri Dec 7 09:50:50 2018
+====================================================================================================================================
+ApplicationMgr INFO Application Manager Configured successfully
+EventLoopMgr WARNING Unable to locate service "EventSelector"
+EventLoopMgr WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+ClassIDSvc INFO getRegistryEntries: read 644 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1065 CLIDRegistry entries for module ALL
+test1a
+test2
diff --git a/Event/EventInfo/EventInfo/EventIncident.h b/Event/EventInfo/EventInfo/EventIncident.h
index 946013b5d4a25fba0eea006344e1688b05310769..882b0c3d9960f0dac296e5931cac631ce272898f 100755
--- a/Event/EventInfo/EventInfo/EventIncident.h
+++ b/Event/EventInfo/EventInfo/EventIncident.h
@@ -23,10 +23,6 @@
#include "GaudiKernel/EventContext.h"
-//<<<<<< FORWARD DECLS >>>>>>
-
-class EventInfo;
-
//<<<<<< CLASS DECLARATIONS >>>>>>
/** @class EventIncident
@@ -40,38 +36,19 @@ public:
/// \name structors
//@{
/// standard constructor
- ///@param event the EventInfo of the event in question
///@param source the name of the service/algorithm firing
///@param type e.g. "BeginEvent"
- EventIncident(const EventInfo& event,
- const std::string& source,
- const std::string& type=std::string("BeginEvent"));
- EventIncident(const EventInfo& event,
- const std::string& source,
+ ///@param ctx event context
+ EventIncident(const std::string& source,
const std::string& type,
- EventContext& ctx);
+ const EventContext& ctx);
// Use default copy constructor.
virtual ~EventIncident();
//@}
- /// \name Event information accessors
- //@{
- ///the unique identification of the event.
- const EventInfo& eventInfo () const;
- //@}
-
private:
- const EventInfo& m_eventInfo;
};
-
-//<<<<<< INLINE PUBLIC FUNCTIONS >>>>>>
-//<<<<<< INLINE MEMBER FUNCTIONS >>>>>>
-inline const EventInfo&
-EventIncident::eventInfo () const
-{
- return m_eventInfo;
-}
#endif // EVENTINFO_EVENTINCIDENT_H
diff --git a/Event/EventInfo/src/EventIncident.cxx b/Event/EventInfo/src/EventIncident.cxx
index 1b1d3d05c0b76b8a0db3839b8a4445b32b720978..d9238da9961800e724420720c843a3ca1af2e222 100755
--- a/Event/EventInfo/src/EventIncident.cxx
+++ b/Event/EventInfo/src/EventIncident.cxx
@@ -11,15 +11,11 @@
*/
#include "EventInfo/EventIncident.h"
-EventIncident::EventIncident(const EventInfo& event,
- const std::string& source,
- const std::string& type) :
- Incident(source, type), m_eventInfo(event) {}
-
-EventIncident::EventIncident(const EventInfo& event,
- const std::string& source,
+EventIncident::EventIncident(const std::string& source,
const std::string& type,
- EventContext& ctx) :
- Incident(source, type, ctx), m_eventInfo(event) {}
+ const EventContext& ctx)
+ : Incident(source, type, ctx)
+{}
-EventIncident::~EventIncident() {}
+EventIncident::~EventIncident()
+{}
diff --git a/Event/EventInfoMgt/src/TagInfoMgr.cxx b/Event/EventInfoMgt/src/TagInfoMgr.cxx
index a70805983bc13226631eeb25f673b56180a72b0e..a920aacc1797f718b686c9ea0139be4c030301bf 100755
--- a/Event/EventInfoMgt/src/TagInfoMgr.cxx
+++ b/Event/EventInfoMgt/src/TagInfoMgr.cxx
@@ -18,7 +18,6 @@
#include "EventInfo/EventID.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventType.h"
-#include "EventInfo/EventIncident.h"
#include "EventInfo/TriggerInfo.h"
#include "EventInfoUtils/EventIDFromStore.h"
@@ -661,11 +660,11 @@ TagInfoMgr::handle(const Incident& inc) {
}
// Return quickly for BeginEvent if not needed
- if (!m_newFileIncidentSeen && inc.type() == "BeginEvent") return;
+ if (!m_newFileIncidentSeen && inc.type() == IncidentType::BeginEvent) return;
// At first BeginRun we retrieve TagInfo and trigger IOVDbSvc to
// use it
- if (inc.type() == "BeginRun" && m_isFirstBeginRun) {
+ if (inc.type() == IncidentType::BeginRun && m_isFirstBeginRun) {
// No longer first BeginRun
m_isFirstBeginRun = false;
@@ -674,39 +673,29 @@ TagInfoMgr::handle(const Incident& inc) {
m_newFileIncidentSeen = false;
// Print out EventInfo
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(!eventInc) {
- m_log << MSG::ERROR << "handle: Unable to get EventInfo from BeginRun incident" << endmsg;
- throw GaudiException( "Unable to get EventInfo from BeginRun incident", "TagInfoMgr::handle", StatusCode::FAILURE );
- }
- const EventInfo* evt = &eventInc->eventInfo();
+ const EventIDBase& eventID = inc.context().eventID();
+
if (m_log.level() <= MSG::DEBUG) {
m_log << MSG::DEBUG << "handle: BeginRun incident - Event info: " << endmsg;
m_log << MSG::DEBUG << "handle: Event ID: ["
- << evt->event_ID()->run_number() << ","
- << evt->event_ID()->event_number() << ":"
- << evt->event_ID()->time_stamp() << "] "
+ << eventID.run_number() << ","
+ << eventID.event_number() << ":"
+ << eventID.time_stamp() << "] "
<< endmsg;
- if (evt->event_type()) {
- m_log << MSG::DEBUG << evt->event_type()->typeToString() << endmsg;
- m_log << MSG::DEBUG << "handle: Event type: user type "
- << evt->event_type()->user_type()
- << endmsg;
- }
}
// For the moment, we must set IOVDbSvc into the BeginRun
// state to be able to access TagInfo from the file meta data
// create IOV time from current event coming in with BeginRun incident
- unsigned int run = evt->event_ID()->run_number();
- unsigned int lb = evt->event_ID()->lumi_block();
+ unsigned int run = eventID.run_number();
+ unsigned int lb = eventID.lumi_block();
IOVTime curTime;
curTime.setRunEvent(run, lb);
// save both seconds and ns offset for timestamp
- uint64_t nsTime = evt->event_ID()->time_stamp()*1000000000LL;
- nsTime += evt->event_ID()->time_stamp_ns_offset();
+ uint64_t nsTime = eventID.time_stamp()*1000000000LL;
+ nsTime += eventID.time_stamp_ns_offset();
curTime.setTimestamp(nsTime);
if (StatusCode::SUCCESS != m_iovDbSvc->signalBeginRun(curTime,
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.cxx b/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.cxx
index 6b9de94e2123ee4e89193423f5bc5f112daa8f21..940f1ada25425a57a88d60a181cbebdf34005c36 100644
--- a/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.cxx
+++ b/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.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
*/
// $Id: EventFormatSvc.cxx 777715 2016-10-11 16:35:49Z ssnyder $
@@ -108,12 +108,20 @@ namespace xAODMaker {
// Create the object if it doesn't exist yet:
if( ! m_ef ) {
m_ef = new xAOD::EventFormat();
- if( m_metaStore->record( m_ef, m_objectName ).isFailure() ) {
- REPORT_MESSAGE( MSG::ERROR )
- << "Couldn't record xAOD::EventFormat object into the "
- << "metadata store with key: " << m_objectName;
- delete m_ef; m_ef = 0;
- return;
+ if (!m_metaStore->contains(ClassID_traits<xAOD::EventFormat>::ID(),m_objectName ) ) {
+ if( m_metaStore->record( m_ef, m_objectName ).isFailure() ) {
+ REPORT_MESSAGE( MSG::ERROR )
+ << "Couldn't record xAOD::EventFormat object into the "
+ << "metadata store with key: " << m_objectName;
+ delete m_ef; m_ef = 0;
+ return;
+ }
+ } else {
+ StatusCode sc = m_metaStore->retrieve(m_ef,m_objectName);
+ if (sc.isFailure()) {
+ REPORT_MESSAGE( MSG::ERROR )
+ << "Couldn't retrieve xAOD::EventFormat object wit key: " << m_objectName;
+ }
}
}
diff --git a/Event/xAOD/xAODMuon/xAODMuon/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODMuon/xAODMuon/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..eca7757debe20660027ab5d078b3b79a8fb30df1
--- /dev/null
+++ b/Event/xAOD/xAODMuon/xAODMuon/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODMuon
diff --git a/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx b/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
index 8ee39d1a8cd33469b5e9feed65ced9fa32dba96d..eb161dca5bf8501d213b999fe975e0c6cc886bf8 100644
--- a/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
@@ -17,18 +17,12 @@
namespace xAOD {
NeutralParticle_v1::NeutralParticle_v1()
- : IParticle(), m_perigeeCached(false) {
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
- m_perigeeParameters=0;
-#endif // not XAOD_STANDALONE and not XAOD_MANACORE
+ : IParticle(){
}
NeutralParticle_v1::NeutralParticle_v1(const NeutralParticle_v1& tp )
- : IParticle( tp ), m_perigeeCached(tp.m_perigeeCached) {
+ : IParticle( tp ) {
makePrivateStore( tp );
- #if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
- m_perigeeParameters = tp.m_perigeeParameters;
- #endif // not XAOD_STANDALONE and not XAOD_MANACORE
}
NeutralParticle_v1& NeutralParticle_v1::operator=(const NeutralParticle_v1& tp ){
@@ -37,15 +31,12 @@ namespace xAOD {
if(!hasStore() ) makePrivateStore();
this->IParticle::operator=( tp );
#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
- m_perigeeParameters = tp.m_perigeeParameters;
+ m_perigeeParameters.reset();
#endif // not XAOD_STANDALONE and not XAOD_MANACORE
return *this;
}
NeutralParticle_v1::~NeutralParticle_v1(){
- #if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
- delete m_perigeeParameters;
- #endif // not XAOD_STANDALONE and not XAOD_MANACORE
}
double NeutralParticle_v1::pt() const {
@@ -116,10 +107,10 @@ namespace xAOD {
}
void NeutralParticle_v1::setDefiningParameters(float d0, float z0, float phi0, float theta, float oneOverP) {
- m_perigeeCached=false;
#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
- delete m_perigeeParameters;
- m_perigeeParameters=0;
+ if(m_perigeeParameters.isValid()) {
+ m_perigeeParameters.reset();
+ }
#endif // not XAOD_STANDALONE and not XAOD_MANACORE
static const Accessor< float > acc1( "d0" );
acc1( *this ) = d0;
@@ -140,10 +131,10 @@ namespace xAOD {
}
void NeutralParticle_v1::setDefiningParametersCovMatrix(const xAOD::ParametersCovMatrix_t& cov){
- m_perigeeCached=false;
#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
- delete m_perigeeParameters;
- m_perigeeParameters=0;
+ if(m_perigeeParameters.isValid()) {
+ m_perigeeParameters.reset();
+ }
#endif // not XAOD_STANDALONE and not XAOD_MANACORE
static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
@@ -160,9 +151,11 @@ namespace xAOD {
std::vector<float>::const_iterator it = v.begin();
xAOD::ParametersCovMatrix_t cov;
cov.setZero();
- for (size_t irow = 0; irow<5; ++irow)
- for (size_t icol =0; icol<=irow; ++icol)
+ for (size_t irow = 0; irow<5; ++irow){
+ for (size_t icol =0; icol<=irow; ++icol){
cov.fillSymmetric(icol,irow, *it++);
+ }
+ }
return cov;
}
@@ -193,7 +186,11 @@ namespace xAOD {
#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
const Trk::NeutralPerigee& NeutralParticle_v1::perigeeParameters() const {
-
+
+ // Require the cache to be valid and check if the cached pointer has been set
+ if(m_perigeeParameters.isValid()){
+ return *(m_perigeeParameters.ptr());
+ }
static const Accessor< float > acc1( "d0" );
static const Accessor< float > acc2( "z0" );
static const Accessor< float > acc3( "phi" );
@@ -203,12 +200,15 @@ namespace xAOD {
ParametersCovMatrix_t* cov = new ParametersCovMatrix_t;
cov->setZero();
auto it= acc6(*this).begin();
- for (size_t irow = 0; irow<5; ++irow)
- for (size_t icol =0; icol<=irow; ++icol)
+ for (size_t irow = 0; irow<5; ++irow){
+ for (size_t icol =0; icol<=irow; ++icol){
cov->fillSymmetric(irow,icol,*it++) ;
- m_perigeeParameters = new Trk::NeutralPerigee(acc1(*this),acc2(*this),acc3(*this),acc4(*this),acc5(*this),Trk::PerigeeSurface(Amg::Vector3D(vx(),vy(),vz())),cov);
- return *m_perigeeParameters;
-
+ }
+ }
+ Trk::NeutralPerigee tmpPerigeeParameters(acc1(*this),acc2(*this),acc3(*this),acc4(*this),acc5(*this),
+ Trk::PerigeeSurface(Amg::Vector3D(vx(),vy(),vz())),cov);
+ m_perigeeParameters.set(tmpPerigeeParameters);
+ return *(m_perigeeParameters.ptr());
}
#endif // not XAOD_STANDALONE and not XAOD_MANACORE
diff --git a/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx b/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
index d2a35ad677c37a7eb6a6ccd584b1492519b290d7..ea367f303b1880f26dd83bdd7e3785d77bb2ccec 100644
--- a/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
@@ -130,7 +130,9 @@ namespace xAOD {
void TrackParticle_v1::setDefiningParameters(float d0, float z0, float phi0, float theta, float qOverP) {
#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
// reset perigee cache if existing
- if(m_perigeeParameters.isValid()) m_perigeeParameters.reset();
+ if(m_perigeeParameters.isValid()) {
+ m_perigeeParameters.reset();
+ }
#endif // not XAOD_STANDALONE and not XAOD_MANACORE
static const Accessor< float > acc1( "d0" );
acc1( *this ) = d0;
@@ -153,7 +155,9 @@ namespace xAOD {
void TrackParticle_v1::setDefiningParametersCovMatrix(const xAOD::ParametersCovMatrix_t& cov){
#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
// reset perigee cache if existing
- if(m_perigeeParameters.isValid()) m_perigeeParameters.reset();
+ if(m_perigeeParameters.isValid()) {
+ m_perigeeParameters.reset();
+ }
#endif // not XAOD_STANDALONE and not XAOD_MANACORE
static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
@@ -199,11 +203,9 @@ namespace xAOD {
const Trk::Perigee& TrackParticle_v1::perigeeParameters() const {
// Require the cache to be valid and check if the cached pointer has been set
- if(m_perigeeParameters.isValid())
+ if(m_perigeeParameters.isValid()){
return *(m_perigeeParameters.ptr());
-
- // Perigee needs to be calculated, and cached
-
+ }
static const Accessor< float > acc1( "d0" );
static const Accessor< float > acc2( "z0" );
static const Accessor< float > acc3( "phi" );
@@ -211,11 +213,6 @@ namespace xAOD {
static const Accessor< float > acc5( "qOverP" );
static const Accessor< std::vector<float> > acc6( "definingParametersCovMatrix" );
ParametersCovMatrix_t* cov = new ParametersCovMatrix_t(definingParametersCovMatrix());
- // cov->setZero();
- // auto it= acc6(*this).begin();
- // for (size_t irow = 0; irow<5; ++irow)
- // for (size_t icol =0; icol<=irow; ++icol)
- // cov->fillSymmetric(irow,icol,*it++) ;
static const Accessor< float > acc7( "beamlineTiltX" );
static const Accessor< float > acc8( "beamlineTiltY" );
diff --git a/Event/xAOD/xAODTracking/xAODTracking/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODTracking/xAODTracking/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..0a35079152a1d24adbe469b97fa4f5be7719fc4b
--- /dev/null
+++ b/Event/xAOD/xAODTracking/xAODTracking/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODTracking
diff --git a/Event/xAOD/xAODTracking/xAODTracking/selection.xml b/Event/xAOD/xAODTracking/xAODTracking/selection.xml
index 71da7653240461ecef267d53c3c91e4df05acc10..7986838ee9cf763c51ad0d8af2df2034360e30a6 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/selection.xml
+++ b/Event/xAOD/xAODTracking/xAODTracking/selection.xml
@@ -72,17 +72,9 @@
<!-- NeutralParticle_v1 dictionaries: -->
<class name="xAOD::NeutralParticle_v1">
- <field name="m_perigeeCached" transient="true"/>
+ <field name="m_perigeeParameters" transient="true"/>
</class>
- <read sourceClass="xAOD::NeutralParticle_v1" version="[1-]"
- targetClass="xAOD::NeutralParticle_v1"
- source="" target="m_perigeeCached">
- <![CDATA[
- m_perigeeCached = false;
- ]]>
- </read>
-
<class name="xAOD::NeutralParticleAuxContainer_v1"
id="006862BC-5CEB-11E3-9FB4-02163E00A92F"/>
<class name="xAOD::NeutralParticleContainer_v1"
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
index 6ba2093461a7cd73ce6b6e3276c5a858e814181a..7440a222e0afc8bdb20c94a6b64e9953c9018652 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
@@ -1,12 +1,14 @@
// Dear emacs, this is -*- c++ -*-
/*
- 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 XAODTRACKING_VERSIONS_NEUTRALPARTICLE_V1_H
#define XAODTRACKING_VERSIONS_NEUTRALPARTICLE_V1_H
+#include "CxxUtils/CachedValue.h"
+
// Athena includes
#include "AthLinks/ElementLink.h"
#include "AthContainers/DataVector.h"
@@ -28,6 +30,7 @@
// ROOT include(s):
#include "Math/Vector4D.h"
+
namespace xAOD {
/// Class describing a NeutralParticle.
///
@@ -137,14 +140,10 @@ namespace xAOD {
// void setVertex(const ElementLink< VertexContainer >& vertex);
private:
- /// Set to false if anything related to the perigee was changed
- /// (and so it needs updating); *** NEEDS TO CHANGE FOR ATHENAMT ***
- mutable bool m_perigeeCached;
-
#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) ) && ( ! defined(__GCCXML__) ) && !defined(__CLING__)
/// @brief Cached NeutralPerigee, built from this object.
/// @note This is only available in Athena.
- mutable Trk::NeutralPerigee* m_perigeeParameters;
+ CxxUtils::CachedValue<Trk::NeutralPerigee> m_perigeeParameters;
#endif // not XAOD_STANDALONE and not XAOD_MANACORE and not __GCCXML__
}; // class NeutralParticle_v1
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h
index ae65a3130fd1f7de540efc5ab2caf8378cf40c2a..5666740134e35c9135b6af36525fd623aec265ce 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h
@@ -1,10 +1,9 @@
// Dear emacs, this is -*- 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
*/
-// $Id: TrackParticle_v1.h 576255 2013-12-19 12:54:41Z emoyse $
#ifndef XAODTRACKING_VERSIONS_TRACKPARTICLE_V1_H
#define XAODTRACKING_VERSIONS_TRACKPARTICLE_V1_H
diff --git a/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.cxx b/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.cxx
index 1117f20d53901f2e30ae23d333cb70c86a3ed71e..f1a8305ec9dd93277c5f3bec8ceb8e4247a731df 100644
--- a/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.cxx
+++ b/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.cxx
@@ -14,14 +14,14 @@
#define DEFINE_ACCESSOR( PARENT, TYPE, NAME ) \
case PARENT::NAME: \
{ \
- static SG::AuxElement::Accessor< TYPE > a( #NAME ); \
+ static const SG::AuxElement::Accessor< TYPE > a( #NAME ); \
return &a; \
} \
break
namespace xAOD {
- SG::AuxElement::Accessor< float >*
+ const SG::AuxElement::Accessor< float >*
polarizationAccessorV1( TruthParticle_v1::PolParam type ) {
switch( type ) {
@@ -38,7 +38,7 @@ namespace xAOD {
return 0;
}
- SG::AuxElement::Accessor< int >*
+ const SG::AuxElement::Accessor< int >*
pdfInfoAccessorV1Int( TruthEvent_v1::PdfParam type ) {
switch( type ) {
@@ -57,7 +57,7 @@ namespace xAOD {
return 0;
}
- SG::AuxElement::Accessor< float >*
+ const SG::AuxElement::Accessor< float >*
pdfInfoAccessorV1Float( TruthEvent_v1::PdfParam type ) {
switch( type ) {
@@ -77,7 +77,7 @@ namespace xAOD {
return 0;
}
- SG::AuxElement::Accessor< int >*
+ const SG::AuxElement::Accessor< int >*
heavyIonAccessorV1Int( TruthEvent_v1::HIParam type ) {
switch( type ) {
@@ -101,7 +101,7 @@ namespace xAOD {
return 0;
}
- SG::AuxElement::Accessor< float >*
+ const SG::AuxElement::Accessor< float >*
heavyIonAccessorV1Float( TruthEvent_v1::HIParam type ) {
switch( type ) {
diff --git a/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.h b/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.h
index 04d3a7d30b0bb469111ea04e44ca121db98a1faa..314c4de8f46022b8a8b68dec6daad13870d9f502 100644
--- a/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.h
+++ b/Event/xAOD/xAODTruth/Root/TruthAccessors_v1.h
@@ -20,23 +20,23 @@ namespace xAOD {
/// This function holds on to Accessor objects that can be used by each
/// TruthParticle_v1 object at runtime to get/set parameter values on
/// themselves.
- SG::AuxElement::Accessor< float >*
+ const SG::AuxElement::Accessor< float >*
polarizationAccessorV1( TruthParticle_v1::PolParam type );
/// Helper function for getting accessors for integer type PDF information
- SG::AuxElement::Accessor< int >*
+ const SG::AuxElement::Accessor< int >*
pdfInfoAccessorV1Int( TruthEvent_v1::PdfParam type );
/// Helper function for getting accessors for floating point PDF information
- SG::AuxElement::Accessor< float >*
+ const SG::AuxElement::Accessor< float >*
pdfInfoAccessorV1Float( TruthEvent_v1::PdfParam type );
/// Helper function for getting accessors for integer type HI information
- SG::AuxElement::Accessor< int >*
+ const SG::AuxElement::Accessor< int >*
heavyIonAccessorV1Int( TruthEvent_v1::HIParam type );
/// Helper function for getting accessors for floating point HI information
- SG::AuxElement::Accessor< float >*
+ const SG::AuxElement::Accessor< float >*
heavyIonAccessorV1Float( TruthEvent_v1::HIParam type );
} // namespace xAOD
diff --git a/Event/xAOD/xAODTruth/Root/TruthEventBase_v1.cxx b/Event/xAOD/xAODTruth/Root/TruthEventBase_v1.cxx
index 12a01d044147a7a0804c1bbf93a79107f0a403ec..ea69d8bb2b9e56fdf2cc02a57c686d0ce2905add 100644
--- a/Event/xAOD/xAODTruth/Root/TruthEventBase_v1.cxx
+++ b/Event/xAOD/xAODTruth/Root/TruthEventBase_v1.cxx
@@ -26,7 +26,7 @@ namespace xAOD {
setTruthParticleLinks )
/// Accessor for the truth particles
- static SG::AuxElement::Accessor< TruthEventBase_v1::TruthParticleLinks_t >
+ static const SG::AuxElement::Accessor< TruthEventBase_v1::TruthParticleLinks_t >
truthParticleLinksAcc( "truthParticleLinks" );
size_t TruthEventBase_v1::nTruthParticles() const {
@@ -88,7 +88,7 @@ namespace xAOD {
setTruthVertexLinks )
/// Accessor for the truth vertices
- static SG::AuxElement::Accessor< TruthEventBase_v1::TruthVertexLinks_t >
+ static const SG::AuxElement::Accessor< TruthEventBase_v1::TruthVertexLinks_t >
truthVertexLinksAcc( "truthVertexLinks" );
size_t TruthEventBase_v1::nTruthVertices() const {
diff --git a/Event/xAOD/xAODTruth/Root/TruthEvent_v1.cxx b/Event/xAOD/xAODTruth/Root/TruthEvent_v1.cxx
index 0c4e3e450fe1ac33e7ba1f4b9753ebee423b4bf9..f5bec633b8024527ad26136860326f71215e2050 100644
--- a/Event/xAOD/xAODTruth/Root/TruthEvent_v1.cxx
+++ b/Event/xAOD/xAODTruth/Root/TruthEvent_v1.cxx
@@ -189,7 +189,7 @@ namespace xAOD {
// Implementation for the links to truth particles/vertices
// Accessor for the signal vertex
- static SG::AuxElement::Accessor< TruthEvent_v1::TruthVertexLink_t >
+ static const SG::AuxElement::Accessor< TruthEvent_v1::TruthVertexLink_t >
signalProcessVertexLinkAcc( "signalProcessVertexLink" );
const TruthVertex* TruthEvent_v1::signalProcessVertex() const {
@@ -217,9 +217,9 @@ namespace xAOD {
setSignalProcessVertexLink )
// Accessors for the beam particles
- static SG::AuxElement::Accessor< TruthEvent_v1::TruthParticleLink_t >
+ static const SG::AuxElement::Accessor< TruthEvent_v1::TruthParticleLink_t >
beamParticle1LinkAcc( "beamParticle1Link" );
- static SG::AuxElement::Accessor< TruthEvent_v1::TruthParticleLink_t >
+ static const SG::AuxElement::Accessor< TruthEvent_v1::TruthParticleLink_t >
beamParticle2LinkAcc( "beamParticle2Link" );
std::pair< const TruthParticle*, const TruthParticle* >
diff --git a/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx b/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx
index 7f844faa2ae48043675d65309b428f2bf3a5e799..d3c2c1f30c67a6d1406bce46feb7108e4ba930aa 100644
--- a/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx
+++ b/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx
@@ -56,10 +56,10 @@ namespace xAOD {
//
/// Accessor for the production vertex
- static SG::AuxElement::Accessor< ElementLink< TruthVertexContainer > >
+ static const SG::AuxElement::Accessor< ElementLink< TruthVertexContainer > >
prodVtxLinkAcc( "prodVtxLink" );
/// Accessor for the decay vertex
- static SG::AuxElement::Accessor< ElementLink< TruthVertexContainer > >
+ static const SG::AuxElement::Accessor< ElementLink< TruthVertexContainer > >
decayVtxLinkAcc( "decayVtxLink" );
bool TruthParticle_v1::hasProdVtx() const {
@@ -198,13 +198,13 @@ namespace xAOD {
void TruthParticle_v1::setE( float value ) {
- static Accessor< float > acc( "e" );
+ static const Accessor< float > acc( "e" );
acc( *this ) = value;
return;
}
void TruthParticle_v1::setM( float value ) {
- static Accessor< float > acc( "m" );
+ static const Accessor< float > acc( "m" );
acc( *this ) = value;
return;
}
@@ -289,7 +289,7 @@ namespace xAOD {
PolParam param ) const {
// Get the accessor object:
- Accessor< float >* acc = polarizationAccessorV1( param );
+ const Accessor< float >* acc = polarizationAccessorV1( param );
if( ! acc ) {
// The user asked for a non-existent parameter type. o.O
std::cerr << "xAOD::TruthParticle_v1::polarizationParameter ERROR "
@@ -312,7 +312,7 @@ namespace xAOD {
PolParam param ) {
// Get the accessor object:
- Accessor< float >* acc = polarizationAccessorV1( param );
+ const Accessor< float >* acc = polarizationAccessorV1( param );
if( ! acc ) {
// The user asked for a non-existent parameter type. o.O
std::cerr << "xAOD::TruthParticle_v1::setPolarizationParameter ERROR "
@@ -329,7 +329,7 @@ namespace xAOD {
float TruthParticle_v1::polarizationPatameter( PolParam param ) const {
// Get the accessor object:
- Accessor< float >* acc = polarizationAccessorV1( param );
+ const Accessor< float >* acc = polarizationAccessorV1( param );
if( ! acc ) {
// Throw an exception:
throw std::runtime_error( "Unrecognized polarization parameter "
diff --git a/Event/xAOD/xAODTruth/Root/TruthVertex_v1.cxx b/Event/xAOD/xAODTruth/Root/TruthVertex_v1.cxx
index d4967bf9feeaad63e65fa9c12732d59a2abc7eb0..d908cd7215a9a72400b0d13985f52e13f9aa9389 100644
--- a/Event/xAOD/xAODTruth/Root/TruthVertex_v1.cxx
+++ b/Event/xAOD/xAODTruth/Root/TruthVertex_v1.cxx
@@ -43,7 +43,7 @@ namespace xAOD {
setIncomingParticleLinks )
/// Accessor for the incoming particles
- static SG::AuxElement::Accessor< TruthVertex_v1::TPLinks_t >
+ static const SG::AuxElement::Accessor< TruthVertex_v1::TPLinks_t >
incomingParticleLinksAcc( "incomingParticleLinks" );
size_t TruthVertex_v1::nIncomingParticles() const {
@@ -93,7 +93,7 @@ namespace xAOD {
setOutgoingParticleLinks )
/// Accessor for the outgoing particles
- static SG::AuxElement::Accessor< TruthVertex_v1::TPLinks_t >
+ static const SG::AuxElement::Accessor< TruthVertex_v1::TPLinks_t >
outgoingParticleLinksAcc( "outgoingParticleLinks" );
size_t TruthVertex_v1::nOutgoingParticles() const {
diff --git a/Event/xAOD/xAODTruth/Root/xAODTruthHelpers.cxx b/Event/xAOD/xAODTruth/Root/xAODTruthHelpers.cxx
index 3d00de95e602944a5a772eff2a659cb1f4afe9cf..36a231424a441e3f469bc303c735aa458a4fc6ed 100644
--- a/Event/xAOD/xAODTruth/Root/xAODTruthHelpers.cxx
+++ b/Event/xAOD/xAODTruth/Root/xAODTruthHelpers.cxx
@@ -30,7 +30,7 @@ namespace xAOD {
typedef ElementLink< xAOD::TruthParticleContainer > Link_t;
/// A static accessor for the information
- static SG::AuxElement::ConstAccessor< Link_t > acc( "truthParticleLink" );
+ static const SG::AuxElement::ConstAccessor< Link_t > acc( "truthParticleLink" );
// Check if such a link exists on the object:
if( ! acc.isAvailable( p ) ) {
@@ -56,7 +56,7 @@ namespace xAOD {
int getParticleTruthType( const xAOD::IParticle& p ) {
/// A static accessor for the information
- static SG::AuxElement::ConstAccessor< int > acc( "truthType" );
+ static const SG::AuxElement::ConstAccessor< int > acc( "truthType" );
// Check if such a variable exists on the object:
if( ! acc.isAvailable( p ) ) {
@@ -74,7 +74,7 @@ namespace xAOD {
int getParticleTruthOrigin( const xAOD::IParticle& p ) {
/// A static accessor for the information
- static SG::AuxElement::ConstAccessor< int > acc( "truthOrigin" );
+ static const SG::AuxElement::ConstAccessor< int > acc( "truthOrigin" );
// Check if such a variable exists on the object:
if( ! acc.isAvailable( p ) ) {
diff --git a/Event/xAOD/xAODTruth/xAODTruth/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODTruth/xAODTruth/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..fcc8f8bbaaec4a3a7ea89cde16cd9116468209c6
--- /dev/null
+++ b/Event/xAOD/xAODTruth/xAODTruth/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODTruth
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/CMakeLists.txt
index a608e6bc1abcd80c2da35e51ba24d67c04125233..71d46ff5a52f2c4ac1d8387f00e7791ac06f7654 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/CMakeLists.txt
@@ -18,7 +18,8 @@ atlas_depends_on_subdirs( PUBLIC
Trigger/TrigDataAccess/TrigDataAccessMonitoring
Trigger/TrigEvent/TrigSteeringEvent
Trigger/TrigT1/TrigT1Result
- Trigger/TrigSteer/DecisionHandling )
+ Trigger/TrigSteer/DecisionHandling
+ Trigger/TrigAlgorithms/TrigPartialEventBuilding )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
@@ -29,7 +30,10 @@ atlas_add_component( TrigExPartialEB
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps EventInfo GaudiKernel TrigROBDataProviderSvcLib AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib TrigDataAccessMonitoringLib TrigSteeringEvent TrigT1Result DecisionHandlingLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps EventInfo GaudiKernel
+ TrigROBDataProviderSvcLib AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib
+ TrigDataAccessMonitoringLib TrigSteeringEvent TrigT1Result DecisionHandlingLib
+ TrigPartialEventBuildingLib )
# Install files from the package:
atlas_install_headers( TrigExPartialEB )
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/share/MTCalibPeb.py b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/share/MTCalibPeb.py
index 8c2b30fa44a9f1a273bd27c14c08e7f420f97711..e3ada85d7d159ca8a8c64d11474b88ba3af7f8cc 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/share/MTCalibPeb.py
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/share/MTCalibPeb.py
@@ -57,6 +57,8 @@ hypoTool1 = MTCalibPebHypoTool("HLT_MTCalibPeb1")
hypoTool1.RandomAcceptRate = 0.75
hypoTool1.BurnTimePerCycleMillisec = 100
hypoTool1.NumBurnCycles = 3
+hypoTool1.PEBROBList = [0x42002a, 0x42002b] # example LAr EMBC ROBs
+hypoTool1.PEBSubDetList = [0x65, 0x66] # RPC A and C side
hypoTool2 = MTCalibPebHypoTool("HLT_MTCalibPeb2")
hypoTool2.RandomAcceptRate = 0.25
@@ -88,16 +90,17 @@ serialiser = TriggerEDMSerialiserTool()
serialiser.CollectionsToSerialize = ["xAOD::TrigCompositeContainer_v1#MTCalibPebDecisions",
"xAOD::TrigCompositeAuxContainer_v1#MTCalibPebDecisionsAux."]
+# StreamTag definitions
+streamExamplePEB = ['ExamplePEB', 'calibration', "True", "False"]
+streamPhysicsMain = ['Main', 'physics', "True", "True"]
+
# Tool adding stream tags to HLT result
stmaker = StreamTagMakerTool()
stmaker.ChainDecisions = "HLTSummary"
+stmaker.PEBDecisionKeys = [hypo.HypoOutputDecisions]
stmaker.ChainToStream = {}
-stmaker.ChainToStream["HLT_MTCalibPeb1"] = "DataScouting_05_Jets"
-stmaker.ChainToStream["HLT_MTCalibPeb2"] = "Main"
-stmaker.StreamSubDets = {}
-stmaker.StreamSubDets["Main"] = [0x41, 0x42]
-stmaker.StreamRobs = {}
-stmaker.StreamRobs["Main"] = [0x42002e, 0x420060, 0x420064]
+stmaker.ChainToStream["HLT_MTCalibPeb1"] = streamExamplePEB
+stmaker.ChainToStream["HLT_MTCalibPeb2"] = streamPhysicsMain
# Tool adding HLT bits to HLT result
bitsmaker = TriggerBitsMakerTool()
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.cxx
index 8f2dee375d82cc47f4222d4bf9117eaa1927c67b..4f79031144d2fd9ffbdfe390cd86e39c5c5d7ade 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.cxx
@@ -4,6 +4,7 @@
// Trigger includes
#include "MTCalibPebHypoTool.h"
+#include "TrigPartialEventBuilding/PEBInfoWriterToolBase.h" // Defines the PEBInfo keys expected by StreamTagMakerTool
// Athena includes
#include "AthenaKernel/Timeout.h"
@@ -44,13 +45,41 @@ namespace {
}
return str;
}
- /// ROB ID vector print helper
- std::string robIdVecToString(const std::vector<uint32_t>& robIdVec) {
+ /// Print helper for a container with ROB/SubDet IDs
+ template<typename Container>
+ std::string idsToString(const Container& ids) {
std::ostringstream str;
- for (const uint32_t robId : robIdVec)
- str << "0x" << std::hex << robId << std::dec << " ";
+ for (const uint32_t id : ids)
+ str << "0x" << std::hex << id << std::dec << " ";
return str.str();
}
+ /// Append PEB information to the Decision object
+ StatusCode appendPEBInfo(TrigCompositeUtils::Decision* decision,
+ std::set<uint32_t> robIDsToAdd,
+ std::set<uint32_t> subDetIDsToAdd) {
+ // Merge with previous ROBs
+ std::vector<uint32_t> previousRobs;
+ if (decision->getDetail(PEBInfoWriterToolBase::robListKey(), previousRobs)) {
+ robIDsToAdd.insert(previousRobs.begin(), previousRobs.end());
+ }
+
+ // Merge with previous SubDets
+ std::vector<uint32_t> previousSubDets;
+ if (decision->getDetail(PEBInfoWriterToolBase::subDetListKey(), previousSubDets)) {
+ subDetIDsToAdd.insert(previousSubDets.begin(), previousSubDets.end());
+ }
+
+ // Attach the PEB Info to the decision
+ std::vector<uint32_t> robVec(robIDsToAdd.begin(), robIDsToAdd.end());
+ if (not decision->setDetail(PEBInfoWriterToolBase::robListKey(), robVec)) {
+ return StatusCode::FAILURE;
+ }
+ std::vector<uint32_t> subDetVec(subDetIDsToAdd.begin(), subDetIDsToAdd.end());
+ if (not decision->setDetail(PEBInfoWriterToolBase::subDetListKey(), subDetVec)) {
+ return StatusCode::FAILURE;
+ }
+ return StatusCode::SUCCESS;
+ }
}
// =============================================================================
@@ -119,12 +148,12 @@ StatusCode MTCalibPebHypoTool::decide(const MTCalibPebHypoTool::Input& input) co
const std::vector<uint32_t>& robs = p.second;
if (instruction.find(":ADD:")!=std::string::npos) {
// Prefetch ROBs
- ATH_MSG_DEBUG("Preloading ROBs: " << robIdVecToString(robs));
+ ATH_MSG_DEBUG("Preloading ROBs: " << idsToString(robs));
m_robDataProviderSvc->addROBData(input.eventContext, robs, name()+"-ADD");
}
if (instruction.find(":GET:")!=std::string::npos) {
// Retrieve ROBs
- ATH_MSG_DEBUG("Retrieving ROBs: " << robIdVecToString(robs));
+ ATH_MSG_DEBUG("Retrieving ROBs: " << idsToString(robs));
// VROBFRAG = std::vector<const eformat::ROBFragment<const uint32_t*>* >
IROBDataProviderSvc::VROBFRAG robFragments;
m_robDataProviderSvc->getROBData(input.eventContext, robs, robFragments, name()+"-GET");
@@ -142,15 +171,24 @@ StatusCode MTCalibPebHypoTool::decide(const MTCalibPebHypoTool::Input& input) co
}
// ---------------------------------------------------------------------------
- // Random accept decision
+ // Random accept decision with PEB information
// ---------------------------------------------------------------------------
bool accept = randomAccept(m_acceptRate);
- if (accept) {
- ATH_MSG_DEBUG("Decision " << m_decisionId << " is accept");
- TrigCompositeUtils::addDecisionID(m_decisionId, input.decision);
+ if(!accept) {
+ ATH_MSG_DEBUG("Decision " << m_decisionId << " is reject");
+ return StatusCode::SUCCESS;
+ }
+
+ ATH_MSG_DEBUG("Decision " << m_decisionId << " is accept");
+ TrigCompositeUtils::addDecisionID(m_decisionId, input.decision);
+
+ if (m_pebRobList.empty() && m_pebSubDetList.empty()) {
+ ATH_MSG_VERBOSE("Not configured to write any PEBInfo, nothing will be attached to the decision");
}
else {
- ATH_MSG_DEBUG("Decision " << m_decisionId << " is reject");
+ ATH_MSG_DEBUG("Attaching ROBs=[" << idsToString(m_pebRobList) << "] and SubDets=["
+ << idsToString(m_pebSubDetList) << "] to the decision object");
+ ATH_CHECK(appendPEBInfo(input.decision,m_pebRobList,m_pebSubDetList));
}
return StatusCode::SUCCESS;
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.h b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.h
index a511a354cd568f4143eb8b3904b7fee0c4a32ad8..416b4f300f38616c9e397182d671daf51ceac158 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.h
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoTool.h
@@ -16,9 +16,6 @@
// Gaudi includes
#include "Gaudi/Parsers/Factory.h" // needed to declare less common Property types
-// TDAQ includes
-#include "eformat/StreamTag.h"
-
/** @class MTCalibPebHypoTool
* @brief Base class for tools used by MTCalibPebHypoAlg
**/
@@ -77,6 +74,14 @@ private:
this, "TimeBetweenROBReqMillisec", 0,
"Delay in milliseconds between subsequent ROB request operations from ROBAccessDict"
};
+ Gaudi::Property<std::set<uint32_t> > m_pebRobList {
+ this, "PEBROBList", {},
+ "The list of ROBs to add for partial event building in each passed event"
+ };
+ Gaudi::Property<std::set<uint32_t> > m_pebSubDetList {
+ this, "PEBSubDetList", {},
+ "The list of SubDets to add for partial event building in each passed event"
+ };
// ------------------------- Service or tool handles -------------------------
ServiceHandle<IROBDataProviderSvc> m_robDataProviderSvc;
@@ -84,8 +89,6 @@ private:
// ------------------------- Other private members ---------------------------
/// The decision id of the tool instance
HLT::Identifier m_decisionId;
- /// The ConfiguredStreamTags property converted to vector of eformat stream tags
- std::vector<eformat::helper::StreamTag> m_configuredStreamTags;
};
#endif // TRIGEXPARTIALEB_MTCALIBPEBHYPOTOOL_H
diff --git a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/HltPscErrorCode.h b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/HltPscErrorCode.h
index bb14aa33659a6401c4408d5452124a2fd0261886..de33953d961900e37c478b84949f8565aba58cd1 100644
--- a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/HltPscErrorCode.h
+++ b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/HltPscErrorCode.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 PscErrorCode_H
@@ -21,7 +21,8 @@ namespace hltonl {
NO_HLT_RESULT = 7,
OUTPUT_BUILD_FAILURE = 8,
OUTPUT_SEND_FAILURE = 9,
- AFTER_RESULT_SENT = 10
+ AFTER_RESULT_SENT = 10,
+ COOL_UPDATE = 11
};
/// helper class to map HLT PSC error code on a string name or a int index
@@ -48,6 +49,7 @@ inline hltonl::MapPscErrorCode::MapPscErrorCode() {
add(hltonl::PSCErrorCode::OUTPUT_BUILD_FAILURE, "PSCErrorCode::OUTPUT_BUILD_FAILURE");
add(hltonl::PSCErrorCode::OUTPUT_SEND_FAILURE, "PSCErrorCode::OUTPUT_SEND_FAILURE");
add(hltonl::PSCErrorCode::AFTER_RESULT_SENT, "PSCErrorCode::AFTER_RESULT_SENT");
+ add(hltonl::PSCErrorCode::COOL_UPDATE, "PSCErrorCode::COOL_UPDATE");
// return values in case of invalid code
invalidCode("UNDEFINED",-1);
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
index 00bf3e641e139d4d1da159d2c11637ae2669607c..d911cb015bfb2682f5517c1a89c0d0fcf1f46112 100644
--- a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
@@ -24,9 +24,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Database/AthenaPOOL/AthenaPoolUtilities
Trigger/TrigConfiguration/TrigConfInterfaces
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigMonitoring/TrigMonitorBase
- Trigger/TrigSteer/TrigInterfaces
Trigger/TrigSteer/TrigOutputHandling )
# External dependencies:
@@ -42,13 +39,11 @@ atlas_add_library( TrigServicesLib
PUBLIC_HEADERS TrigServices
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${TDAQ_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcLib ByteStreamData EventInfo xAODEventInfo GaudiKernel TrigKernel TrigSteeringEvent StoreGateLib SGtests ByteStreamCnvSvcBaseLib ByteStreamData_test TrigDataAccessMonitoringLib TrigROBDataProviderSvcLib TrigNavigationLib TrigMonitorBaseLib TrigInterfacesLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaPoolUtilities TrigOutputHandlingLib )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities ByteStreamCnvSvcLib ByteStreamData EventInfo xAODEventInfo GaudiKernel TrigKernel TrigSteeringEvent StoreGateLib SGtests ByteStreamCnvSvcBaseLib ByteStreamData_test TrigDataAccessMonitoringLib TrigROBDataProviderSvcLib TrigOutputHandlingLib )
atlas_add_component( TrigServices
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${TDAQ_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test EventInfo xAODEventInfo GaudiKernel TrigKernel TrigDataAccessMonitoringLib TrigROBDataProviderSvcLib TrigSteeringEvent AthenaPoolUtilities TrigNavigationLib TrigMonitorBaseLib TrigInterfacesLib TrigServicesLib TrigOutputHandlingLib )
+ LINK_LIBRARIES TrigServicesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/HLT/Trigger/TrigControl/TrigServices/TrigServices/HltEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigServices/TrigServices/HltEventLoopMgr.h
index d377f6c1df3be26f5db19179b0387abf69283577..f00256313b34788aa1bd5eeffc22c04be1f32fac 100644
--- a/HLT/Trigger/TrigControl/TrigServices/TrigServices/HltEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigServices/TrigServices/HltEventLoopMgr.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 TRIGSERVICES_HLTEVENTLOOPMGR_H
@@ -74,7 +74,6 @@ public:
/// @name Gaudi state transitions (overriden from AthService)
///@{
virtual StatusCode initialize() override;
- virtual StatusCode start() override;
virtual StatusCode stop() override;
virtual StatusCode finalize() override;
virtual StatusCode reinitialize() override;
@@ -124,7 +123,7 @@ private:
void updateDFProps();
/// Do whatever is necessary with RunParams (prepare) ptree
- const CondAttrListCollection* processRunParams(const boost::property_tree::ptree& pt);
+ StatusCode processRunParams(const boost::property_tree::ptree& pt);
// Update internally kept data from new sor
void updateInternal(const coral::AttributeList & sor_attrlist);
@@ -139,7 +138,7 @@ private:
void updateDetMask(const std::pair<uint64_t, uint64_t>& dm);
/// Extract the single attr list off the SOR CondAttrListCollection
- const coral::AttributeList& getSorAttrList(const CondAttrListCollection* sor) const;
+ const coral::AttributeList& getSorAttrList() const;
/// Print the SOR record
void printSORAttrList(const coral::AttributeList& atr) const;
@@ -234,6 +233,8 @@ private:
SG::ReadHandleKey<EventInfo> m_eventInfoRHKey;
/// StoreGate key for reading the HLT result
SG::ReadHandleKey<HLT::HLTResultMT> m_hltResultRHKey;
+ /// Path to SOR parameters
+ StringProperty m_sorPath;
// ------------------------- Other private members ---------------------------
/// typedef used for detector mask fields
@@ -244,8 +245,8 @@ private:
*/
std::tuple<numt, numt, numt, numt> m_detector_mask;
- /// Current run number
- EventID::number_type m_currentRun{0};
+ /// "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;
/// Current run number
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
index 7310787a91719c26ac42f59ddacb6ad9b42fd7a1..ab121e6cb5fa9c30003b50ab380385ba246b63d3 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# @file: TrigServicesConfig.py
# @purpose: customized configurables
@@ -10,6 +10,12 @@ class TrigCOOLUpdateHelper(_TrigCOOLUpdateHelper):
def __init__(self, name='TrigCOOLUpdateHelper'):
super(TrigCOOLUpdateHelper, self).__init__(name)
+
+ from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool
+ self.MonTool = GenericMonitoringTool('MonTool')
+ self.MonTool.defineHistogram('TIME_CoolFolderUpdate', path='EXPERT', type='TH1F',
+ title='Time for conditions update;time [ms]',
+ xbins=100, xmin=0, xmax=200)
return
def enable(self, folder='/TRIGGER/HLT/COOLUPDATE', tag=None):
@@ -20,7 +26,7 @@ class TrigCOOLUpdateHelper(_TrigCOOLUpdateHelper):
self.coolFolder = folder
from IOVDbSvc.CondDB import conddb
- if tag==None:
+ if tag is None:
conddb.addFolder('TRIGGER',self.coolFolder)
else:
conddb.addFolderWithTag('TRIGGER',self.coolFolder,tag)
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
index 6b48f061cccec9f6f283ce12dee5049306be2e6b..edee483270a46d0448bec4ece286421f975e8f14 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
## @file TriggerUnixStandardSetup.py
## @brief py-module to configure the Athena AppMgr for trigger
@@ -106,8 +106,8 @@ def setupCommonServices():
svcMgr += CfgMgr.IOVSvc()
# Configure COOL update helper tool
- # from TrigServices.TrigServicesConfig import TrigCOOLUpdateHelper
- # _eventLoopMgr(svcMgr).CoolUpdateTool = TrigCOOLUpdateHelper()
+ from TrigServices.TrigServicesConfig import TrigCOOLUpdateHelper
+ svcMgr.HltEventLoopMgr.CoolUpdateTool = TrigCOOLUpdateHelper()
# Setup online THistSvc unless specifically configured otherwise
if _Conf.useOnlineTHistSvc:
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
index 337f8973620300b7080f04f96c8eb908678862d3..564a9ee4361d2a8bf7d68a87690711154fad9c0a 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
@@ -69,7 +69,6 @@
#define HLT_DRAINSCHED_CHECK(scexpr,errmsg,errcode,evctx) \
HLT_LOOP_CHECK(scexpr,errmsg,errcode,evctx,DrainSchedulerStatusCode::FAILURE)
using namespace boost::property_tree;
-using SOR = TrigSORFromPtreeHelper::SOR;
// =============================================================================
// Standard constructor
@@ -122,6 +121,8 @@ HltEventLoopMgr::HltEventLoopMgr(const std::string& name, ISvcLocator* svcLoc)
declareProperty("AlgErrorDebugStreamName", m_algErrorDebugStreamName="HLTError");
declareProperty("EventContextWHKey", m_eventContextWHKey="EventContext");
declareProperty("EventInfoRHKey", m_eventInfoRHKey="ByteStreamEventInfo");
+ declareProperty("SORPath", m_sorPath="/TDAQ/RunCtrl/SOR_Params",
+ "Path to StartOfRun parameters in detector store");
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
}
@@ -307,30 +308,18 @@ StatusCode HltEventLoopMgr::initialize()
return StatusCode::SUCCESS;
}
-// =============================================================================
-// Reimplementation of AthService::start (IStateful interface)
-// =============================================================================
-StatusCode HltEventLoopMgr::start()
-{
- ATH_CHECK(AthService::start());
-
- // start top level algorithms
- for (auto& ita : m_topAlgList) {
- ATH_CHECK(ita->sysStart());
- }
- return StatusCode::SUCCESS;
-}
// =============================================================================
// Reimplementation of AthService::stop (IStateful interface)
// =============================================================================
StatusCode HltEventLoopMgr::stop()
{
+ // temporary: endRun will eventually be deprecated
+ for (auto& ita : m_topAlgList) ATH_CHECK(ita->sysEndRun());
+
// Stop top level algorithms
- for (auto& ita : m_topAlgList) {
- ATH_CHECK(ita->sysStop());
- }
+ for (auto& ita : m_topAlgList) ATH_CHECK(ita->sysStop());
return AthService::stop();
}
@@ -468,42 +457,49 @@ StatusCode HltEventLoopMgr::restart()
StatusCode HltEventLoopMgr::prepareForRun(const ptree& pt)
{
ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+
try
{
// (void)TClass::GetClass("vector<unsigned short>"); // preload to overcome an issue with dangling references in serialization
// (void)TClass::GetClass("vector<unsigned long>");
// do the necessary resets
- // internalPrepareResets() was here
ATH_CHECK(clearTemporaryStores());
- const SOR* sor;
- // update SOR in det store and get it back
- if(!(sor = processRunParams(pt)))
- return StatusCode::FAILURE;
+ // update SOR in det store
+ ATH_CHECK( processRunParams(pt) );
- auto& soral = getSorAttrList(sor);
+ auto& soral = getSorAttrList();
- updateInternal(soral); // update internally kept info
+ updateInternal(soral); // update internally kept info
updateMetadataStore(soral); // update metadata store
- /*
+ /* Old code: kept for reference for the moment
const EventInfo * evinfo;
if(updMagField(pt).isFailure() || // update mag field when appropriate
updHLTConfigSvc().isFailure() || // update config svc when appropriate
- resetCoolValidity().isFailure() || // reset selected proxies/IOV folders
prepXAODEventInfo().isFailure() || // update xAOD event data in SG
!(evinfo = prepEventInfo())) // update old event data in SG
return StatusCode::FAILURE;
bookAllHistograms();
-
- ATH_MSG_VERBOSE("end of " << __FUNCTION__);
- if(prepareAlgs(*evinfo).isSuccess())
- return StatusCode::SUCCESS;
*/
- ATH_CHECK(m_ioCompMgr->io_finalize()); // close any open files (e.g. THistSvc)
+ // start top level algorithms
+ for (auto& ita : m_topAlgList) {
+ ATH_CHECK(ita->sysStart());
+ }
+
+ m_incidentSvc->fireIncident(Incident(name(), IncidentType::BeginRun, m_currentRunCtx));
+
+ for (auto& ita : m_topAlgList) {
+ ATH_CHECK(ita->sysBeginRun()); // TEMPORARY: beginRun is deprecated
+ }
+ // Initialize COOL helper (needs to be done after IOVDbSvc has loaded all folders)
+ m_coolHelper->readFolderInfo();
+
+ // close any open files (e.g. THistSvc)
+ ATH_CHECK(m_ioCompMgr->io_finalize());
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
return StatusCode::SUCCESS;
@@ -628,6 +624,8 @@ StatusCode HltEventLoopMgr::nextEvent(int /*maxevt*/)
ATH_MSG_VERBOSE("start of " << __FUNCTION__);
ATH_MSG_INFO("Starting loop on events");
+
+ EventID::number_type maxLB = 0; // Max lumiblock number we have seen
bool loop_ended = false;
bool events_available = true; // DataCollector has more events
@@ -665,7 +663,8 @@ StatusCode HltEventLoopMgr::nextEvent(int /*maxevt*/)
// for the EventContext using the EventContext itself. The handle will use the linked hiveProxyDict to record
// the context in the current store.
auto eventContextPtr = std::make_unique<EventContext>(m_localEventNumber, slot);
- eventContextPtr->setExtension( Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(), m_currentRun) );
+ eventContextPtr->setExtension( Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(),
+ m_currentRunCtx.eventID().run_number()) );
auto eventContext = SG::makeHandle(m_eventContextWHKey,*eventContextPtr);
HLT_EVTLOOP_CHECK(eventContext.record(std::move(eventContextPtr)),
"Failed to record new EventContext in the event store",
@@ -748,6 +747,20 @@ StatusCode HltEventLoopMgr::nextEvent(int /*maxevt*/)
// Update thread-local EventContext after setting EventID
Gaudi::Hive::setCurrentContext(*eventContext);
+ //-----------------------------------------------------------------------
+ // COOL updates for LB changes
+ //-----------------------------------------------------------------------
+ // Schedule COOL folder updates based on CTP fragment
+ HLT_EVTLOOP_CHECK(m_coolHelper->scheduleFolderUpdates(*eventContext), "Failure reading CTP extra payload",
+ hltonl::PSCErrorCode::COOL_UPDATE, *eventContext);
+
+ // Do an update if this is a new LB
+ if ( maxLB < eventContext->eventID().lumi_block() ) {
+ maxLB = eventContext->eventID().lumi_block();
+ HLT_EVTLOOP_CHECK(m_coolHelper->hltCoolUpdate(*eventContext), "Failure during COOL update",
+ hltonl::PSCErrorCode::COOL_UPDATE, *eventContext);
+ }
+
//------------------------------------------------------------------------
// Process the event
//------------------------------------------------------------------------
@@ -881,25 +894,23 @@ void HltEventLoopMgr::updateDFProps()
}
// =============================================================================
-const SOR* HltEventLoopMgr::processRunParams(const ptree & pt)
+StatusCode HltEventLoopMgr::processRunParams(const ptree & pt)
{
ATH_MSG_VERBOSE("start of " << __FUNCTION__);
- // update the run number
- m_currentRun = pt.get<uint32_t>("RunParams.run_number");
-
- // need to provide an event context extended with a run number, down the line passed to IOVDBSvc::signalBeginRun
- EventContext runStartEventContext = {}; // with invalid evt number and slot number
- runStartEventContext.setExtension(Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(), m_currentRun));
-
- // Fill SOR parameters from the ptree
- TrigSORFromPtreeHelper sorhelp{msgStream()};
- const SOR* sor = sorhelp.fillSOR(pt.get_child("RunParams"),runStartEventContext);
- if(!sor) {
- ATH_REPORT_MESSAGE(MSG::ERROR) << "setup of SOR from ptree failed";
- }
+
+ TrigSORFromPtreeHelper sorhelp(msgSvc(), m_detectorStore, m_sorPath);
+ const auto& rparams = pt.get_child("RunParams");
+
+ // Set our "run context" (invalid event/slot)
+ m_currentRunCtx.setEventID( sorhelp.eventID(rparams) );
+ m_currentRunCtx.setExtension(Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(),
+ m_currentRunCtx.eventID().run_number()));
+
+ // Fill SOR parameters from ptree and inform IOVDbSvc
+ ATH_CHECK( sorhelp.fillSOR(rparams, m_currentRunCtx) );
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
- return sor;
+ return StatusCode::SUCCESS;
}
// =============================================================================
@@ -993,15 +1004,18 @@ void HltEventLoopMgr::updateDetMask(const std::pair<uint64_t, uint64_t>& dm)
}
// =============================================================================
-const coral::AttributeList& HltEventLoopMgr::getSorAttrList(const SOR* sor) const
+const coral::AttributeList& HltEventLoopMgr::getSorAttrList() const
{
+ auto sor = m_detectorStore->retrieve<const TrigSORFromPtreeHelper::SOR>(m_sorPath);
+ if (sor==nullptr) {
+ throw std::runtime_error("Cannot retrieve " + m_sorPath);
+ }
if(sor->size() != 1)
{
// This branch should never be entered (the CondAttrListCollection
// corresponding to the SOR should contain one single AttrList). Since
// that's required by code ahead but not checked at compile time, we
// explicitly guard against any potential future mistake with this check
- ATH_REPORT_MESSAGE(MSG::ERROR) << "Wrong SOR: size = " << sor->size();
throw std::runtime_error("SOR record should have one and one only attribute list, but it has " + sor->size());
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx
index 9d632e7cd024beb19559d5ed672a578fb56134f7..5a82176af15cb3db70167df50f2b06a27b41d279 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx
@@ -1,42 +1,27 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file TrigCOOLUpdateHelper.h
* @brief Helper tool for COOL updates
* @author Frank Winklmeier
- *
- * $Id: TrigCOOLUpdateHelper.cxx 666321 2015-05-11 17:32:34Z fwinkl $
*/
#include "TrigCOOLUpdateHelper.h"
-#include "TrigServices/TrigHLTIssues.h"
-
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/ITHistSvc.h"
-
#include "AthenaKernel/errorcheck.h"
#include "AthenaKernel/IIOVDbSvc.h"
#include "AthenaKernel/IIOVSvc.h"
#include "AthenaKernel/IOVTime.h"
#include "AthenaKernel/IOVRange.h"
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventType.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-
#include "CoralBase/AttributeListException.h"
-#include "TH1F.h"
-
-#include <boost/foreach.hpp>
-#include <boost/algorithm/string.hpp>
-
-using namespace std;
-
+// TDAQ includes
+#include "CTPfragment/CTPfragment.h"
+#include "CTPfragment/CTPExtraWordsFormat.h"
+#include "CTPfragment/Issue.h"
//=========================================================================
// Standard methods
@@ -45,75 +30,32 @@ TrigCOOLUpdateHelper::TrigCOOLUpdateHelper(const std::string &type,
const std::string &name,
const IInterface *parent)
: AthAlgTool(type, name, parent),
- m_iovSvc(0),
- m_iovDbSvc(0),
- m_incidentSvc("IncidentSvc", name),
- m_hist_timeCondUpdate(0)
-{
- // No abstract interface
- declareInterface<TrigCOOLUpdateHelper>(this);
-
- declareProperty("coolFolder", m_coolFolderName = "", "Name of COOL folder containing folder map");
- declareProperty("foldersToResetOnBeginRun", m_beginRunFolders, "COOL folders to reset at beginning of run");
-}
-
+ m_robDataProviderSvc("ROBDataProviderSvc", name)
+{}
TrigCOOLUpdateHelper::~TrigCOOLUpdateHelper()
{}
-
StatusCode TrigCOOLUpdateHelper::initialize()
{
// Do not create these services if they are not available already
service("IOVSvc", m_iovSvc, /*createIf=*/false).ignore();
service("IOVDbSvc", m_iovDbSvc, /*createIf=*/false).ignore();
- CHECK( m_incidentSvc.retrieve() );
-
- ATH_MSG_INFO(" ---> foldersToResetOnBeginRun = ["
- << boost::algorithm::join(m_beginRunFolders, ",") << "]");
-
// Register DataHandle with COOLUPDATE folder
if (!m_coolFolderName.empty()) {
- CHECK( detStore()->regHandle(m_folderMapHandle, m_coolFolderName) );
+ ATH_CHECK( detStore()->regHandle(m_folderMapHandle, m_coolFolderName) );
}
- // Register incident listener
- m_incidentSvc->addListener(this, "EndOfBeginRun");
-
+ if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
+
return StatusCode::SUCCESS;
}
StatusCode TrigCOOLUpdateHelper::start()
{
- m_folderInfo.clear();
-
- // Book histograms
- ServiceHandle<ITHistSvc> histSvc("THistSvc",name());
- if ( histSvc.retrieve().isFailure() ) {
- ATH_MSG_ERROR("Histogram service can not be retrieved");
- return StatusCode::FAILURE;
- }
-
- m_hist_timeCondUpdate = new TH1F("CoolFolderUpdateTime",
- "Time for conditions update;time [ms]",
- 100, 0, 200);
-
- // monitoring information root directory
- string histPath = string("/EXPERT/");
-
- const INamedInterface* p_parent = dynamic_cast<const INamedInterface*>(parent());
- if (p_parent != 0) {
- histPath = histPath + p_parent->name() + string("/");
- } else {
- histPath = histPath + name() + string("/");
- }
- if ( (histSvc->regHist(histPath + m_hist_timeCondUpdate->GetName(), m_hist_timeCondUpdate)).isFailure() ) {
- ATH_MSG_ERROR("Registration of histogram '" << (histPath + m_hist_timeCondUpdate->GetName()) << "' failed.");
- return StatusCode::FAILURE;
- }
-
+ m_folderUpdates.clear();
return StatusCode::SUCCESS;
}
@@ -131,27 +73,6 @@ StatusCode TrigCOOLUpdateHelper::stop()
return StatusCode::SUCCESS;
}
-void TrigCOOLUpdateHelper::handle(const Incident&)
-{
- m_folderUpdates.clear();
-
- // Triggered on EndOfBeginRun, i.e. when all folders are available
- readFolderInfo();
- if (m_coolFolderName.empty()) return;
-
- if (!m_folderMapHandle.isInitialized()) {
- ATH_MSG_ERROR("DataHandle for '" << m_coolFolderName << "' not initialized.");
- }
- else {
- ATH_MSG_INFO("COOL folder map in " << m_coolFolderName << ":");
- for (CondAttrListCollection::const_iterator c = m_folderMapHandle->begin();
- c != m_folderMapHandle->end(); ++c) {
- ATH_MSG_INFO(" (" << c->first << ") " << c->second["FolderName"].data<string>());
- }
- }
-}
-
-
//=========================================================================
// Read COOL folder info
// Loop over all registered keys and get folder name and CLID
@@ -159,11 +80,11 @@ void TrigCOOLUpdateHelper::handle(const Incident&)
void TrigCOOLUpdateHelper::readFolderInfo()
{
if (m_iovDbSvc==0) return;
-
+
+ m_folderInfo.clear();
// Loop over all keys registered with IOVDbSvc
- vector<string> keyList(m_iovDbSvc->getKeyList());
- BOOST_FOREACH(string key, keyList) {
- string foldername, tag;
+ for (const std::string& key : m_iovDbSvc->getKeyList()) {
+ std::string foldername, tag;
IOVRange range;
bool retrieved;
unsigned long long bytesRead;
@@ -171,7 +92,7 @@ void TrigCOOLUpdateHelper::readFolderInfo()
// Get folder name and CLID for each key
bool found = m_iovDbSvc->getKeyInfo(key, foldername, tag, range,
- retrieved, bytesRead, readTime);
+ retrieved, bytesRead, readTime);
if ( !found || m_folderInfo.find(foldername)!=m_folderInfo.end() )
continue;
@@ -182,16 +103,14 @@ void TrigCOOLUpdateHelper::readFolderInfo()
else
ATH_MSG_ERROR("Cannot find CLID for " << key);
}
-}
-
-//=========================================================================
-// Reset COOL folders
-//=========================================================================
-StatusCode TrigCOOLUpdateHelper::resetBeginRunFolders(EventID::number_type currentRun)
-{
- readFolderInfo(); // Folders might be only partially avaiable
- return resetFolders(m_beginRunFolders, currentRun, false);
+ if (!m_coolFolderName.empty()) {
+ ATH_MSG_INFO("COOL folder map in " << m_coolFolderName << ":");
+ for (CondAttrListCollection::const_iterator c = m_folderMapHandle->begin();
+ c != m_folderMapHandle->end(); ++c) {
+ ATH_MSG_INFO(" (" << c->first << ") " << c->second["FolderName"].data<std::string>());
+ }
+ }
}
StatusCode TrigCOOLUpdateHelper::resetFolders(const std::vector<std::string>& folders,
@@ -201,8 +120,10 @@ StatusCode TrigCOOLUpdateHelper::resetFolders(const std::vector<std::string>& fo
if (folders.empty()) return StatusCode::SUCCESS;
StatusCode sc(StatusCode::SUCCESS);
- BOOST_FOREACH(string folder, folders) {
- if ( resetFolder(folder, currentRun, dropObject).isFailure() ) sc = StatusCode::FAILURE;
+ for (const std::string& f : folders) {
+ if ( resetFolder(f, currentRun, dropObject).isFailure() ) {
+ sc = StatusCode::FAILURE;
+ }
}
return sc;
}
@@ -226,7 +147,7 @@ StatusCode TrigCOOLUpdateHelper::resetFolder(const std::string& folder,
}
const CLID& clid = f->second.clid;
- const string& key = f->second.key;
+ const std::string& key = f->second.key;
// Check if proxy exists
if ( detStore()->proxy(clid, key)==0 ) {
ATH_MSG_DEBUG("No proxy for " << key << " found");
@@ -252,10 +173,7 @@ StatusCode TrigCOOLUpdateHelper::resetFolder(const std::string& folder,
// Drop object and reset cache
if (dropObject) {
- if (not m_iovDbSvc->dropObject(key, /*resetCache=*/true)) {
- ATH_MSG_WARNING("IOVDbSvc could not drop " << folder);
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( m_iovDbSvc->dropObject(key, /*resetCache=*/true), StatusCode::FAILURE );
}
// All OK
@@ -269,93 +187,51 @@ StatusCode TrigCOOLUpdateHelper::resetFolder(const std::string& folder,
//=========================================================================
// Folder update during the run
//=========================================================================
-
-StatusCode TrigCOOLUpdateHelper::hltCoolUpdate(EventID::number_type currentLB,
- EventID::number_type currentRun,
- EventID::number_type sor_time_sec,
- EventID::number_type sor_time_nsec)
+StatusCode TrigCOOLUpdateHelper::hltCoolUpdate(const EventContext& ctx)
{
- bool checkIOV_done = false;
-
// Loop over folders to be updated
std::map<CTPfragment::FolderIndex, FolderUpdate>::iterator f = m_folderUpdates.begin();
for (; f!=m_folderUpdates.end(); ++f) {
if (f->second.needsUpdate) {
- string folderName;
+ std::string folderName;
if (getFolderName(f->second.folderIndex, folderName).isFailure()) {
continue; // On purpose not a failure
}
- const EventInfo* currentEvent(0);
- CHECK(evtStore()->retrieve(currentEvent));
ATH_MSG_INFO("Reload of COOL folder " << folderName << " for IOV change in lumiblock " << f->second.lumiBlock
- << ". Current event: " << *currentEvent->event_ID());
+ << ". Current event: " << ctx.eventID());
- if ( hltCoolUpdate(folderName, currentLB, currentRun,
- sor_time_sec, sor_time_nsec).isFailure() ) {
+ if ( hltCoolUpdate(folderName, ctx).isFailure() ) {
ATH_MSG_FATAL("COOL update failed for " << folderName << ". Aborting.");
- throw ers::HLTAbort(ERS_HERE, name()+": Failure during COOL update of "+folderName);
+ return StatusCode::FAILURE;
}
// All OK
- checkIOV_done = true;
f->second.needsUpdate = false;
}
}
- // Needs to be done on every LB change
- if (!checkIOV_done) checkIOV(currentLB, currentRun, sor_time_sec, sor_time_nsec);
-
return StatusCode::SUCCESS;
}
-
-StatusCode TrigCOOLUpdateHelper::hltCoolUpdate(const std::string& folderName,
- EventID::number_type currentLB,
- EventID::number_type currentRun,
- EventID::number_type sor_time_sec,
- EventID::number_type sor_time_nsec)
+StatusCode TrigCOOLUpdateHelper::hltCoolUpdate(const std::string& folderName, const EventContext& ctx)
{
if ( m_iovSvc==0 || m_coolFolderName.empty() ) {
ATH_MSG_DEBUG("Passive mode. Not updating COOL folders");
return StatusCode::SUCCESS;
}
- // Start timer
- longlong t1_ms = System::currentTime(System::milliSec);
+ auto mon_t = Monitored::Timer("TIME_CoolFolderUpdate");
// Reset folder and make IOVDbSvc drop objects
-
- if (resetFolder(folderName, currentRun, true).isFailure()) {
+ if (resetFolder(folderName, ctx.eventID().run_number(), true).isFailure()) {
ATH_MSG_ERROR("Reset of " << folderName << " failed");
return StatusCode::FAILURE;
}
- checkIOV(currentLB, currentRun, sor_time_sec, sor_time_nsec);
-
- // Stop timer and fill histogram
- longlong t2_ms = System::currentTime(System::milliSec);
- if (m_hist_timeCondUpdate) m_hist_timeCondUpdate->Fill(t2_ms-t1_ms);
-
return StatusCode::SUCCESS;
}
-void TrigCOOLUpdateHelper::checkIOV(EventID::number_type currentLB,
- EventID::number_type currentRun,
- EventID::number_type sor_time_sec,
- EventID::number_type sor_time_nsec)
-{
- // Force IOVSvc to check IOV ranges
- EventInfo eventInfo(new EventID(currentRun, /*event*/ 0,
- sor_time_sec, sor_time_nsec,
- currentLB, /*bcid*/ 0),
- new EventType());
-
- EventIncident incident(eventInfo, name(), "CheckIOV");
- m_incidentSvc->fireIncident(incident);
-}
-
-
StatusCode TrigCOOLUpdateHelper::getFolderName(CTPfragment::FolderIndex idx, std::string& folderName)
{
if (m_coolFolderName.empty()) return StatusCode::SUCCESS;
@@ -365,7 +241,7 @@ StatusCode TrigCOOLUpdateHelper::getFolderName(CTPfragment::FolderIndex idx, std
return StatusCode::FAILURE;
}
try {
- folderName = m_folderMapHandle->attributeList(idx)["FolderName"].data<string>();
+ folderName = m_folderMapHandle->attributeList(idx)["FolderName"].data<std::string>();
}
catch (coral::AttributeListException &) {
ATH_MSG_ERROR(m_coolFolderName << " does not contain a folder for index/channel " << idx
@@ -378,27 +254,56 @@ StatusCode TrigCOOLUpdateHelper::getFolderName(CTPfragment::FolderIndex idx, std
//=========================================================================
-// Schedule COOL folder updates (called on every event by EventLoopMgr)
+// Schedule COOL folder updates (called on every event by HltEventLoopMgr)
//=========================================================================
-void TrigCOOLUpdateHelper::setFolderUpdates(const std::map<CTPfragment::FolderIndex, CTPfragment::FolderEntry>& folderUpdates)
+StatusCode TrigCOOLUpdateHelper::scheduleFolderUpdates(const EventContext& ctx)
{
+ using CTPfragment::FolderIndex;
+ using CTPfragment::FolderEntry;
+
+ // Fetch CTP fragment ROB
+ const std::vector<uint32_t> robs{m_ctpRobId};
+ IROBDataProviderSvc::VROBFRAG ctpRobs;
+ m_robDataProviderSvc->addROBData(ctx, robs, name());
+ m_robDataProviderSvc->getROBData(ctx, robs, ctpRobs, name());
+
+ if ( ctpRobs.empty() ) {
+ ATH_MSG_FATAL("Cannot retrieve CTP ROB " << m_ctpRobId.value());
+ return StatusCode::FAILURE;
+ }
+
+ // Decode CTP extra payload words
+ std::vector<uint32_t> l1_extraPayload = CTPfragment::extraPayloadWords( ctpRobs[0] );
+ CTPfragment::ExtraPayload ctp_payload;
+ try {
+ ctp_payload = CTPfragment::ExtraPayload(l1_extraPayload);
+ }
+ catch (CTPfragment::ExtraPayloadTooLong& ex) {
+ ATH_MSG_FATAL("Invalid CTP fragment. Exception = " << ex.what());
+ return StatusCode::FAILURE;
+ }
+
+ if ( msgLevel(MSG::DEBUG) ) {
+ msg() << MSG::DEBUG << "CTP extra payload (" << l1_extraPayload.size() << " words): ";
+ for (std::size_t i=0; i<l1_extraPayload.size(); ++i) {
+ msg() << " " << l1_extraPayload[i];
+ }
+ msg() << ctp_payload << endmsg;
+ }
+
// Loop over potential new folder updates
- std::map<CTPfragment::FolderIndex, CTPfragment::FolderEntry>::const_iterator i = folderUpdates.begin();
- for (; i!=folderUpdates.end(); ++i) {
+ for (const std::pair<FolderIndex, FolderEntry>& kv : ctp_payload.getFolderUpdates()) {
// Check if we already have an update for this folder
- std::map<CTPfragment::FolderIndex, FolderUpdate>::const_iterator f = m_folderUpdates.find(i->first);
+ std::map<FolderIndex, FolderUpdate>::const_iterator f = m_folderUpdates.find(kv.first);
// No updates yet or this update superseds the previous one
- if (f==m_folderUpdates.end() || (f->second.lumiBlock != i->second.lumiBlock)) {
- m_folderUpdates[i->first] = FolderUpdate(i->second); // new folder update
+ if (f==m_folderUpdates.end() || (f->second.lumiBlock != kv.second.lumiBlock)) {
+ m_folderUpdates[kv.first] = FolderUpdate(kv.second); // new folder update
- ATH_MSG_DEBUG("Conditions update for folder " << i->second.folderIndex
- << " on lumiblock " << i->second.lumiBlock);
+ ATH_MSG_DEBUG("Conditions update for folder " << kv.second.folderIndex
+ << " on lumiblock " << kv.second.lumiBlock);
}
- /* The above could be optmized by handling events from a previous lumiblock in a special way
- and not forcing a COOL update. However, this would complicate the code and in the merged HLT
- system events from already seen LBs will be very rare (or even impossible).
- */
}
+ return StatusCode::SUCCESS;
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h
index 2bcfa573210e26f530e196be901825146ceab5d9..08b9280b29dbc76d8f150ea6c71202da1530c4a4 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.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 TRIGSERVICES_TRIGCOOLUPDATEHELPER_H
@@ -8,30 +8,29 @@
* @file TrigCOOLUpdateHelper.h
* @brief Helper tool for COOL updates
* @author Frank Winklmeier
- *
- * $Id: $
*/
// STL includes
+#include <map>
#include <string>
#include <vector>
-#include <map>
// Framework includes
-#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IIncidentListener.h"
+#include "GaudiKernel/StatusCode.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "StoreGate/DataHandle.h"
+#include "AthenaMonitoring/Monitored.h"
#include "EventInfo/EventID.h"
+#include "StoreGate/DataHandle.h"
+#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
+// TDAQ includes
#include "CTPfragment/CTPExtraWordsFormat.h"
class TH1F;
class IIOVSvc;
class IIOVDbSvc;
-class IIncidentSvc;
class CondAttrListCollection;
/**
@@ -53,7 +52,7 @@ struct FolderUpdate {
lumiBlock(entry.lumiBlock),
folderIndex(entry.folderIndex),
needsUpdate(true) {}
-
+
EventID::number_type lumiBlock;
CTPfragment::FolderIndex folderIndex;
bool needsUpdate;
@@ -61,66 +60,28 @@ struct FolderUpdate {
/**
* @brief Tool to perform COOL updates during the run
- *
*/
-class TrigCOOLUpdateHelper : public AthAlgTool,
- public IIncidentListener
-{
+class TrigCOOLUpdateHelper : public AthAlgTool {
public:
-
- TrigCOOLUpdateHelper(const std::string &type, const std::string &name, const IInterface *parent);
+ TrigCOOLUpdateHelper(const std::string& type, const std::string& name, const IInterface* parent);
virtual ~TrigCOOLUpdateHelper();
- static const InterfaceID& interfaceID();
- virtual StatusCode initialize();
- virtual StatusCode start();
- virtual StatusCode stop();
- virtual void handle (const Incident&);
-
- /**
- * @brief Reset folders configured to be reset on BeginRun
- * @param currentRun Current run number
- */
- StatusCode resetBeginRunFolders(EventID::number_type currentRun);
+ virtual StatusCode initialize() override;
+ virtual StatusCode start() override;
+ virtual StatusCode stop() override;
/**
* @brief Perform COOL udpates if needed
- * @param currentLB Current lumiblock
- * @param currentRun Current run number
- * @param sor_time_sec Start-Of-Run time in seconds
- * @param sor_time_nsec Start-Of-Run time offset in nanoseconds
+ * @param ctx Event context
*/
- StatusCode hltCoolUpdate(EventID::number_type currentLB,
- EventID::number_type currentRun,
- EventID::number_type sor_time_sec,
- EventID::number_type sor_time_nsec);
-
+ StatusCode hltCoolUpdate(const EventContext& ctx);
+
/**
* @brief Update specified COOL folder
- * @param folder COOL folder to reset
- * @param currentLB Current lumiblock
- * @param currentRun Current run number
- * @param sor_time_sec Start-Of-Run time in seconds
- * @param sor_time_nsec Start-Of-Run time offset in nanoseconds
+ * @param ctx Event context
* @param doProxyReset Drop object and reset cache
*/
- StatusCode hltCoolUpdate(const std::string& folder,
- EventID::number_type currentLB,
- EventID::number_type currentRun,
- EventID::number_type sor_time_sec,
- EventID::number_type sor_time_nsec);
-
- /**
- * @brief Force IOVSvc to recheck all IOVs (needs to be called on every LB change)
- * @param currentLB Current lumiblock
- * @param currentRun Current run number
- * @param sor_time_sec Start-Of-Run time in seconds
- * @param sor_time_nsec Start-Of-Run time offset in nanoseconds
- */
- void checkIOV(EventID::number_type currentLB,
- EventID::number_type currentRun,
- EventID::number_type sor_time_sec,
- EventID::number_type sor_time_nsec);
+ StatusCode hltCoolUpdate(const std::string& folder, const EventContext& ctx);
/**
* @brief Return folder name to index
@@ -128,64 +89,55 @@ public:
* @param folderName Returns folder name
*/
StatusCode getFolderName(CTPfragment::FolderIndex idx, std::string& folderName);
-
+
/**
- * @brief Set the folder updates as retrieved from the CTP fragment
- * @param map returned by CTPfragment::ExtraPayload::getFolderUpdates()
+ * @brief Schedule COOL folder updates according to extra payload in CTP fragment
*/
- void setFolderUpdates(const std::map<CTPfragment::FolderIndex, CTPfragment::FolderEntry>& folderUpdates);
-
-private:
+ StatusCode scheduleFolderUpdates(const EventContext& ctx);
+ /**
+ * @brief Read information about existing COOL folders
+ */
+ void readFolderInfo();
+
+private:
/**
* @brief Reset COOL folder
* @param folder COOL folder name
* @param currentRun Current run number
* @param dropObject Drop object and reset cache
*/
- StatusCode resetFolder(const std::string& folder,
- EventID::number_type currentRun,
+ StatusCode resetFolder(const std::string& folder, EventID::number_type currentRun,
bool dropObject = false);
-
+
/**
* @brief Reset list of COOL folders
* @param folders List of folder names
* @param currentRun Current run number
* @param dropObject Drop object and reset cache
*/
- StatusCode resetFolders(const std::vector<std::string>& folders,
- EventID::number_type currentRun,
+ StatusCode resetFolders(const std::vector<std::string>& folders, EventID::number_type currentRun,
bool dropObject = false);
- /**
- * Read information about existing COOL folders
- */
- void readFolderInfo();
-
typedef std::map<std::string, FolderInfo> FolderInfoMap;
- FolderInfoMap m_folderInfo; //!< COOL folder info
-
+ FolderInfoMap m_folderInfo; //!< COOL folder info
+
const DataHandle<CondAttrListCollection> m_folderMapHandle;
std::map<CTPfragment::FolderIndex, FolderUpdate> m_folderUpdates;
-
+
// Services and Tools
- IIOVSvc* m_iovSvc;
- IIOVDbSvc* m_iovDbSvc;
- ServiceHandle<IIncidentSvc> m_incidentSvc;
+ IIOVSvc* m_iovSvc{0};
+ IIOVDbSvc* m_iovDbSvc{0};
+ ServiceHandle<IROBDataProviderSvc> m_robDataProviderSvc;
- // Histograms
- TH1F* m_hist_timeCondUpdate; //!< Timing histogram for conditions updates
-
// Properties
- std::string m_coolFolderName; //!< COOL folder name
- std::vector<std::string> m_beginRunFolders; //!< Folders to reset before BeginRun
-};
+ ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", {}, "Monitoring tool"};
+ Gaudi::Property<std::string> m_coolFolderName{
+ this, "coolFolder", {}, "Name of COOL folder containing folder map"};
-inline const InterfaceID& TrigCOOLUpdateHelper::interfaceID()
-{
- static const InterfaceID IID("TrigCOOLUpdateHelper", 1, 0);
- return IID;
-}
+ Gaudi::Property<uint32_t> m_ctpRobId{
+ this, "CtpRobId", 0x770001, "ROB ID of CTP fragment containing the extra payload"};
+};
#endif
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.cxx
index 35ca19e6cde05aa0e99388a3fbbc73f3497feab1..3e674fb0ff46c287b5b3246e11363f364353539b 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.cxx
@@ -1,152 +1,134 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-/**
- * @file TrigSORFromPtreeHelper.cxx
- * @author Ricardo Abreu
- *
- * @brief Helper class to retrieve the Start Of Run parameters from the
- * prepareForRun ptree and put them into the detector store with whole-run
- * validity. This class replaces it's old analogous TrigSORFromISHelper.
- */
-
#include "TrigSORFromPtreeHelper.h"
+
#include "AthenaKernel/IIOVDbSvc.h"
#include "AthenaKernel/IAddressProvider.h"
+#include "AthenaBaseComps/AthCheckMacros.h"
+
#include "owl/time.h"
#include <eformat/DetectorMask.h>
-#define ST_WHERE CLNAME << "::" << __func__ << "(): "
-
using namespace boost::property_tree;
-using std::string;
-using SORHelper = TrigSORFromPtreeHelper;
namespace
{
- //////////////////////////////////////////////////////////////////////////////
- const string CLNAME{"TrigSORFromPtreeHelper"};
- const string SORPATH{"/TDAQ/RunCtrl/SOR_Params"};
-
- //////////////////////////////////////////////////////////////////////////////
- void printSOR(MsgStream& log, const SORHelper::SOR * sor)
- {
- log << MSG::DEBUG << ST_WHERE
- << "Dump SOR CondAttrListCollection: size=" << sor->size() << endmsg;
- sor->dump();
- }
-
- //////////////////////////////////////////////////////////////////////////////
- void setSpec(coral::AttributeListSpecification * attrSpec)
- {
- attrSpec->extend("RunNumber", "unsigned int");
- attrSpec->extend("SORTime", "unsigned long long");
- attrSpec->extend("RunType", "string");
- attrSpec->extend("DetectorMaskFst", "unsigned long long");
- attrSpec->extend("DetectorMaskSnd", "unsigned long long");
- attrSpec->extend("RecordingEnabled", "bool");
- }
+ const std::string CLNAME{"TrigSORFromPtreeHelper"};
}
////////////////////////////////////////////////////////////////////////////////
-const SORHelper::SOR * SORHelper::fillSOR(const ptree & rparams, const EventContext& ctx) const
+TrigSORFromPtreeHelper::TrigSORFromPtreeHelper(IMessageSvc* msgSvc,
+ const ServiceHandle<StoreGateSvc>& detStore,
+ const std::string& sorpath) :
+ AthMessaging(msgSvc, CLNAME),
+ m_detStore(detStore),
+ m_sorpath(sorpath)
+{}
+
+////////////////////////////////////////////////////////////////////////////////
+StatusCode TrigSORFromPtreeHelper::fillSOR(const ptree & rparams, const EventContext& ctx) const
{
- m_log << MSG::DEBUG << ST_WHERE << "Setup SOR in DetectorStore" << endmsg;
- SG dstore("DetectorStore", CLNAME);
- if((dstore.retrieve()).isFailure())
- m_log << MSG::ERROR << ST_WHERE << "could not find DetectorStore" << endmsg;
+ ATH_MSG_DEBUG("Setup SOR in DetectorStore");
// get handle to the IOVDbSvc
ServiceHandle<IIOVDbSvc> iovdbsvc("IOVDbSvc", CLNAME);
if ((iovdbsvc.retrieve()).isFailure()) {
- m_log << MSG::ERROR << ST_WHERE
- << "could not find IOVDbSvc. Time dependent conditions data may be not properly handled." << endmsg;
+ ATH_MSG_ERROR("Could not find IOVDbSvc. Time dependent conditions data may be not properly handled.");
} else {
- IOVTime currentIOVTime(rparams.get<unsigned int>("run_number"),
- IOVTime::MINEVENT,
- OWLTime{(rparams.get_child("timeSOR").data()).c_str()}.total_mksec_utc() * 1000);
-
+ IOVTime currentIOVTime(ctx.eventID());
// Signal BeginRun directly to IOVDbSvc to set complete IOV start time
- if (StatusCode::SUCCESS != iovdbsvc->signalBeginRun(currentIOVTime, ctx)) {
- m_log << MSG::ERROR << ST_WHERE
- << "Unable to signal begin run IOVTime to IOVDbSvc. IOVTime = " << currentIOVTime << endmsg;
+ if ( iovdbsvc->signalBeginRun(currentIOVTime, ctx).isFailure() ) {
+ ATH_MSG_ERROR("Unable to signal begin run IOVTime to IOVDbSvc. IOVTime = " << currentIOVTime);
} else {
- m_log << MSG::DEBUG << ST_WHERE
- << "Set start of run time to IOVTime = " << currentIOVTime << endmsg;
+ ATH_MSG_DEBUG("Set start of run time to IOVTime = " << currentIOVTime);
}
}
- auto sor = getSOR(dstore);
- if(!sor || fillSor(rparams, sor).isFailure() ||
- updateProxy(dstore, sor).isFailure())
- {
- m_log << MSG::ERROR << ST_WHERE << "could not properly setup SOR" << endmsg;
- return nullptr;
- }
+ ATH_CHECK( createSOR(rparams) );
+
+ return StatusCode::SUCCESS;
+}
- m_log << MSG::DEBUG << ST_WHERE << "successfully setup SOR" << endmsg;
- printSOR(m_log, sor);
+////////////////////////////////////////////////////////////////////////////////
+EventIDBase TrigSORFromPtreeHelper::eventID(const ptree& rparams) const
+{
+ EventIDBase eid;
+ auto t = OWLTime{(rparams.get_child("timeSOR").data()).c_str()};
- return sor;
+ eid.set_run_number( rparams.get<unsigned int>("run_number") );
+ eid.set_time_stamp( static_cast<EventIDBase::number_type>(t.c_time()) );
+ eid.set_time_stamp_ns_offset( t.mksec()*1000 );
+
+ return eid;
}
////////////////////////////////////////////////////////////////////////////////
-SORHelper::SOR * SORHelper::getSOR(const SG & dstore) const
+StatusCode TrigSORFromPtreeHelper::createSOR(const ptree& rparams) const
{
- auto sc = StatusCode{};
- auto sor = new SOR(true);
- if(dstore->transientContains<SOR>(SORPATH))
- {
- const SOR * oldsor = dstore->retrieve<const SOR>(SORPATH);
- m_log << MSG::INFO << ST_WHERE
- << "overwriting SOR contents (a dump of the old one follows)"<<endmsg;
- printSOR(m_log, oldsor);
- sc = dstore->overwrite(sor, SORPATH, true);
+ // obtain SOR contents from ptree
+ auto attrList = getAttrList(rparams);
+
+ // Validity
+ IOVTime iovTimeStart(attrList["RunNumber"].data<unsigned int>() ,0);
+ IOVTime iovTimeStop(attrList["RunNumber"].data<unsigned int>()+1,0);
+ IOVRange iovRange(iovTimeStart, iovTimeStop);
+
+ auto sor = new SOR(/*hasRunLumiBlockTime*/true);
+ sor->add(SOR::ChanNum{0}, attrList);
+ sor->add(SOR::ChanNum{0}, iovRange);
+ sor->resetMinRange();
+ sor->addNewStart(iovTimeStart);
+ sor->addNewStop(iovTimeStop);
+
+ // Record or overwrite existing SOR
+ if ( m_detStore->transientContains<SOR>(m_sorpath) ) {
+ const SOR * oldsor = m_detStore->retrieve<const SOR>(m_sorpath);
+ ATH_MSG_INFO("Overwriting SOR contents (a dump of the old one follows):");
+ oldsor->dump();
+ ATH_CHECK( m_detStore->overwrite(sor, m_sorpath, true) );
}
- else
- {
- m_log << MSG::INFO << ST_WHERE << "recording new SOR" << endmsg;
- sc = dstore->record(sor, SORPATH, true);
+ else {
+ ATH_MSG_DEBUG("Recording new SOR");
+ ATH_CHECK( m_detStore->record(sor, m_sorpath, true) );
}
- if(sc.isFailure())
- {
- m_log << MSG::ERROR << ST_WHERE
- << "could not record SOR in DetectorStore\n" << dstore->dump()
- << endmsg;
- delete sor;
- sor = nullptr;
- }
+ ATH_CHECK( setIOVRange(iovRange) );
+ ATH_CHECK( updateProxy(sor) );
+
+ ATH_MSG_INFO("Successfully setup SOR:");
+ sor->dump();
- return sor;
+ return StatusCode::SUCCESS;
}
////////////////////////////////////////////////////////////////////////////////
-coral::AttributeList SORHelper::getAttrList(const ptree& rparams) const
+coral::AttributeList TrigSORFromPtreeHelper::getAttrList(const ptree& rparams) const
{
// First create attribute specification
// ugly new needed:
// dtor is protected, have to use ptr and release it explicitly... go figure
auto attrSpec = new coral::AttributeListSpecification{};
- setSpec(attrSpec);
+ attrSpec->extend("RunNumber", "unsigned int");
+ attrSpec->extend("SORTime", "unsigned long long");
+ attrSpec->extend("RunType", "string");
+ attrSpec->extend("DetectorMaskFst", "unsigned long long");
+ attrSpec->extend("DetectorMaskSnd", "unsigned long long");
+ attrSpec->extend("RecordingEnabled", "bool");
// now create the attribute list and fill it in
coral::AttributeList attrList(*attrSpec);
- attrList["RunNumber"].data<unsigned int>() =
- rparams.get<unsigned int>("run_number");
- attrList["RunType"].data<string>() =
- rparams.get<string>("run_type");
- attrList["RecordingEnabled"].data<bool>() =
- rparams.get<bool>("recording_enabled");
+ attrList["RunNumber"].data<unsigned int>() = rparams.get<unsigned int>("run_number");
+ attrList["RunType"].data<std::string>() = rparams.get<std::string>("run_type");
+ attrList["RecordingEnabled"].data<bool>() = rparams.get<bool>("recording_enabled");
const auto& t = rparams.get_child("timeSOR").data();
- attrList["SORTime"].data<unsigned long long>() =
- OWLTime{t.c_str()}.total_mksec_utc() * 1000;
+ attrList["SORTime"].data<unsigned long long>() = OWLTime{t.c_str()}.total_mksec_utc() * 1000;
- auto dm = getDetMask(rparams);
+ std::pair<uint64_t, uint64_t> dm = eformat::helper::DetectorMask(rparams.get_child("det_mask").data()).serialize();
attrList["DetectorMaskFst"].data<unsigned long long>() = dm.first;
attrList["DetectorMaskSnd"].data<unsigned long long>() = dm.second;
@@ -158,84 +140,37 @@ coral::AttributeList SORHelper::getAttrList(const ptree& rparams) const
}
////////////////////////////////////////////////////////////////////////////////
-std::pair<uint64_t, uint64_t>
-SORHelper::getDetMask(const ptree& rparams) const
-{
- const auto& dmstr = rparams.get_child("det_mask").data();
- return eformat::helper::DetectorMask(dmstr).serialize();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-StatusCode SORHelper::fillSor(const ptree & rparams, SOR * sor) const
-{
- // obtain SOR contents from ptree
- auto attrList = getAttrList(rparams);
-
- // Validity stuff
- IOVTime iovTimeStart(attrList["RunNumber"].data<unsigned int>() ,0);
- IOVTime iovTimeStop(attrList["RunNumber"].data<unsigned int>()+1,0);
- IOVRange iovRange(iovTimeStart, iovTimeStop);
- auto channum = SOR::ChanNum{0};
-
- sor->add(channum, attrList);
- sor->add(channum,iovRange);
- sor->resetMinRange();
- sor->addNewStart(iovTimeStart);
- sor->addNewStop(iovTimeStop);
-
- return setIOVRange(iovRange);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-StatusCode SORHelper::setIOVRange(IOVRange & iovRange) const
+StatusCode TrigSORFromPtreeHelper::setIOVRange(IOVRange & iovRange) const
{
// set IOVRange on the IOVSvc
ServiceHandle<IIOVSvc> iovsvc("IOVSvc", CLNAME);
- if ((iovsvc.retrieve()).isFailure())
- {
- m_log << MSG::ERROR << ST_WHERE << "could not find IOVSvc" << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( iovsvc.retrieve() );
auto clid = ClassID_traits<SOR>::ID();
- if ((iovsvc->setRange(clid, SORPATH, iovRange, "StoreGateSvc")).isFailure())
- {
- m_log << MSG::ERROR << ST_WHERE
- << "could not set IOVRange for SOR folder in IOVSvc." << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( iovsvc->setRange(clid, m_sorpath, iovRange, "StoreGateSvc") );
return StatusCode::SUCCESS;
}
////////////////////////////////////////////////////////////////////////////////
-StatusCode
-SORHelper::updateProxy(const SG & dstore, SOR * sor) const
+StatusCode TrigSORFromPtreeHelper::updateProxy(SOR * sor) const
{
- // check the SOR_Params proxy and add if necessary an IAddressProvider
- //(typically for MC)
- auto proxy = dstore->proxy(sor);
+ // check the SOR_Params proxy and add if necessary an IAddressProvider (typically for MC)
+ auto proxy = m_detStore->proxy(sor);
if (!proxy) {
- m_log << MSG::ERROR << ST_WHERE
- << "could not find proxy for SOR_Params folder." << endmsg;
+ ATH_MSG_ERROR("Could not find proxy for SOR_Params folder.");
return StatusCode::FAILURE;
}
- // check if the transient address has an IAddressProvider, if not set
- //IOVDbSvc as provider
+ // check if the transient address has an IAddressProvider, if not set IOVDbSvc as provider
if (!proxy->provider()) {
// get handle to the IOVDbSvc
ServiceHandle<IIOVDbSvc> iovdbsvc("IOVDbSvc", CLNAME);
- if ((iovdbsvc.retrieve()).isFailure()) {
- m_log << MSG::ERROR << ST_WHERE << "could not find IOVDbSvc." << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( iovdbsvc.retrieve() );
IAddressProvider* provider = dynamic_cast<IAddressProvider*>(&*iovdbsvc);
if (!provider) {
- m_log << MSG::ERROR << ST_WHERE
- << "could not cast to IAddressProvider interface and set the "
- "provider for SOR_Params." << endmsg;
+ ATH_MSG_ERROR("Could not cast to IAddressProvider interface and set the provider for SOR_Params.");
return StatusCode::FAILURE;
}
proxy->setProvider(provider, proxy->storeID());
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.h
index 1410be399f4d26b4a9d2add8a10fd1423d8c9e6a..2d083bf4f8f70cf186ea282b52ec033d4ad3c3e2 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigSORFromPtreeHelper.h
@@ -1,65 +1,59 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-
-/**
- * @file TrigSORFromPtreeHelper.h
- * @author Ricardo Abreu
- *
- * @brief Helper class to retrieve the Start Of Run parameters from the
- * prepareForRun ptree and put them into the detector store with whole-run
- * validity. This class replaces it's old analogous TrigSORFromISHelper.
- */
-
#ifndef TRIGSORFROMPTREEHELPER_H_
#define TRIGSORFROMPTREEHELPER_H_
+#include "AthenaBaseComps/AthMessaging.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/StatusCode.h"
+#include "StoreGate/StoreGateSvc.h"
#include <boost/property_tree/ptree.hpp>
-#include <utility>
class CondAttrListCollection;
+class IMessageSvc;
-////////////////////////////////////////////////////////////////////////////////
-class TrigSORFromPtreeHelper
-{
+/**
+ * @brief Helper class for Start Of Run (SOR) record
+ * @author Ricardo Abreu
+ *
+ * Helper class to retrieve the Start Of Run parameters from the
+ * prepareForRun ptree and put them into the detector store with whole-run
+ * validity.
+ */
+class TrigSORFromPtreeHelper : public AthMessaging {
public:
typedef CondAttrListCollection SOR;
- explicit TrigSORFromPtreeHelper(const MsgStream & log);
+ /**
+ * Create the SOR helper
+ * @params msgSvc Pointer to MessageSvc
+ * @params detStore Handle to DetectorStore
+ * @params sorpath COOL folder path of SOR record (e.g. /TDAQ/RunCtrl/SOR_Params)
+ */
+ TrigSORFromPtreeHelper(IMessageSvc* msgSvc, const ServiceHandle<StoreGateSvc>& detStore, const std::string& sorpath);
- /*
+ /**
* Fill SOR record in Detector Store, reusing if present or creating new one
* otherwise. SOR contents filled according to what is specified by rparams.
* Validity of SOR set to this run
*/
- const SOR * fillSOR(const boost::property_tree::ptree & rparams, const EventContext& ctx) const;
+ StatusCode fillSOR(const boost::property_tree::ptree& rparams, const EventContext& ctx) const;
-private:
- typedef ServiceHandle<StoreGateSvc> SG;
- typedef boost::property_tree::ptree PT;
-
- SOR * getSOR(const SG & dstore) const;
- coral::AttributeList getAttrList(const PT & rparams) const;
- std::pair<uint64_t, uint64_t> getDetMask(const PT & rparams) const;
+ /**
+ * Create an EventIDBase filled with the value from rparams
+ */
+ EventIDBase eventID(const boost::property_tree::ptree& rparams) const;
- StatusCode fillSor(const PT & rparams, SOR * sor) const;
- StatusCode setIOVRange(IOVRange & iovRange) const;
- StatusCode updateProxy(const SG & dstore, SOR * sor) const;
+private:
+ StatusCode createSOR(const boost::property_tree::ptree& rparams) const;
+ coral::AttributeList getAttrList(const boost::property_tree::ptree& rparams) const;
+ StatusCode setIOVRange(IOVRange& iovRange) const;
+ StatusCode updateProxy(SOR* sor) const;
- mutable MsgStream m_log;
+ ServiceHandle<StoreGateSvc> m_detStore;
+ std::string m_sorpath;
};
-////////////////////////////////////////////////////////////////////////////////
-inline TrigSORFromPtreeHelper::
-TrigSORFromPtreeHelper(const MsgStream & log)
- : m_log(log)
-{
-}
-
-
#endif /* TRIGSORFROMPTREEHELPER_H_ */
diff --git a/InnerDetector/InDetConditions/InDetCondServices/doc/packagedoc.h b/InnerDetector/InDetConditions/InDetCondServices/doc/packagedoc.h
deleted file mode 100644
index 2fd4231caf0d52b3d62eb8e5de07dd815feb3838..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/InDetCondServices/doc/packagedoc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@page InDetCondServices_page InDetCondServices package
-
-@section InDetCondServices_InDetCondServicesIntroduction Introduction
-
-This package provides interfaces to conditions services.
-
-*/
diff --git a/InnerDetector/InDetConditions/InDetCondServices/CMakeLists.txt b/InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt
similarity index 80%
rename from InnerDetector/InDetConditions/InDetCondServices/CMakeLists.txt
rename to InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt
index dbaec5c4adb82186346aab474ecc53557c62b80d..958505d886485097a77b5212800b54830dd4896d 100644
--- a/InnerDetector/InDetConditions/InDetCondServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt
@@ -1,9 +1,9 @@
################################################################################
-# Package: InDetCondServices
+# Package: InDetCondTools
################################################################################
# Declare the package name:
-atlas_subdir( InDetCondServices )
+atlas_subdir( InDetCondTools )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
@@ -15,8 +15,8 @@ atlas_depends_on_subdirs( PUBLIC
find_package( Eigen )
# Component(s) in the package:
-atlas_add_library( InDetCondServices
- PUBLIC_HEADERS InDetCondServices
+atlas_add_library( InDetCondTools
+ PUBLIC_HEADERS InDetCondTools
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives GaudiKernel )
diff --git a/InnerDetector/InDetConditions/InDetCondServices/InDetCondServices/ISiLorentzAngleTool.h b/InnerDetector/InDetConditions/InDetCondTools/InDetCondTools/ISiLorentzAngleTool.h
similarity index 97%
rename from InnerDetector/InDetConditions/InDetCondServices/InDetCondServices/ISiLorentzAngleTool.h
rename to InnerDetector/InDetConditions/InDetCondTools/InDetCondTools/ISiLorentzAngleTool.h
index e41648dafbe403fceff877dc1fc00d6219b20855..1eb0058c3167cadc2e36322b8a76da7cdfcb8d79 100644
--- a/InnerDetector/InDetConditions/InDetCondServices/InDetCondServices/ISiLorentzAngleTool.h
+++ b/InnerDetector/InDetConditions/InDetCondTools/InDetCondTools/ISiLorentzAngleTool.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
*/
/**
diff --git a/InnerDetector/InDetConditions/InDetCondTools/doc/packagedoc.h b/InnerDetector/InDetConditions/InDetCondTools/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..2e36695f89573a0cb2f34dea1551e055b608aca6
--- /dev/null
+++ b/InnerDetector/InDetConditions/InDetCondTools/doc/packagedoc.h
@@ -0,0 +1,12 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page InDetCondTools_page InDetCondTools package
+
+@section InDetCondTools_InDetCondToolsIntroduction Introduction
+
+This package provides interfaces to conditions tools.
+
+*/
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx
index b411f802944f8336026df82fc4e9f466c49fec1d..9101ce1555a52845ea206084c663bac09667885c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx
@@ -32,13 +32,13 @@ StatusCode SCT_MajorityConditionsTestAlg::initialize() {
}
//Execute
-StatusCode SCT_MajorityConditionsTestAlg::execute(const EventContext& /*ctx*/) const {
+StatusCode SCT_MajorityConditionsTestAlg::execute(const EventContext& ctx) const {
ATH_MSG_INFO("Calling execute");
- ATH_MSG_INFO("Detector is " << (m_majorityTool->isGood() ? "GOOD" : "BAD"));
- ATH_MSG_INFO("ECC is " << (m_majorityTool->isGood(-2) ? "GOOD" : "BAD"));
- ATH_MSG_INFO("Barrel is " << (m_majorityTool->isGood(0) ? "GOOD" : "BAD"));
- ATH_MSG_INFO("ECA is " << (m_majorityTool->isGood(2) ? "GOOD" : "BAD"));
+ ATH_MSG_INFO("Detector is " << (m_majorityTool->isGood(ctx) ? "GOOD" : "BAD"));
+ ATH_MSG_INFO("ECC is " << (m_majorityTool->isGood(-2, ctx) ? "GOOD" : "BAD"));
+ ATH_MSG_INFO("Barrel is " << (m_majorityTool->isGood(0, ctx) ? "GOOD" : "BAD"));
+ ATH_MSG_INFO("ECA is " << (m_majorityTool->isGood(2, ctx) ? "GOOD" : "BAD"));
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
index a223f3d4f544cb8b9b354332280ca6aba8c955ff..635b18b3789cd0d4b902252817ba2543bcf0e115 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
@@ -126,7 +126,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::execute(const EventContext& ctx) const
// Try to get some NPtGain data
// GainByChip, GainRMSByChip, NoiseByChip, NoiseRMSByChip, OffsetByChip, OffsetRMSByChip
std::string whatNPdata{"GainByChip"};
- std::vector<float> NPdata{m_ReadCalibChipDataTool->getNPtGainData(Id, side, whatNPdata)};
+ std::vector<float> NPdata{m_ReadCalibChipDataTool->getNPtGainData(Id, side, whatNPdata, ctx)};
for (unsigned int i{0}; i<NPdata.size(); i++) {
ATH_MSG_INFO("The " << whatNPdata << " for chip number " << i << " on side " << side << " is: " << NPdata[i]);
}
@@ -134,7 +134,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::execute(const EventContext& ctx) const
// Try to get some NO data
// occupancy, occupancyRMS, noise, offset
std::string whatNOdata{"OccupancyRMSByChip"};
- std::vector<float> NOdata{m_ReadCalibChipDataTool->getNoiseOccupancyData(Id, side, whatNOdata)};
+ std::vector<float> NOdata{m_ReadCalibChipDataTool->getNoiseOccupancyData(Id, side, whatNOdata, ctx)};
ATH_MSG_INFO("Size of returned data: "<<NOdata.size());
for (unsigned int i{0}; i<NOdata.size(); i++) {
ATH_MSG_INFO("The " << whatNOdata << " for chip number " << i << " on side " << side << " is: " << NOdata[i]);
@@ -144,7 +144,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::execute(const EventContext& ctx) const
// GainByChip, GainRMSByChip, NoiseByChip, NoiseRMSByChip, OffsetByChip, OffsetRMSByChip
Identifier invalidId;//constructor forms invalid Id
ATH_MSG_INFO("Trying to retrieve invalid data");
- std::vector<float> nvNPdata{m_ReadCalibChipDataTool->getNPtGainData(invalidId, 0, whatNPdata)};
+ std::vector<float> nvNPdata{m_ReadCalibChipDataTool->getNPtGainData(invalidId, 0, whatNPdata, ctx)};
const long unsigned int sizeOfInvalidNPData{nvNPdata.size()};
ATH_MSG_INFO("Size of returned data: " << sizeOfInvalidNPData);
for (long unsigned int i{0}; i!=sizeOfInvalidNPData; ++i) {
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx
index d79197bb54d80e5da136a7c67416fd42be348913..0633e35bbb6b466551a2d62d8a144f383fdb792a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx
@@ -33,16 +33,16 @@ StatusCode SCT_SensorsTestAlg::initialize() {
}
//Execute
-StatusCode SCT_SensorsTestAlg::execute(const EventContext& /*ctx*/) const {
+StatusCode SCT_SensorsTestAlg::execute(const EventContext& ctx) const {
//This method is only used to test the summary service, and only used within this package,
// so the INFO level messages have no impact on performance of these services when used by clients
ATH_MSG_INFO("Calling execute");
std::vector<std::string> values;
- m_SensorsTool->getSensorsData(values);
+ m_SensorsTool->getSensorsData(values, ctx);
for (const std::string& value: values) {
ATH_MSG_INFO("------------" << value << "------------");
}
- m_SensorsTool->printManufacturers();
+ m_SensorsTool->printManufacturers(ctx);
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_DetectorLevelConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_DetectorLevelConditionsTool.h
index 5c4d978e7afde30b45195bd1acde8d4f9350f70e..c553b6f1a6dbacd20764f0ac08a2a6fd6449dd4e 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_DetectorLevelConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_DetectorLevelConditionsTool.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
*/
/**
@@ -11,6 +11,9 @@
#ifndef ISCT_DetectorLevelConditionsTool_h
#define ISCT_DetectorLevelConditionsTool_h
+#include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/EventContext.h"
+
#include <list>
class StatusCode;
@@ -34,10 +37,12 @@ class ISCT_DetectorLevelConditionsTool: virtual public IAlgTool {
///Summarise the result of the detector as good/bad
virtual bool isGood() const =0;
+ virtual bool isGood(const EventContext& ctx) const =0;
///Summarise the result of the barrel/endcap as good/bad
//BEC = -2/0/2 for ECC/B/ECA
virtual bool isGood(int bec) const =0;
+ virtual bool isGood(int bec, const EventContext& ctx) const =0;
private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_FlaggedConditionTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_FlaggedConditionTool.h
index 83551a2d7e0b776aa7c5978c292f124cfd4756d3..102d84e7b60c85da1eed2557150991c9e865d74b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_FlaggedConditionTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_FlaggedConditionTool.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
*/
/*
@@ -41,14 +41,18 @@ class ISCT_FlaggedConditionTool: virtual public ISCT_ConditionsTool {
/**Get the reason why the wafer is bad (by Identifier)*/
virtual const std::string& details(const Identifier& id) const =0;
+ virtual const std::string& details(const Identifier& id, const EventContext& ctx) const =0;
/**Get the reason why the wafer is bad (by IdentifierHash)*/
virtual const std::string& details(const IdentifierHash& id) const =0;
+ virtual const std::string& details(const IdentifierHash& id, const EventContext& ctx) const =0;
/**Get number flagged as bad (per event)*/
virtual int numBadIds() const =0;
+ virtual int numBadIds(const EventContext& ctx) const =0;
/**Get IdentifierHashs ofwafers flagged as bad + reason (per event)*/
virtual const SCT_FlaggedCondData* getBadIds() const =0;
+ virtual const SCT_FlaggedCondData* getBadIds(const EventContext& ctx) const =0;
private:
};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_MonitorConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_MonitorConditionsTool.h
index 73aa4faecf61ffc46c0161999e287f8cae56509f..47b59e7b1acfae4c4ea75a3d31b918b0ff1ea15f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_MonitorConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_MonitorConditionsTool.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
*/
/**
@@ -39,10 +39,13 @@ class ISCT_MonitorConditionsTool: virtual public ISCT_ConditionsTool {
/// Return a list of bad stip Identifiers
virtual void badStrips(std::set<Identifier>& strips) const =0;
+ virtual void badStrips(std::set<Identifier>& strips, const EventContext& ctx) const =0;
/// Return a list of bad stip Identifiers for a given module
virtual void badStrips(const Identifier& moduleId, std::set<Identifier>& strips) const =0;
+ virtual void badStrips(const Identifier& moduleId, std::set<Identifier>& strips, const EventContext& ctx) const =0;
/// Return a (space-separated) string of bad stip numbers (including hyphanated ranges) as they are written to the DB
virtual std::string badStripsAsString(const Identifier& moduleId) const =0;
+ virtual std::string badStripsAsString(const Identifier& moduleId, const EventContext& ctx) const =0;
private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibChipDataTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibChipDataTool.h
index 45da94c7b7d961b0d0e5dfb0063a06e3b617ab87..837c687e7a0be65a90764a548b14f86862def476 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibChipDataTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibChipDataTool.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
*/
/** @file ISCT_ReadCalibDataTool.h Interface file for SCT_ReadCalibDataTool.
@@ -29,7 +29,9 @@ class ISCT_ReadCalibChipDataTool: virtual public ISCT_ConditionsTool {
// Methods to return calibration data
//PJ change to wafer hash id?!
+ virtual std::vector<float> getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype, const EventContext& ctx) const =0; //!<Get NPtGain data per wafer
virtual std::vector<float> getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype) const =0; //!<Get NPtGain data per wafer
+ virtual std::vector<float> getNoiseOccupancyData(const Identifier& moduleId, const int side, const std::string& datatype, const EventContext& ctx) const =0; //!<Get NoiseOccupancy data wafer
virtual std::vector<float> getNoiseOccupancyData(const Identifier& moduleId, const int side, const std::string& datatype) const =0; //!<Get NoiseOccupancy data wafer
};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibDataTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibDataTool.h
index c1d706b931e581935466af25537ae7bbe2a86fde..a3f248c9084fa654ef154b5357a245ab31626943 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibDataTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ReadCalibDataTool.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
*/
/** @file ISCT_ReadCalibDataTool.h Interface file for SCT_ReadCalibDataTool.
@@ -42,6 +42,14 @@ class ISCT_ReadCalibDataTool: virtual public ISCT_ConditionsTool {
/// Creates the InterfaceID and interfaceID() method
DeclareInterfaceID(ISCT_ReadCalibDataTool, 1, 0);
+
+ // Methods to return calibration defect type and summary
+ virtual ISCT_ReadCalibDataTool::CalibDefectType defectType(const Identifier& stripId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const = 0; //!<Return summary of defect type and values for a strip
+ virtual ISCT_ReadCalibDataTool::CalibDefectType defectType(const Identifier& stripId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const = 0; //!<Return summary of defect type and values for a strip
+ virtual SCT_CalibDefectData::CalibModuleDefects defectsSummary(const Identifier& moduleId, const std::string& scan, const EventContext& ctx) const = 0; //!<Returns module summary of defect
+ virtual SCT_CalibDefectData::CalibModuleDefects defectsSummary(const Identifier& moduleId, const std::string& scan) const = 0; //!<Returns module summary of defect
+ virtual std::list<Identifier> defectList(const std::string& defect, const EventContext& ctx) const = 0; //!<Returns module summary of defect
+ virtual std::list<Identifier> defectList(const std::string& defect) const = 0; //!<Returns module summary of defect
};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_SensorsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_SensorsTool.h
index 204b88eb3476c843802aa4d25cbc4e17678f2993..d9e5fa2b6cfc68a0ff0adbfd1d57d891410209cc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_SensorsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_SensorsTool.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
*/
/**
@@ -17,6 +17,7 @@
#include <vector>
//Gaudi Includes
+#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/IAlgTool.h"
//fwd declarations
@@ -35,9 +36,13 @@ class ISCT_SensorsTool: virtual public IAlgTool {
DeclareInterfaceID(ISCT_SensorsTool, 1, 0);
///Fill vector with sensors info
+ virtual void getSensorsData(std::vector<std::string>& userVector, const EventContext& ctx) const =0;
virtual void getSensorsData(std::vector<std::string>& userVector) const =0;
+ virtual const SCT_SensorCondData* getSensorsData(const unsigned int truncatedSerialNumber, const EventContext& ctx) const =0;
virtual const SCT_SensorCondData* getSensorsData(const unsigned int truncatedSerialNumber) const =0;
+ virtual std::string getManufacturer(unsigned int truncatedSerialNumber, const EventContext& ctx) const =0;
virtual std::string getManufacturer(unsigned int truncatedSerialNumber) const =0;
+ virtual void printManufacturers(const EventContext& ctx) const =0;
virtual void printManufacturers() const =0;
};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
index 2d2fcabbf71cbcc91d8a847a01f1ddbaaa962b96..875b024272744d25aabf908c00a487d3b39f97a8 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
@@ -84,11 +84,9 @@ bool SCT_FlaggedConditionTool::isGood(const IdentifierHash& hashId) const {
// Retrieve the reason why the wafer is flagged as bad (by IdentifierHash)
// If wafer is not found return a null string
-const std::string& SCT_FlaggedConditionTool::details(const IdentifierHash& hashId) const {
+const std::string& SCT_FlaggedConditionTool::details(const IdentifierHash& hashId, const EventContext& ctx) const {
static const std::string nullString;
- const EventContext& ctx{Gaudi::Hive::currentContext()};
-
const SCT_FlaggedCondData* badIds{getCondData(ctx)};
if (badIds==nullptr) {
ATH_MSG_ERROR("SCT_FlaggedCondData cannot be retrieved. (details)");
@@ -99,16 +97,24 @@ const std::string& SCT_FlaggedConditionTool::details(const IdentifierHash& hashI
return ((itr != badIds->end()) ? (*itr).second : nullString);
}
+const std::string& SCT_FlaggedConditionTool::details(const IdentifierHash& hashId) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return details(hashId, ctx);
+}
+
// Retrieve the reason why the wafer is flagged as bad (by Identifier)
// If wafer is not found return a null string
-const std::string& SCT_FlaggedConditionTool::details(const Identifier& Id) const {
- const IdentifierHash hashId = m_sctID->wafer_hash(Id);
- return details(hashId);
+const std::string& SCT_FlaggedConditionTool::details(const Identifier& Id, const EventContext& ctx) const {
+ const IdentifierHash hashId{m_sctID->wafer_hash(Id)};
+ return details(hashId, ctx);
}
-int SCT_FlaggedConditionTool::numBadIds() const {
+const std::string& SCT_FlaggedConditionTool::details(const Identifier& Id) const {
const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return details(Id, ctx);
+}
+int SCT_FlaggedConditionTool::numBadIds(const EventContext& ctx) const {
const SCT_FlaggedCondData* badIds{getCondData(ctx)};
if (badIds==nullptr) {
ATH_MSG_ERROR("SCT_FlaggedCondData cannot be retrieved. (numBadIds)");
@@ -118,12 +124,20 @@ int SCT_FlaggedConditionTool::numBadIds() const {
return badIds->size();
}
-const SCT_FlaggedCondData* SCT_FlaggedConditionTool::getBadIds() const {
+int SCT_FlaggedConditionTool::numBadIds() const {
const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return numBadIds(ctx);
+}
+const SCT_FlaggedCondData* SCT_FlaggedConditionTool::getBadIds(const EventContext& ctx) const {
return getCondData(ctx);
}
+const SCT_FlaggedCondData* SCT_FlaggedConditionTool::getBadIds() const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return getBadIds(ctx);
+}
+
const SCT_FlaggedCondData* SCT_FlaggedConditionTool::getCondData(const EventContext& ctx) const {
SG::ReadHandle<SCT_FlaggedCondData> condData{m_badIds, ctx};
if (not condData.isValid()) {
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h
index b3ee3a21bcd3ecca4f8a145c37bf03f877c76b47..91390fdb162b926c0f41789befdf2e91bada0ee8 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h
@@ -49,14 +49,18 @@ public:
/**Get the reason why the wafer is bad (by Identifier)*/
virtual const std::string& details(const Identifier& id) const override;
+ virtual const std::string& details(const Identifier& id, const EventContext& ctx) const override;
/**Get the reason why the wafer is bad (by IdentifierHash)*/
virtual const std::string& details(const IdentifierHash& id) const override;
+ virtual const std::string& details(const IdentifierHash& id, const EventContext& ctx) const override;
/**Get number flagged as bad (per event)*/
virtual int numBadIds() const override;
+ virtual int numBadIds(const EventContext& ctx) const override;
/**Get IdentifierHashs ofwafers flagged as bad + reason (per event)*/
virtual const SCT_FlaggedCondData* getBadIds() const override;
+ virtual const SCT_FlaggedCondData* getBadIds(const EventContext& ctx) const override;
private:
SG::ReadHandleKey<SCT_FlaggedCondData> m_badIds;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.cxx
index 34b56190bd5b22b7487026b9f3a721c4f0350c3a..221af3b3a12aee8cde6fe7c1faa1fe62c8a14ebd 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.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 "SCT_MajorityConditionsTool.h"
@@ -43,8 +43,7 @@ StatusCode SCT_MajorityConditionsTool::finalize() {
}
// Is the detector good?
-bool SCT_MajorityConditionsTool::isGood() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
+bool SCT_MajorityConditionsTool::isGood(const EventContext& ctx) const {
const SCT_MajorityCondData* condData{getCondData(ctx)};
if (condData==nullptr) return false;
@@ -58,9 +57,13 @@ bool SCT_MajorityConditionsTool::isGood() const {
}
}
-// Is a barrel/endcap good?
-bool SCT_MajorityConditionsTool::isGood(int bec) const {
+bool SCT_MajorityConditionsTool::isGood() const {
const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return isGood(ctx);
+}
+
+// Is a barrel/endcap good?
+bool SCT_MajorityConditionsTool::isGood(int bec, const EventContext& ctx) const {
const SCT_MajorityCondData* condData{getCondData(ctx)};
if (condData==nullptr) return false;
@@ -81,6 +84,11 @@ bool SCT_MajorityConditionsTool::isGood(int bec) const {
return result;
}
+bool SCT_MajorityConditionsTool::isGood(int bec) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return isGood(bec, ctx);
+}
+
const SCT_MajorityCondData* SCT_MajorityConditionsTool::getCondData(const EventContext& ctx) const {
static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
EventContext::ContextID_t slot{ctx.slot()};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.h
index a23f1ba804344a9f299dddfe01a34f4c209eefae..85812a8e28bbcf95f90f9210426e3efadbc4fad5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.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
*/
/**
@@ -47,10 +47,12 @@ class SCT_MajorityConditionsTool: public extends<AthAlgTool, ISCT_DetectorLevelC
//@}
/**Is the detector good?*/
- virtual bool isGood() const override;
+ virtual bool isGood() const override;
+ virtual bool isGood(const EventContext& ctx) const override;
/**Is a barrel/endcap good?*/
- virtual bool isGood(int bec) const override;
+ virtual bool isGood(int bec) const override;
+ virtual bool isGood(int bec, const EventContext& ctx) const override;
private:
bool m_overall; //!< Use overall vvalue or ECA/B/ECC
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx
index 91fdba0a24d6285f830c04fb08ff501b869066d2..7ed31c67d28bce7c4246d56591696d98e6f853ae 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx
@@ -133,24 +133,28 @@ SCT_MonitorConditionsTool::isGood(const IdentifierHash& hashId) const {
//////////////////////////////////////////////////////////////////////////////////////////
-void
-SCT_MonitorConditionsTool::badStrips(std::set<Identifier>& strips) const {
+void
+SCT_MonitorConditionsTool::badStrips(std::set<Identifier>& strips, const EventContext& ctx) const {
// Set of bad strip Identifers for all modules
SCT_ID::const_id_iterator waferItr{m_pHelper->wafer_begin()}, waferEnd{m_pHelper->wafer_end()};
// Loop over modules (side-0 of wafers)
for (; waferItr != waferEnd; ++waferItr) {
if (m_pHelper->side(*waferItr) != 0) continue;
Identifier moduleId{m_pHelper->module_id(*waferItr)};
- badStrips(moduleId, strips);
+ badStrips(moduleId, strips, ctx);
}
}
-//////////////////////////////////////////////////////////////////////////////////////////
-
void
-SCT_MonitorConditionsTool::badStrips(const Identifier& moduleId, std::set<Identifier>& strips) const {
+SCT_MonitorConditionsTool::badStrips(std::set<Identifier>& strips) const {
const EventContext& ctx{Gaudi::Hive::currentContext()};
+ badStrips(strips, ctx);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+void
+SCT_MonitorConditionsTool::badStrips(const Identifier& moduleId, std::set<Identifier>& strips, const EventContext& ctx) const {
// Set of bad strip Identifers for a given module
// Get defect string and check it is sensible, i.e. non-empty and contains numbers
std::string defectStr{getList(moduleId, ctx)};
@@ -178,13 +182,23 @@ SCT_MonitorConditionsTool::badStrips(const Identifier& moduleId, std::set<Identi
}
}
+void
+SCT_MonitorConditionsTool::badStrips(const Identifier& moduleId, std::set<Identifier>& strips) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return badStrips(moduleId, strips, ctx);
+}
+
//////////////////////////////////////////////////////////////////////////////////////////
std::string
+SCT_MonitorConditionsTool::badStripsAsString(const Identifier& moduleId, const EventContext& ctx) const {
+ return getList(moduleId, ctx);
+}
+
+std::string
SCT_MonitorConditionsTool::badStripsAsString(const Identifier& moduleId) const {
const EventContext& ctx{Gaudi::Hive::currentContext()};
-
- return getList(moduleId, ctx);
+ return badStripsAsString(moduleId, ctx);
}
///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h
index a8f97efd874165a24a5fe1e7f7e531b8e96eaef3..98836cc3e6e40b598ee28519fccb6ef8daf64b84 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h
@@ -56,12 +56,15 @@ public:
/// List of bad strip Identifiers
virtual void badStrips(std::set<Identifier>& strips) const override;
+ virtual void badStrips(std::set<Identifier>& strips, const EventContext& ctx) const override;
/// List of bad strip Identifiers for a given module
virtual void badStrips(const Identifier& moduleId, std::set<Identifier>& strips) const override;
+ virtual void badStrips(const Identifier& moduleId, std::set<Identifier>& strips, const EventContext& ctx) const override;
/// String of bad strip numbers for a given module
virtual std::string badStripsAsString(const Identifier& moduleId) const override;
+ virtual std::string badStripsAsString(const Identifier& moduleId, const EventContext& ctx) const override;
private:
// ------------------------------------------------------------------------------------
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
index 778c507e99434bbbd6fb1eab57f8b5950512d44c..1fc982a8a4f6173053d09004320cee6b5ca9d7d2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
@@ -132,13 +132,12 @@ SCT_ReadCalibChipDataTool::isGood(const Identifier& elementId, InDetConditions::
//----------------------------------------------------------------------
std::vector<float>
-SCT_ReadCalibChipDataTool::getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype) const {
+SCT_ReadCalibChipDataTool::getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype, const EventContext& ctx) const {
// Print where you are
ATH_MSG_DEBUG("in getNPtGainData()");
std::vector<float> waferData;
// Retrieve SCT_GainCalibData pointer
- const EventContext& ctx{Gaudi::Hive::currentContext()};
const SCT_GainCalibData* condDataGain{getCondDataGain(ctx)};
if (condDataGain==nullptr) {
ATH_MSG_ERROR("In getNPtGainData, SCT_GainCalibData cannot be retrieved");
@@ -174,15 +173,20 @@ SCT_ReadCalibChipDataTool::getNPtGainData(const Identifier& moduleId, const int
}
} //SCT_ReadCalibChipDataTool::getNPtGainData()
+std::vector<float>
+SCT_ReadCalibChipDataTool::getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return getNPtGainData(moduleId, side, datatype, ctx);
+}
+
//----------------------------------------------------------------------
std::vector<float>
-SCT_ReadCalibChipDataTool::getNoiseOccupancyData(const Identifier& moduleId, const int side, const std::string& datatype) const {
+SCT_ReadCalibChipDataTool::getNoiseOccupancyData(const Identifier& moduleId, const int side, const std::string& datatype, const EventContext& ctx) const {
// Print where you are
ATH_MSG_DEBUG("in getNoiseOccupancyData()");
std::vector<float> waferData;
// Retrieve SCT_NoiseCalibData pointer
- const EventContext& ctx{Gaudi::Hive::currentContext()};
const SCT_NoiseCalibData* condDataNoise{getCondDataNoise(ctx)};
if (condDataNoise==nullptr) {
ATH_MSG_ERROR("In getNPtNoiseData, SCT_NoiseCalibData cannot be retrieved");
@@ -217,6 +221,12 @@ SCT_ReadCalibChipDataTool::getNoiseOccupancyData(const Identifier& moduleId, con
}
} // SCT_ReadCalibChipDataTool::getNoiseOccupancyData()
+std::vector<float>
+SCT_ReadCalibChipDataTool::getNoiseOccupancyData(const Identifier& moduleId, const int side, const std::string& datatype) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return getNoiseOccupancyData(moduleId, side, datatype, ctx);
+}
+
int
SCT_ReadCalibChipDataTool::nPtGainIndex(const std::string& dataName) const {
int i{N_NPTGAIN};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h
index 29d53f8921b11bef95e77db10c919f18b60a8513..3d9347530df3c889f39ca77c54d0159ee55894b8 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h
@@ -49,15 +49,17 @@ class SCT_ReadCalibChipDataTool: public extends<AthAlgTool, ISCT_ReadCalibChipDa
///Return whether this service can report on the hierarchy level (e.g. module, chip...)
virtual bool canReportAbout(InDetConditions::Hierarchy h) const override;
///Summarise the result from the service as good/bad
- virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+ virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
///same thing with id hash, introduced by shaun with dummy method for now
- virtual bool isGood(const IdentifierHash& hashId) const override;
virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
+ virtual bool isGood(const IdentifierHash& hashId) const override;
//@}
// Methods to return calibration data
+ virtual std::vector<float> getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype, const EventContext& ctx) const override; //!<Get NPtGain data per wafer
virtual std::vector<float> getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype) const override; //!<Get NPtGain data per wafer
+ virtual std::vector<float> getNoiseOccupancyData(const Identifier& moduleId, const int side, const std::string& datatype, const EventContext& ctx) const override; //!<Get NoiseOccupancy data wafer
virtual std::vector<float> getNoiseOccupancyData(const Identifier& moduleId, const int side, const std::string& datatype) const override; //!<Get NoiseOccupancy data wafer
private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
index d617bd637be5ba659850421b6e383a3b308e56ed..7a485aea20042882be3b2ab9f249279aea97c411 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
@@ -122,7 +122,7 @@ bool SCT_ReadCalibDataTool::isGood(const Identifier& elementId, InDetConditions:
//----------------------------------------------------------------------
// Returns a defect summary of a defect strip, scan, type and value
-SCT_ReadCalibDataTool::CalibDefectType SCT_ReadCalibDataTool::defectType(const Identifier& stripId, InDetConditions::Hierarchy h) const {
+ISCT_ReadCalibDataTool::CalibDefectType SCT_ReadCalibDataTool::defectType(const Identifier& stripId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
// Print where you are
ATH_MSG_DEBUG("in defectType()");
@@ -130,7 +130,6 @@ SCT_ReadCalibDataTool::CalibDefectType SCT_ReadCalibDataTool::defectType(const I
CalibDefectType theseSummaryDefects;
// Retrieve defect data
- const EventContext& ctx{Gaudi::Hive::currentContext()};
const SCT_CalibDefectData* condDataGain{getCondDataGain(ctx)};
if (condDataGain==nullptr) {
ATH_MSG_ERROR("In defectType, SCT_CalibDefectData (gain) cannot be retrieved.");
@@ -232,14 +231,16 @@ SCT_ReadCalibDataTool::CalibDefectType SCT_ReadCalibDataTool::defectType(const I
return theseSummaryDefects;
} //SCT_ReadCalibDataTool::defectType()
+ISCT_ReadCalibDataTool::CalibDefectType SCT_ReadCalibDataTool::defectType(const Identifier& stripId, InDetConditions::Hierarchy h) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return defectType(stripId, ctx, h);
+}
//----------------------------------------------------------------------
// Returns a summary of all defects on a module for a given scan
-SCT_CalibDefectData::CalibModuleDefects SCT_ReadCalibDataTool::defectsSummary(const Identifier& moduleId, const std::string& scan) const {
+SCT_CalibDefectData::CalibModuleDefects SCT_ReadCalibDataTool::defectsSummary(const Identifier& moduleId, const std::string& scan, const EventContext& ctx) const {
// Create pointer to the CalibDataDefect object
SCT_CalibDefectData::CalibModuleDefects wantedDefects;
- const EventContext& ctx{Gaudi::Hive::currentContext()};
-
// Retrieve the correct defect map
if (scan == "NPtGain") {
const SCT_CalibDefectData* condDataGain{getCondDataGain(ctx)};
@@ -262,14 +263,18 @@ SCT_CalibDefectData::CalibModuleDefects SCT_ReadCalibDataTool::defectsSummary(co
return wantedDefects;
} //SCT_ReadCalibDataTool::defectsSummary()
+SCT_CalibDefectData::CalibModuleDefects SCT_ReadCalibDataTool::defectsSummary(const Identifier& moduleId, const std::string& scan) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return defectsSummary(moduleId, scan, ctx);
+}
+
//----------------------------------------------------------------------
//----------------------------------------------------------------------
// Returns a list of all strips with a certain defects
-std::list<Identifier> SCT_ReadCalibDataTool::defectList(const std::string& defect) const {
+std::list<Identifier> SCT_ReadCalibDataTool::defectList(const std::string& defect, const EventContext& ctx) const {
std::list<Identifier> defectList;
// Retrieve defect data
- const EventContext& ctx{Gaudi::Hive::currentContext()};
const SCT_CalibDefectData* condDataGain{getCondDataGain(ctx)};
if (condDataGain==nullptr) {
ATH_MSG_ERROR("In defectType, SCT_CalibDefectData (gain) cannot be retrieved.");
@@ -352,6 +357,11 @@ std::list<Identifier> SCT_ReadCalibDataTool::defectList(const std::string& defec
}
return defectList;
} //SCT_ReadCalibDataTool::defects()
+
+std::list<Identifier> SCT_ReadCalibDataTool::defectList(const std::string& defect) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return defectList(defect, ctx);
+}
//----------------------------------------------------------------------
const SCT_CalibDefectData*
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h
index 41ce81b292581f58b3d23a9e5138dfbcd0db18e0..338f2d2af7b54c3649b39207d88f1757da120da8 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h
@@ -64,9 +64,12 @@ class SCT_ReadCalibDataTool: public extends<AthAlgTool, ISCT_ReadCalibDataTool>
//@}
// Methods to return calibration defect type and summary
- virtual SCT_ReadCalibDataTool::CalibDefectType defectType(const Identifier& stripId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const; //!<Return summary of defect type and values for a strip
- virtual SCT_CalibDefectData::CalibModuleDefects defectsSummary(const Identifier& moduleId, const std::string& scan) const; //!<Returns module summary of defect
- virtual std::list<Identifier> defectList(const std::string& defect) const; //!<Returns module summary of defect
+ virtual ISCT_ReadCalibDataTool::CalibDefectType defectType(const Identifier& stripId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override; //!<Return summary of defect type and values for a strip
+ virtual ISCT_ReadCalibDataTool::CalibDefectType defectType(const Identifier& stripId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override; //!<Return summary of defect type and values for a strip
+ virtual SCT_CalibDefectData::CalibModuleDefects defectsSummary(const Identifier& moduleId, const std::string& scan, const EventContext& ctx) const override; //!<Returns module summary of defect
+ virtual SCT_CalibDefectData::CalibModuleDefects defectsSummary(const Identifier& moduleId, const std::string& scan) const override; //!<Returns module summary of defect
+ virtual std::list<Identifier> defectList(const std::string& defect, const EventContext& ctx) const override; //!<Returns module summary of defect
+ virtual std::list<Identifier> defectList(const std::string& defect) const override; //!<Returns module summary of defect
private:
// Mutex to protect the contents.
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.cxx
index 55ffb28e1e575a2869bfaa358d46dd01299e21d5..01f4e9e20d7f8b0ea619a342166de8f1c66ba084 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.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
*/
/**
@@ -32,8 +32,7 @@ StatusCode SCT_SensorsTool::finalize() {
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-const SCT_SensorCondData* SCT_SensorsTool::getSensorsData(const unsigned int truncatedSerialNumber) const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
+const SCT_SensorCondData* SCT_SensorsTool::getSensorsData(const unsigned int truncatedSerialNumber, const EventContext& ctx) const {
const SCT_SensorsCondData* condData{getCondData(ctx)};
if (condData==nullptr) return nullptr;
@@ -42,14 +41,23 @@ const SCT_SensorCondData* SCT_SensorsTool::getSensorsData(const unsigned int tru
return nullptr;
}
-void SCT_SensorsTool::getSensorsData(std::vector<std::string>& /*userVector*/) const {
+const SCT_SensorCondData* SCT_SensorsTool::getSensorsData(const unsigned int truncatedSerialNumber) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return getSensorsData(truncatedSerialNumber, ctx);
+}
+
+void SCT_SensorsTool::getSensorsData(std::vector<std::string>& /*userVector*/, const EventContext& /*ctx*/) const {
ATH_MSG_WARNING("This void SCT_SensorsTool::getSensorsData(std::vector<std::string>& userVector) method is not implemented.");
}
-std::string SCT_SensorsTool::getManufacturer(unsigned int truncatedSerialNumber) const {
+void SCT_SensorsTool::getSensorsData(std::vector<std::string>& userVector) const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ getSensorsData(userVector, ctx);
+}
+
+std::string SCT_SensorsTool::getManufacturer(unsigned int truncatedSerialNumber, const EventContext& ctx) const {
std::string manufacturer{""};
- const EventContext& ctx{Gaudi::Hive::currentContext()};
const SCT_SensorsCondData* condData{getCondData(ctx)};
if (condData==nullptr) return manufacturer;
@@ -60,8 +68,12 @@ std::string SCT_SensorsTool::getManufacturer(unsigned int truncatedSerialNumber)
return manufacturer;
}
-void SCT_SensorsTool::printManufacturers() const {
+std::string SCT_SensorsTool::getManufacturer(unsigned int truncatedSerialNumber) const {
const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return getManufacturer(truncatedSerialNumber, ctx);
+}
+
+void SCT_SensorsTool::printManufacturers(const EventContext& ctx) const {
const SCT_SensorsCondData* condData{getCondData(ctx)};
if (condData==nullptr) return;
@@ -70,6 +82,11 @@ void SCT_SensorsTool::printManufacturers() const {
}
}
+void SCT_SensorsTool::printManufacturers() const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return printManufacturers(ctx);
+}
+
const SCT_SensorsCondData*
SCT_SensorsTool::getCondData(const EventContext& ctx) const {
static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.h
index 764e3ae33282df106d81caec0820519f3017bf3b..85a0a5e74709be0eee0c1859bcca22e6e292e1b8 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SensorsTool.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
*/
/**
@@ -19,7 +19,6 @@
#include "SCT_ConditionsTools/ISCT_SensorsTool.h"
//Gaudi includes
-#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/ContextSpecificPtr.h"
//Athena includes
@@ -42,9 +41,13 @@ class SCT_SensorsTool: public extends<AthAlgTool, ISCT_SensorsTool> {
virtual StatusCode finalize() override;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ virtual void getSensorsData(std::vector<std::string>& userVector, const EventContext& ctx) const override;
virtual void getSensorsData(std::vector<std::string>& userVector) const override;
+ virtual const SCT_SensorCondData* getSensorsData(const unsigned int truncatedSerialNumber, const EventContext& ctx) const override;
virtual const SCT_SensorCondData* getSensorsData(const unsigned int truncatedSerialNumber) const override;
+ virtual std::string getManufacturer(unsigned int truncatedSerialNumber, const EventContext& ctx) const override;
virtual std::string getManufacturer(unsigned int truncatedSerialNumber) const override;
+ virtual void printManufacturers(const EventContext& ctx) const override;
virtual void printManufacturers() const override;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt b/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt
index 7056053fc9d2f61de822051be4ae64d8a79c84d6..60941cb9e8d48c3281c17698a440f63bdeb7caf0 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/StoreGate
DetectorDescription/GeoPrimitives
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/SiPropertiesSvc
InnerDetector/InDetConditions/PixelConditionsData
InnerDetector/InDetConditions/PixelConditionsTools
@@ -33,7 +33,7 @@ atlas_add_component( SiLorentzAngleSvc
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GeoPrimitives GaudiKernel InDetCondServices SiPropertiesSvcLib MagFieldInterfaces AthenaPoolUtilities Identifier InDetIdentifier InDetReadoutGeometry )
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GeoPrimitives GaudiKernel InDetCondTools SiPropertiesSvcLib MagFieldInterfaces AthenaPoolUtilities Identifier InDetIdentifier InDetReadoutGeometry )
# Install files from the package:
atlas_install_headers( SiLorentzAngleSvc )
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h
index ad1002715337809a6b5acc84f250cca5c44a5782..37a02d769139f2022087f005a1828a89a13ea67f 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.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
*/
/**
@@ -9,7 +9,7 @@
#ifndef SiLorentzAngleTool_h
#define SiLorentzAngleTool_h
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GeoPrimitives/GeoPrimitives.h"
diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt
index 40aebd365680c5b4545a98517b82601b8a8c8e50..822ee20df036b7aaf070fec5eeb4e89382be3ef0 100644
--- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoPrimitives
DetectorDescription/Identifier
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetDetDescr/InDetIdentifier
Tracking/TrkDetDescr/TrkDetElementBase
Tracking/TrkDetDescr/TrkSurfaces
@@ -37,6 +37,6 @@ atlas_add_library( InDetReadoutGeometry
PUBLIC_HEADERS InDetReadoutGeometry
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaKernel AtlasDetDescr GeoModelUtilities GeoPrimitives Identifier GaudiKernel InDetCondServices InDetIdentifier TrkDetElementBase TrkSurfaces TrkEventPrimitives StoreGateLib SGtests AthenaBaseComps DetDescrConditions
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaKernel AtlasDetDescr GeoModelUtilities GeoPrimitives Identifier GaudiKernel InDetCondTools InDetIdentifier TrkDetElementBase TrkSurfaces TrkEventPrimitives StoreGateLib SGtests AthenaBaseComps DetDescrConditions
PRIVATE_LINK_LIBRARIES AthenaPoolUtilities IdDictDetDescr TRT_ConditionsData )
diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiCommonItems.h b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiCommonItems.h
index 99d2b50e97d81be1ad38ee3c239ad7f0fb2bacae..a50148bad4d80ec58387813acdbd5214aa139d78 100755
--- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiCommonItems.h
+++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiCommonItems.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
*/
///////////////////////////////////////////////////////////////////
@@ -19,7 +19,7 @@ class AtlasDetectorID;
#include "CLHEP/Geometry/Transform3D.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "GeoModelKernel/RCBase.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
namespace InDetDD {
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
index 6718e6b69827f786da3bab532b0c64be0ffe0d69..27c9c4eb52403a044bc4e1a34986a50e6a350e51 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
@@ -23,7 +23,6 @@ atlas_depends_on_subdirs(
Control/StoreGate
DetectorDescription/DetDescrCond/DetDescrConditions
DetectorDescription/GeometryDBSvc
- InnerDetector/InDetConditions/InDetCondServices
InnerDetector/InDetDetDescr/InDetIdentifier )
# External dependencies:
@@ -39,7 +38,7 @@ atlas_add_library( PixelGeoModelLib
GeoModelUtilities Identifier GaudiKernel InDetGeoModelUtils
InDetReadoutGeometry
PRIVATE_LINK_LIBRARIES SGTools StoreGateLib DetDescrConditions
- InDetCondServices InDetIdentifier
+ InDetIdentifier
PRIVATE_DEFINITIONS "-DGEOTORUS=1" )
atlas_add_component( PixelGeoModel
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt
index 24ba4ff519969bfafea1a48e8b699d41ad957903..9c94d3669e60d52d1637008f09d1a95f989424a1 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/CMakeLists.txt
@@ -20,7 +20,6 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeometryDBSvc
DetectorDescription/GeoPrimitives
- InnerDetector/InDetConditions/InDetCondServices
InnerDetector/InDetDetDescr/InDetIdentifier )
# External dependencies:
@@ -34,5 +33,5 @@ atlas_add_component( SCT_SLHC_GeoModel
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities Identifier GaudiKernel InDetGeoModelUtils InDetReadoutGeometry SGTools StoreGateLib SGtests InDetCondServices InDetIdentifier )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities Identifier GaudiKernel InDetGeoModelUtils InDetReadoutGeometry SGTools StoreGateLib SGtests InDetIdentifier )
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
index ec3de863305e19e93ae44a9c2f7153e6d1ca5d81..f7726b75231fe197679e9d65b8db603bb2a558bc 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
Event/xAOD/xAODEventInfo
GaudiKernel
InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/PixelConditionsServices
InnerDetector/InDetConditions/PixelConditionsTools
InnerDetector/InDetDetDescr/InDetReadoutGeometry
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
index 2424c34d47b6dcec342cf295d88149d9aafaa3fb..d3685659523563497cef011f2c7c38306e54c700 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.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
*/
///////////////////////////////////////////////////////////////////
@@ -32,7 +32,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include <string>
#include <vector>
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h
index 03c11185f619542a795b015d9bd2701d5802908e..2a39bfccfdcae061471e6c7c11fcbbb0d9059f64 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h
@@ -2,7 +2,7 @@
/*
- 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 FASTSIDIGITZATION_SCT_FASTDIGITZATIONTOOL_H
@@ -36,7 +36,7 @@
#include "StoreGate/WriteHandle.h"
#include "StoreGate/ReadCondHandleKey.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
// Gaudi
#include "GaudiKernel/ToolHandle.h"
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.h
index 1c0e8df06ad043e3041a4535472c81388cf9089b..61cfc3ea257bc0bb7a5d9eb40dd0702ccf2fce86 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.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
*/
///////////////////////////////////////////////////////////////////
@@ -19,7 +19,6 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/AlgTool.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
#include "xAODEventInfo/EventInfo.h"
#include "xAODEventInfo/EventAuxInfo.h"
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
index 89114291239d7145fc35e3419036f3431563961b..9b3942fdc9190ca9f4b00e4f963cb2e94f70997e 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
@@ -18,6 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/Identifier
Generators/GeneratorObjects
InnerDetector/InDetConditions/InDetConditionsSummaryService
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/PixelConditionsServices
InnerDetector/InDetConditions/PixelConditionsTools
InnerDetector/InDetConditions/PixelConditionsData
@@ -41,7 +42,7 @@ atlas_add_component( PixelDigitization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel CommissionEvent AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier xAODEventInfo GeneratorObjects PixelConditionsData SiPropertiesSvcLib InDetIdentifier InDetReadoutGeometry SiDigitization InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel CommissionEvent AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier xAODEventInfo GeneratorObjects InDetCondTools PixelConditionsData SiPropertiesSvcLib InDetIdentifier InDetReadoutGeometry SiDigitization InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver )
# Install files from the package:
atlas_install_headers( PixelDigitization )
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.h
index 082c08b611f7b33783553af68e6f260ee4d8f718..3e6afd6c7d0409424773f7510f713db4ec4c5c26 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.h
@@ -21,7 +21,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "SensorSimTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
class SensorSimPlanarTool : public SensorSimTool {
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt
index 68b6075f91f890e78af41b956f26a03cf000c3b4..1a9b4a94d57937d3a102d7ab9a8d8c10cb0df15c 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt
@@ -18,6 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/Identifier
Generators/GeneratorObjects
InnerDetector/InDetConditions/InDetConditionsSummaryService
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/PixelConditionsServices
InnerDetector/InDetConditions/PixelConditionsTools
InnerDetector/InDetConditions/SiPropertiesSvc
@@ -40,7 +41,7 @@ atlas_add_component( PixelRadDamDigitization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel CommissionEvent AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier xAODEventInfo GeneratorObjects PixelConditionsData SiPropertiesSvcLib InDetIdentifier InDetReadoutGeometry SiDigitization InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel CommissionEvent AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier xAODEventInfo GeneratorObjects InDetCondTools PixelConditionsData SiPropertiesSvcLib InDetIdentifier InDetReadoutGeometry SiDigitization InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.h b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.h
index e08b590993dd002bcf1bfc089d9884a5a1d689a2..7c6a964566ee407ac0e75cf5b9eac19eacf20104 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.h
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.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
*/
///////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/WriteHandle.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "SensorSimTool.h"
#include "RadDamageUtil.h"
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
index f37e9e6cd52eabbf4edb9c2646da6f0e4aaf5630..fecb6927f58b0ea2254474c1d00b202b52317607 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/Identifier
Event/xAOD/xAODEventInfo
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetDigitization/SiDigitization
InnerDetector/InDetRawEvent/InDetRawData
InnerDetector/InDetSimEvent
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DetailedSurfaceChargesGenerator.h b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DetailedSurfaceChargesGenerator.h
index 7e46ea417a66c19f25404b6754143c47486ffd22..cbfc68d0f536db51fadc9d7605c00c3348c227cd 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DetailedSurfaceChargesGenerator.h
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DetailedSurfaceChargesGenerator.h
@@ -19,7 +19,7 @@
// Athena
#include "InDetConditionsSummaryService/ISiliconConditionsTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "SCT_ModuleDistortions/ISCT_ModuleDistortionsTool.h"
#include "SiPropertiesSvc/ISiPropertiesTool.h"
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h
index f0901e01d74e93f3881a4372d9ea633d4004d38e..8805bef34c1be9a6171af2cdbdc388dc1f22ca90 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_SurfaceChargesGenerator.h
@@ -36,7 +36,7 @@
#include "Identifier/IdentifierHash.h"
#include "InDetConditionsSummaryService/ISiliconConditionsTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "SCT_ConditionsTools/ISCT_RadDamageSummaryTool.h"
#include "SCT_ModuleDistortions/ISCT_ModuleDistortionsTool.h"
#include "SiPropertiesSvc/ISiPropertiesTool.h"
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProvider.h b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProvider.h
index f65f1fb696bf7986bdc266c3928c5284a8d34172..24711286e298554010d5a38d3bc0a57837c2c7a3 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProvider.h
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/BCM_RawDataByteStreamCnv/BCM_RawDataProvider.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
*/
///////////////////////////////////////////////////////////////////
@@ -9,7 +9,9 @@
#ifndef BCM_RAWDATABYTESTREAMCNV_BCM_RAWDATAPROVIDER_H
#define BCM_RAWDATABYTESTREAMCNV_BCM_RAWDATAPROVIDER_H
+#include "InDetBCM_RawData/BCM_RDO_Container.h"
#include "AthenaBaseComps/AthAlgorithm.h"
+#include "StoreGate/WriteHandleKey.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -24,23 +26,24 @@ public:
BCM_RawDataProvider(const std::string &name, ISvcLocator *pSvcLocator);
//! Initialize
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
//! Execute
- virtual StatusCode execute();
+ virtual StatusCode execute() override;
//! Finalize
- virtual StatusCode finalize()
+ virtual StatusCode finalize() override
{ return StatusCode::SUCCESS; }
//! Destructor
- ~BCM_RawDataProvider();
+ virtual ~BCM_RawDataProvider();
private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
ToolHandle<BCM_RawDataProviderTool> m_rawDataTool;
- std::string m_RDO_Key;
+ SG::WriteHandleKey<BCM_RDO_Container> m_RDO_Key
+ { this, "RDOKey", "BDM_RDOs", "" };
};
#endif
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx
index 4d0e686abe16f9929048cf1e91f889ae45c784f6..b0a77102748bd1f8d70cb5e8abccd41a02af049d 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.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
*/
///////////////////////////////////////////////////////////////////
@@ -29,7 +29,6 @@ BCM_RawDataProvider::BCM_RawDataProvider(const std::string& name, ISvcLocator* p
m_robDataProvider ("ROBDataProviderSvc",name),
m_rawDataTool ("BCM_RawDataProviderTool")
{
- declareProperty ("RDOKey" , m_RDO_Key = "BCM_RDOs");
declareProperty ("ProviderTool", m_rawDataTool);
}
@@ -59,6 +58,8 @@ StatusCode BCM_RawDataProvider::initialize() {
return StatusCode::FAILURE;
} else
if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endmsg;
+
+ ATH_CHECK( m_RDO_Key.initialize() );
return StatusCode::SUCCESS;
}
@@ -69,11 +70,7 @@ StatusCode BCM_RawDataProvider::initialize() {
StatusCode BCM_RawDataProvider::execute() {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Create BCM RDO Container" << endmsg;
- BCM_RDO_Container *container = new BCM_RDO_Container();
- if (evtStore()->record(container, m_RDO_Key).isFailure()) {
- if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Unable to record BCM RDO Container" << endmsg;
- return StatusCode::FAILURE;
- }
+ auto container = std::make_unique<BCM_RDO_Container>();
// ask ROBDataProviderSvc for the vector of ROBFragment for all BCM ROBIDs
// std::vector<const ROBFragment*> listOfRobf_all;
@@ -113,11 +110,13 @@ StatusCode BCM_RawDataProvider::execute() {
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Number of ROB fragments is " << listOfRobf.size() << endmsg;
// ask BCM_RawDataProviderTool to decode it and to fill the container
- if (m_rawDataTool->convert(listOfRobf,container).isFailure())
+ if (m_rawDataTool->convert(listOfRobf,container.get()).isFailure())
if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BS conversion into RDOs failed" << endmsg;
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Number of collections in container is " << container->size() << endmsg;
+ ATH_CHECK( SG::makeHandle (m_RDO_Key).record (std::move (container)) );
+
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetJiveXML/CMakeLists.txt
index b5ef6dfcfcaa5f336564c78dd6de2eafad8cc9d0..e013315e028acfb689d396154acdb084be6b7bab 100644
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/CMakeLists.txt
@@ -20,6 +20,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthContainers
DetectorDescription/IdDictDetDescr
InnerDetector/InDetConditions/InDetBeamSpotService
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecEvent/InDetPrepRawData
@@ -34,7 +35,7 @@ atlas_add_component( InDetJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GaudiKernel InDetRawData TrkSpacePoint TrkTruthData VxVertex JiveXMLLib AthContainers IdDictDetDescr InDetIdentifier InDetReadoutGeometry InDetPrepRawData TrkEventPrimitives TrkPrepRawData )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GaudiKernel InDetRawData TrkSpacePoint TrkTruthData VxVertex JiveXMLLib AthContainers IdDictDetDescr InDetCondTools InDetIdentifier InDetReadoutGeometry InDetPrepRawData TrkEventPrimitives TrkPrepRawData )
# Install files from the package:
atlas_install_headers( InDetJiveXML )
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h
index 6ce628058d550295923daeba5151c7ba9c974b19..84749f37d66b4c12fe67a28783ac35a5e9e2e0e6 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h
@@ -1,11 +1,11 @@
/*
- 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 JIVEXML_PIXELRDORETRIEVER_H
#define JIVEXML_PIXELRDORETRIEVER_H
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "JiveXML/IDataRetriever.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "InDetJiveXML/IInDetGeoModelTool.h"
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/SCTRDORetriever.h b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/SCTRDORetriever.h
index 8f0b17c98359828370b09d601677d28332d83f09..46f0de3eeac50a0fc3bd63230604c46a5124e04e 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/SCTRDORetriever.h
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/SCTRDORetriever.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 JIVEXML_SCTRDORETRIEVER_H
@@ -8,7 +8,7 @@
#include "JiveXML/IDataRetriever.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "InDetJiveXML/IInDetGeoModelTool.h"
#include "InDetRawData/SCT_RDO_Container.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
index 34e9f8ce7c64ef059b8f0b534e88c489f308b77d..6a7636385a56fc6261c0617a834b274ceff2bb66 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
Event/xAOD/xAODTracking
InnerDetector/InDetConditions/PixelConditionsServices
InnerDetector/InDetConditions/PixelConditionsTools
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/TRT_ConditionsServices
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
index 4da9f38575cebcf5ce94e244f6d6deee7008eef7..70bf8f9f1886a3c884a13729ce6c74b4cb573c5b 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.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
*/
///////////////////////////////////////////////////////////////////
@@ -21,7 +21,7 @@
#include "xAODTracking/TrackMeasurementValidationContainer.h"
#include "PixelConditionsTools/IPixelDCSConditionsTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "PixelConditionsServices/IPixelByteStreamErrorsSvc.h"
#include "PixelConditionsServices/IPixelCalibSvc.h"
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt b/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt
index 5838021b61e94d80818720bfb0c224498ae62066..710d5e6e321eab1a15452d3d6ce5ea490d87b293 100644
--- a/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/Identifier
DetectorDescription/RegionSelector
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/InDetConditionsSummaryService
InnerDetector/InDetConditions/SiPropertiesSvc
InnerDetector/InDetDetDescr/InDetIdentifier
@@ -29,7 +29,7 @@ atlas_add_component( InDetDetDescrExample
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GeoPrimitives Identifier RegionSelectorLib GaudiKernel InDetCondServices SiPropertiesSvcLib InDetIdentifier InDetReadoutGeometry )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GeoPrimitives Identifier RegionSelectorLib GaudiKernel InDetCondTools SiPropertiesSvcLib InDetIdentifier InDetReadoutGeometry )
# Install files from the package:
atlas_install_headers( InDetDetDescrExample )
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h b/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
index 48456cad3a5b533ecf9d10959bdb27637e5ab3c4..804535d2e9d30274e321ac4980d36395b60dbb8f 100755
--- a/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.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 InDetDetDescrExample_ReadSiDetectorElements_h
@@ -15,7 +15,7 @@
#include "SiPropertiesSvc/ISiPropertiesTool.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "InDetConditionsSummaryService/ISiliconConditionsTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include <vector>
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py
index 234338c74d9b8455794eb1c55e1d7ff84c0e9827..4df96f0585ff7294c61fb3ffbfecdf0d5383f194 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py
@@ -107,7 +107,13 @@ if (InDetFlags.doPrintConfigurables()):
#InDetSCTMonMan.AthenaMonTools += [SCTTimeDependentMonTool]
from SCT_Monitoring.SCT_MonitoringConf import SCTLorentzMonTool
-InDetSCTLorentzMonTool = SCTLorentzMonTool ( name = "InDetSCTLorentzMonTool",
+from BTagging.BTaggingConfiguration_CommonTools import toolAtlasExtrapolator
+atlasExtrapolator = toolAtlasExtrapolator('AtlasExtrapolator')
+options = {}
+options.setdefault('Extrapolator', atlasExtrapolator)
+from TrackToVertex.TrackToVertexConf import Reco__TrackToVertex
+trackToVertex = Reco__TrackToVertex(**options)
+InDetSCTLorentzMonTool = SCTLorentzMonTool ( name = "InDetSCTLorentzMonTool", TrackToVertexTool = trackToVertex,
OutputLevel = 4)
InDetSCTLorentzMonTool.tracksName = InDetKeys.SCTTracks() if InDetFlags.doTrackSegmentsSCT() else InDetKeys.UnslimmedTracks()
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx
index 4b7e18fab6dd74558f2335bcc381e1731e424a9c..3013e7a8319b3a1787c3a388e78bca84c3c2ed82 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.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
*/
//Local
@@ -7,7 +7,6 @@
#include "InDetIdentifier/PixelID.h"
#include "InDetIdentifier/SCT_ID.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "PixelConditionsServices/IPixelByteStreamErrorsSvc.h"
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.h
index 4cff7a8ca2140a36f9f64ec3c5de1450a6ef5b89..5569cde6443610969e2d98e895c5ab2f6a00398a 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.h
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.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 InDetGlobalErrorMonTool_H
@@ -17,7 +17,6 @@
#include "SCT_ConditionsTools/ISCT_ConfigurationConditionsTool.h"
#include "SCT_ConditionsTools/ISCT_ByteStreamErrorsTool.h"
#include "StoreGate/ReadCondHandleKey.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "PixelConditionsServices/IPixelByteStreamErrorsSvc.h"
namespace InDetDD
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
index 6e3ac3c594c985c1390688796b95e5977822489c..6858418c000c949b12d6122bd57a908ca14169dd 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.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,7 +7,6 @@
///////////////////////////////////////////////////////////////////////////////
#include <sstream>
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "InDetRawData/InDetTimeCollection.h"
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
index b5f34e37687d34178e2082249019795e3f4598a4..82130edd0202bf4e866e375c310019ddfcda86a1 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.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,7 +7,6 @@
///////////////////////////////////////////////////////////////////////////////
#include <sstream>
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetRawData/InDetTimeCollection.h"
#include "LWHists/TH1F_LW.h"
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
index 590f690877b7632b9ee2417a2d8c578078a96ce5..29b96ada975afff61711f7109960c517bd56740d 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.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
*/
///////////////////////////////////////////////////////////////////////////////
@@ -11,7 +11,6 @@
#include <string>
#include <vector>
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "InDetIdentifier/PixelID.h"
#include "LWHists/TH1F_LW.h"
#include "LWHists/TH1I_LW.h"
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
index 2b040c22eb46bcc7adf65bcdf315fd70bccb3bb8..965d1c2d617037d4e4fbe03995fae3b199aa1c9b 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.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
*/
///////////////////////////////////////////////////////////////////////////////
@@ -7,7 +7,6 @@
///////////////////////////////////////////////////////////////////////////////
#include <sstream>
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "InDetIdentifier/PixelID.h"
#include "LWHists/TH1F_LW.h"
#include "LWHists/TH1I_LW.h"
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
index 384fc24ad10e7ec4c2b7e74c789bd327de2c9880..770eee9a4e408ec52d8b2bf3fe4c52a1fa25e883 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.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
*/
///////////////////////////////////////////////////////////////////////////////
@@ -8,7 +8,6 @@
#include <algorithm>
#include <sstream>
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "InDetRIO_OnTrack/SiClusterOnTrack.h"
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
index 70868b49f6a87fb14c307a7a916c32ae77b7a447..f6486c335eeafdd4f2977590a1ae18ba54ce0526 100644
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.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 "AthenaBaseComps/AthAlgTool.h"
@@ -19,7 +19,6 @@
#include "TrkGeometry/Layer.h"
#include "TrkExInterfaces/IExtrapolator.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "Identifier/Identifier.h"
#include "InDetIdentifier/PixelID.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixeldEdxTestAlg.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixeldEdxTestAlg.cxx
index 96ba8c73c6a9641c4cbea12edcce4c4f0cac3921..3d6d682da4752556fd63e7bc442ce06baefae5b8 100755
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixeldEdxTestAlg.cxx
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixeldEdxTestAlg.cxx
@@ -14,12 +14,10 @@
// Gaudi includes
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/GaudiException.h"
+#include "GaudiKernel/ThreadLocalContext.h"
// Event Info
#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventType.h"
// AttributeList
#include "CoralBase/Attribute.h"
@@ -100,64 +98,15 @@ StatusCode PixeldEdxTestAlg::readWithBeginRun(){
StatusCode status;
ATH_MSG_INFO ( "in readWithBeginRun()" );
- // Get Run/Event/Time from EventSelector
+ // As a result of the restructuring the EventIncident class (dropping the reference to EventInfo)
+ // the old mechanism of overriding run&event&time is no longer working.
+ // If we need this functionality, then we need to find a new way of implementing it.
+ // For the time being this function simply fires a BeginRun incident using the EventContext, without overriding anything
- // Access EventSelector to check if run/event/time are being
- // explicitly set. This may be true for simulation
- ServiceHandle<IProperty> propertyServer("EventSelector",name() );
- ATH_CHECK( propertyServer.retrieve() );
-
- // Get run/event/time if OverrideRunNumber flag is set
- BooleanProperty boolProperty("OverrideRunNumber", false);
- status = propertyServer->getProperty(&boolProperty);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR ( "unable to get OverrideRunNumber flag: found " << boolProperty.value() );
- return status;
- }
-
- uint32_t event, run;
- uint64_t time;
- if (boolProperty.value()) {
- // Overriding run number, get run/event/time from EventSelector
- IntegerProperty intProp("RunNumber", 0);
- status = propertyServer->getProperty(&intProp);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR ( "unable to get RunNumber: found " << intProp.value() );
- return status;
- }
- else {
- run = intProp.value();
- }
- intProp = IntegerProperty("FirstEvent", 0);
- status = propertyServer->getProperty(&intProp);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR ( "unable to get event number: found " << intProp.value() );
- return status;
- }
- else {
- event = intProp.value();
- }
- intProp = IntegerProperty("InitialTimeStamp", 0);
- status = propertyServer->getProperty(&intProp);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR ( "unable to get time stamp: found " << intProp.value() );
- return status;
- }
- else {
- time = intProp.value();
- }
- }
- else {
- ATH_MSG_DEBUG ( "Override run number NOT set" );
- return StatusCode::SUCCESS;
- }
-
- // Now send BeginRun incident
ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", name() );
ATH_CHECK( incSvc.retrieve() );
- EventInfo evt(new EventID(run, event, time), new EventType);
- EventIncident evtInc(evt, name(), "BeginRun");
+ EventIncident evtInc(name(), "BeginRun", getContext());
incSvc->fireIncident( evtInc );
return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
index b421c0f8bcea421349061ea87ec5a452b8365693..fd0bf3e76892555eb2f185f8c4501f1974d440a4 100644
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
Database/AthenaPOOL/AthenaPoolUtilities
DetectorDescription/GeoPrimitives
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetDetDescr/SCT_ModuleDistortions
InnerDetector/InDetRecEvent/InDetPrepRawData
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
index 6ff0a6bce3dc3d9cdd3f3b093dcef9264a671ae4..09c06a88880001060e4ccfd45b979989aff6b886 100755
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.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 PixelClusterOnTrackTool_H
@@ -18,7 +18,7 @@
#include "TrkAmbiguityProcessor/dRMap.h"
#include "PixelConditionsData/PixelOfflineCalibData.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/SCT_ClusterOnTrackTool.h b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/SCT_ClusterOnTrackTool.h
index 8663d81537c86c2a6b7647b33ac94901d7f72980..4ef38738fbf5fdafedc33b3d19792da17fe35720 100755
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/SCT_ClusterOnTrackTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/SCT_ClusterOnTrackTool.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
*/
///////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
#include "TrkParameters/TrackParameters.h"
#include "InDetRIO_OnTrack/SCT_ClusterOnTrack.h"
#include "SCT_ModuleDistortions/ISCT_ModuleDistortionsTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
namespace InDet {
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
index c075fa1126eb21f3b8568a84822090ffdec8b945..12e6ef82c204bb2b60b6d405de41730c3e4d86a1 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
@@ -17,6 +17,7 @@ atlas_depends_on_subdirs(
InnerDetector/InDetRawEvent/InDetSimData
InnerDetector/InDetConditions/BeamSpotConditionsData
InnerDetector/InDetConditions/InDetConditionsSummaryService
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/PixelConditionsData
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
@@ -49,7 +50,7 @@ atlas_add_library( SiClusterizationToolLib
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives
- Identifier EventPrimitives GaudiKernel InDetSimData InDetIdentifier
+ Identifier EventPrimitives GaudiKernel InDetCondTools InDetSimData InDetIdentifier
InDetReadoutGeometry InDetRawData InDetPrepRawData InDetRecToolInterfaces
TrkParameters TrkNeuralNetworkUtilsLib PixelConditionsData
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaPoolUtilities FileCatalog AtlasDetDescr
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
index 89eff3f69075dc9ff37061edb2f64609139a68b7..ca84dd810669caeb5851e4a80cbe8c7bbd294e95 100755
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.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
*/
///////////////////////////////////////////////////////////////////
@@ -24,7 +24,7 @@
#include "GaudiKernel/ToolHandle.h"
#include <vector>
#include "GeoPrimitives/GeoPrimitives.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "PixelConditionsData/PixelOfflineCalibData.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/IPixelClusteringTool.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/IPixelClusteringTool.h
index b8fcca656a8801b11841bd4f279ec6b36e4bba04..31684cce5e638cc2eaded92d0ab690ffcaa2afdb 100755
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/IPixelClusteringTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/IPixelClusteringTool.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
*/
///////////////////////////////////////////////////////////////////
@@ -19,10 +19,6 @@
#include "InDetRawData/PixelRDORawData.h"
// forward declare not possible (typedef)
#include "InDetPrepRawData/PixelClusterCollection.h"
-// forward declare of this causes a compilation error (which I do not fully understand)
-// in LazyOfflineSpacePointTool in a trigger package (T.L.)
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
-
class PixelID;
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
index 81b78666dfa6df12fcbacd7d9c2ab48c3ebd2e55..e2424bd06f506b6d7d2050b7d94c7767fbcca3de 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.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 BTAGTOOL_NnClusterizationFactory_C
@@ -35,7 +35,7 @@
#include "TrkParameters/TrackParameters.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "EventPrimitives/EventPrimitives.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "SiClusterizationTool/TTrainedNetworkCollection.h"
#include "PixelConditionsServices/IPixelCalibSvc.h"
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
index af35b2e65e7dcf224a589ff8f6eac89390bf2474..7acb7332ff811f85c8e155bcd325045641a633d5 100755
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.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
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -110,9 +110,8 @@ namespace InDet{
int m_seedsfilter{} ; // Level of seeds filer
unsigned int m_wrongcluster{} ; // Max lentgh of thtrack
std::string m_fieldmode ; // Mode of magnetic field
+ Trk::MagneticFieldMode m_fieldModeEnum{Trk::FullField};
std::string m_patternName ; // Name of the pattern recognition
-// std::string m_inputClusterContainerName;
-// std::string m_inputHadClusterContainerName;
SG::ReadHandleKey<CaloClusterROI_Collection> m_caloCluster;
SG::ReadHandleKey<CaloClusterROI_Collection> m_caloHad;
Trk::TrackInfo m_trackinfo ;
@@ -133,7 +132,6 @@ namespace InDet{
bool m_ITKGeomtry{} ; // ITK geometry
bool m_seedsegmentsWrite{}; // Call seed to track conversion
bool m_heavyion{} ; // Is it heavy ion events
- Trk::MagneticFieldProperties m_fieldprop ; // Magnetic field properties
double m_xi2max{} ; // max Xi2 for updators
double m_xi2maxNoAdd{} ; // max Xi2 for clusters
double m_xi2maxlink{} ; // max Xi2 for clusters
@@ -183,8 +181,6 @@ namespace InDet{
bool isHadCaloCompatible();
bool isDBMSeeds(const Trk::SpacePoint*);
void clusterTrackMap(Trk::Track*);
- void magneticFieldInit();
- StatusCode magneticFieldInit(IOVSVC_CALLBACK_ARGS);
MsgStream& dumpconditions(MsgStream& out) const;
MsgStream& dumpevent (MsgStream& out) const;
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
index e69a0725677f46e6fd0f39f974a68121be10dc45..9a3df362002e070acb268fb6fab273645f9cc391 100755
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.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
*/
///////////////////////////////////////////////////////////////////
@@ -14,7 +14,6 @@
#include <ostream>
#include <iomanip>
-#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
#include "InDetPrepRawData/SiClusterContainer.h"
#include "SiTrackMakerTool_xk/SiTrackMaker_xk.h"
@@ -143,6 +142,9 @@ StatusCode InDet::SiTrackMaker_xk::initialize()
ATH_MSG_DEBUG("Retrieved " << m_fieldServiceHandle );
m_fieldService = &*m_fieldServiceHandle;
}
+ if(m_fieldmode == "NoField") m_fieldModeEnum = Trk::NoField;
+ else if(m_fieldmode == "MapSolenoid") m_fieldModeEnum = Trk::FastField;
+ else m_fieldModeEnum = Trk::FullField;
// Get detector elements road maker tool
//
@@ -209,25 +211,6 @@ StatusCode InDet::SiTrackMaker_xk::initialize()
if(m_cosmicTrack) m_seedsfilter = 3;
- // Setup for magnetic field
- //
- std::string folder( "/EXT/DCS/MAGNETS/SENSORDATA" );
- const DataHandle<CondAttrListCollection> currentHandle;
- if (m_fieldmode != "NoField" && detStore()->contains<CondAttrListCollection>(folder)) {
-
- StatusCode sc = detStore()->regFcn(&InDet::SiTrackMaker_xk::magneticFieldInit,this,currentHandle,folder);
-
- if(sc==StatusCode::SUCCESS) {
- ATH_MSG_INFO( "Registered callback from MagneticFieldSvc for " << name() );
- } else {
- ATH_MSG_ERROR( "Could not book callback from MagneticFieldSvc for " << name () );
- return StatusCode::FAILURE;
- }
- }
- else {
- magneticFieldInit();
- ATH_MSG_INFO("Folder " << folder << " not present, magnetic field callback not set up. Not a problem if AtlasFieldSvc.useDCS=False");
- }
ATH_CHECK( m_caloCluster.initialize(m_useBremModel && m_useCaloSeeds));
ATH_CHECK( m_caloHad.initialize( !m_useSSSfilter && m_useHClusSeed) );
@@ -269,7 +252,10 @@ MsgStream& InDet::SiTrackMaker_xk::dumpconditions( MsgStream& out ) const
"ToroidalField" ,"Grid3DField" ,"RealisticField" ,
"UndefinedField","AthenaField" , "?????" };
- int mode = m_fieldprop.magneticFieldMode();
+ Trk::MagneticFieldMode fieldModeEnum(m_fieldModeEnum);
+ if(!m_fieldService->solenoidOn()) fieldModeEnum = Trk::NoField;
+ Trk::MagneticFieldProperties fieldprop(fieldModeEnum);
+ int mode = fieldprop.magneticFieldMode();
if(mode<0 || mode>8 ) mode = 8;
n = 62-fieldmode[mode].size();
@@ -668,7 +654,10 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlane
m_p[0] = d[0]*Ax[0]+d[1]*Ax[1]+d[2]*Ax[2];
m_p[1] = d[0]*Ay[0]+d[1]*Ay[1]+d[2]*Ay[2];
- if(m_fieldprop.magneticFieldMode() > 0) {
+ Trk::MagneticFieldMode fieldModeEnum(m_fieldModeEnum);
+ if(!m_fieldService->solenoidOn()) fieldModeEnum = Trk::NoField;
+ Trk::MagneticFieldProperties fieldprop(fieldModeEnum);
+ if(fieldprop.magneticFieldMode() > 0) {
double H[3],gP[3] ={x0,y0,z0}; m_fieldService->getFieldZR(gP,H);
@@ -753,7 +742,10 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlaneDBM
m_p[0] = d[0]*Ax[0]+d[1]*Ax[1]+d[2]*Ax[2];
m_p[1] = d[0]*Ay[0]+d[1]*Ay[1]+d[2]*Ay[2];
- if(m_fieldprop.magneticFieldMode() > 0) {
+ Trk::MagneticFieldMode fieldModeEnum(m_fieldModeEnum);
+ if(!m_fieldService->solenoidOn()) fieldModeEnum = Trk::NoField;
+ Trk::MagneticFieldProperties fieldprop(fieldModeEnum);
+ if(fieldprop.magneticFieldMode() > 0) {
double H[3],gP[3] ={p0[0],p0[1],p0[2]}; m_fieldService->getFieldZR(gP,H);
@@ -847,28 +839,6 @@ void InDet::SiTrackMaker_xk::detectorElementsSelection(std::list<const InDetDD::
}
}
-///////////////////////////////////////////////////////////////////
-// Callback function - get the magnetic field /
-///////////////////////////////////////////////////////////////////
-
-StatusCode InDet::SiTrackMaker_xk::magneticFieldInit(IOVSVC_CALLBACK_ARGS)
-{
- // Build MagneticFieldProperties
- //
- if(!m_fieldService->solenoidOn()) m_fieldmode ="NoField";
- magneticFieldInit();
- return StatusCode::SUCCESS;
-}
-
-void InDet::SiTrackMaker_xk::magneticFieldInit()
-{
- Trk::MagneticFieldProperties* pMF = 0;
- if (m_fieldmode == "NoField" ) pMF = new Trk::MagneticFieldProperties(Trk::NoField );
- else if(m_fieldmode == "MapSolenoid") pMF = new Trk::MagneticFieldProperties(Trk::FastField);
- else pMF = new Trk::MagneticFieldProperties(Trk::FullField);
- m_fieldprop = *pMF; delete pMF;
-}
-
///////////////////////////////////////////////////////////////////
// New clusters comparison with clusters associated with track
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
index 4f74d6df184cff5b0cf44a7d6bb8dbbb999f2822..b8da730a6f426fa5c98865dbf6e5c302e731e981 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.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
*/
//***************************************************************************
@@ -29,8 +29,6 @@
//Gaudi includes
#include "AthenaKernel/Timeout.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
-
//Trigger
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "IRegionSelector/IRegSelSvc.h"
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/CalibNtupleLoader.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/CalibNtupleLoader.cxx
index d6404530e38c30c6295f9d02d14e0fb8894f4df4..ceb64abcf7a8d54c93ea1b99c1f0066dcaebc0bf 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/CalibNtupleLoader.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/CalibNtupleLoader.cxx
@@ -17,6 +17,7 @@
// StoreGateSvc, IncidentSvc
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/IIncidentSvc.h"
+#include "GaudiKernel/ThreadLocalContext.h"
// Athena EventInfo
#include "EventInfo/EventIncident.h"
@@ -177,7 +178,7 @@ void CalibNtupleLoader::prepareSegments(const MuonCalibEvent *&event, std::map<N
// Fire the EndEvent incident; this is normally done by the
// AthenaEventLoopMgr after calling the "execute" method of all
// Algorithms
- m_incSvc->fireIncident(EventIncident(*currentEvent, name(),"EndEvent"));
+ m_incSvc->fireIncident(EventIncident(name(),"EndEvent",Gaudi::Hive::currentContext()));
// Change the EventInfo in StoreGate to the correct info from
// the event in the ntuple
@@ -197,11 +198,11 @@ void CalibNtupleLoader::prepareSegments(const MuonCalibEvent *&event, std::map<N
if ( event->eventInfo().runNumber() != m_prev_run_nr ) {
m_prev_run_nr = event->eventInfo().runNumber() ;
m_incSvc->fireIncident(Incident(name(),"EndRun"));
- m_incSvc->fireIncident(EventIncident(*currentEvent, name(),"BeginRun"));
+ m_incSvc->fireIncident(EventIncident(name(),"BeginRun",Gaudi::Hive::currentContext()));
}
// Fire BeginEvent Incident
- m_incSvc->fireIncident(EventIncident(*currentEvent, name(),"BeginEvent"));
+ m_incSvc->fireIncident(EventIncident(name(),"BeginEvent",Gaudi::Hive::currentContext()));
} //end CalibNtupleLoader::prepareSegments
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx
index 243546226d03f190eed54a24173abcee8bedfa9c..ba1cd2df8a6b3730065ab9636da4c87c56a19473 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx
@@ -67,10 +67,10 @@ StatusCode MuonCacheCreator::execute (const EventContext& ctx) const {
// Create the TGC cache container
ATH_CHECK(createContainer(m_TgcCacheKey, m_tgcIdHelper->module_hash_max(), ctx));
- ATH_MSG_INFO("Created cache container " << m_MdtCsmCacheKey);
- ATH_MSG_INFO("Created cache container " << m_CscCacheKey);
- ATH_MSG_INFO("Created cache container " << m_RpcCacheKey);
- ATH_MSG_INFO("Created cache container " << m_TgcCacheKey);
+ ATH_MSG_DEBUG("Created cache container " << m_MdtCsmCacheKey);
+ ATH_MSG_DEBUG("Created cache container " << m_CscCacheKey);
+ ATH_MSG_DEBUG("Created cache container " << m_RpcCacheKey);
+ ATH_MSG_DEBUG("Created cache container " << m_TgcCacheKey);
return StatusCode::SUCCESS;
diff --git a/MuonSpectrometer/MuonConfig/CMakeLists.txt b/MuonSpectrometer/MuonConfig/CMakeLists.txt
index 360059848aa5fae174b45893bb869842cd989216..b5ec0f265afecc5cf771639a7a7585d5eccbfada 100644
--- a/MuonSpectrometer/MuonConfig/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConfig/CMakeLists.txt
@@ -12,14 +12,18 @@ atlas_install_data( share/*.ref )
# Configure unit tests
# Cache alignment will change depending on whether FRONTIER_SERVER is defined.
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest )
atlas_add_test( MuonDataDecodeTest
PROPERTIES TIMEOUT 1000
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest
EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from|DEBUG Reconciled configuration"
SCRIPT test/testMuonDataDecode.sh )
# Adding an identical test for the ByteStream identifiable caches (and future RDO caches)
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache )
atlas_add_test( MuonDataDecodeTest_Cache
PROPERTIES TIMEOUT 1000
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache
EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from"
SCRIPT test/testMuonDataDecode_Cache.sh )
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 06fc84cb37bc1c2c9309afcce4e87af9c83a9cbf..6363d17ae0f6f7c5c23022df049533bef8384fb8 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -4,6 +4,13 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.Constants import VERBOSE, DEBUG, INFO
+## Small class to hold the names for cache containers, should help to avoid copy / paste errors
+class MuonCacheNames:
+ MdtCsmCache = "MdtCsmCache"
+ CscCache = "CscCache"
+ RpcCache = "RpcCache"
+ TgcCache = "TgcCache"
+
## This configuration function creates the IdentifiableCaches for RDO
#
# The function returns a ComponentAccumulator which should be loaded first
@@ -12,10 +19,10 @@ def MuonCacheCfg():
acc = ComponentAccumulator()
from MuonByteStream.MuonByteStreamConf import MuonCacheCreator
- cacheCreator = MuonCacheCreator(MdtCsmCacheKey = "MdtCsmCache",
- CscCacheKey = "CscCache",
- RpcCacheKey = "RpcCache",
- TgcCacheKey = "TgcCache")
+ cacheCreator = MuonCacheCreator(MdtCsmCacheKey = MuonCacheNames.MdtCsmCache,
+ CscCacheKey = MuonCacheNames.CscCache,
+ RpcCacheKey = MuonCacheNames.RpcCache,
+ TgcCacheKey = MuonCacheNames.TgcCache)
acc.addEventAlgo( cacheCreator )
return acc, cacheCreator
@@ -123,7 +130,11 @@ def MdtBytestreamDecodeCfg(flags, forTrigger=False):
MuonMdtRawDataProviderTool = Muon__MDT_RawDataProviderTool(name = "MDT_RawDataProviderTool",
Decoder = MDTRodDecoder)
if forTrigger:
- MuonMdtRawDataProviderTool.CsmContainerCacheKey = "MdtCsmCache"
+ # 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
acc.addPublicTool( MuonMdtRawDataProviderTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
@@ -159,7 +170,11 @@ def CscBytestreamDecodeCfg(flags, forTrigger=False):
MuonCscRawDataProviderTool = Muon__CSC_RawDataProviderTool(name = "CSC_RawDataProviderTool",
Decoder = CSCRodDecoder)
if forTrigger:
- MuonCscRawDataProviderTool.CscContainerCacheKey = "CscCache"
+ # 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
acc.addPublicTool( MuonCscRawDataProviderTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
@@ -199,11 +214,6 @@ if __name__=="__main__":
from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg
cfg.merge(TrigBSReadCfg(ConfigFlags ))
- # Setup IdentifiableCaches before anything else
- muoncacheacc, muoncachealg = MuonCacheCfg()
- cfg.merge( muoncacheacc )
- cfg.addEventAlgo( muoncachealg )
-
# Schedule Rpc data decoding - once mergeAll is working can simplify these lines
rpcdecodingAcc, rpcdecodingAlg = RpcBytestreamDecodeCfg( ConfigFlags )
cfg.merge( rpcdecodingAcc )
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index 4d9f08a0c897a65a302de0144cbeee78f701cb1b..e490bc4c85283359a3f4f134e11b5b85bf19cc8c 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -175,12 +175,6 @@ def muonRdoDecodeTestData( forTrigger = False ):
from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg
cfg.merge(TrigBSReadCfg(ConfigFlags ))
- # Setup IdentifiableCaches before anything else
- from MuonConfig.MuonBytestreamDecodeConfig import MuonCacheCfg
- muoncacheacc, muoncachealg = MuonCacheCfg()
- cfg.merge( muoncacheacc )
- cfg.addEventAlgo( muoncachealg )
-
# 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.ref b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
index 4b52decb7485ff79cbe050e0b9355dcbb542e44e..7122a4d6b79beffcaaaf031603b9ccb60e3c120d 100644
--- a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
+++ b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
@@ -1,142 +1,4 @@
-Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
Flag Name : Value
-Beam.BunchSpacing : 25
-Beam.Energy : [function]
-Beam.NumberOfCollisions : 0
-Beam.Type : 'collisions'
-Beam.estimatedLuminosity : [function]
-Calo.Noise.fixedLumiForNoise : -1
-Calo.Noise.useCaloNoiseLumi : True
-Calo.TopoCluster.doTreatEnergyCutAsAbsol : False
-Calo.TopoCluster.doTwoGaussianNoise : True
-Common.isOnline : False
-Concurrency.NumConcurrentEvents : 0
-Concurrency.NumProcs : 0
-Concurrency.NumThreads : 0
-DQ.DataType : [function]
-DQ.Environment : [function]
-DQ.FileKey : 'CombinedMonitoring'
-DQ.disableAtlasReadyFilter : False
-DQ.doGlobalMon : True
-DQ.doMonitoring : True
-DQ.doStreamAwareMon : True
-GeoModel.AtlasVersion : 'ATLAS-R2-2016-01-00-01'
-GeoModel.Layout : 'atlas'
-IOVDb.DatabaseInstance : [function]
-IOVDb.GlobalTag : 'CONDBR2-BLKPA-2018-13'
-Input.Files : ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
-Input.ProjectName : [function]
-Input.RunNumber : [function]
-Input.isMC : [function]
-LAr.RawChannelSource : [function]
-LAr.doAlign : [function]
-LAr.doCellEmMisCalib : [function]
-LAr.doCellNoiseMasking : True
-LAr.doCellSporadicNoiseMasking : True
-LAr.doHVCorr : [function]
-Muon.Align.UseALines : False
-Muon.Align.UseAsBuilt : False
-Muon.Align.UseBLines : 'none'
-Muon.Align.UseILines : False
-Muon.Calib.CscF001FromLocalFile : False
-Muon.Calib.CscNoiseFromLocalFile : False
-Muon.Calib.CscPSlopeFromLocalFile : False
-Muon.Calib.CscPedFromLocalFile : False
-Muon.Calib.CscRmsFromLocalFile : False
-Muon.Calib.CscStatusFromLocalFile : False
-Muon.Calib.CscT0BaseFromLocalFile : False
-Muon.Calib.CscT0PhaseFromLocalFile : False
-Muon.Calib.EventTag : 'MoMu'
-Muon.Calib.applyRtScaling : True
-Muon.Calib.correctMdtRtForBField : False
-Muon.Calib.correctMdtRtForTimeSlewing : False
-Muon.Calib.correctMdtRtWireSag : False
-Muon.Calib.mdtCalibrationSource : 'MDT'
-Muon.Calib.mdtMode : 'ntuple'
-Muon.Calib.mdtPropagationSpeedBeta : 0.85
-Muon.Calib.readMDTCalibFromBlob : True
-Muon.Calib.useMLRt : True
-Muon.Chi2NDofCut : 20.0
-Muon.createTrackParticles : True
-Muon.doCSCs : True
-Muon.doDigitization : True
-Muon.doFastDigitization : False
-Muon.doMDTs : True
-Muon.doMSVertex : False
-Muon.doMicromegas : False
-Muon.doPseudoTracking : False
-Muon.doRPCClusterSegmentFinding : False
-Muon.doRPCs : True
-Muon.doSegmentT0Fit : False
-Muon.doTGCClusterSegmentFinding : False
-Muon.doTGCs : True
-Muon.dosTGCs : False
-Muon.enableCurvedSegmentFinding : False
-Muon.enableErrorTuning : False
-Muon.optimiseMomentumResolutionUsingChi2 : False
-Muon.patternsOnly : False
-Muon.prdToxAOD : False
-Muon.printSummary : False
-Muon.refinementTool : 'Moore'
-Muon.rpcRawToxAOD : False
-Muon.segmentOrigin : 'Muon'
-Muon.straightLineFitMomentum : 2000.0
-Muon.strategy : []
-Muon.trackBuilder : 'Moore'
-Muon.updateSegmentSecondCoordinate : [function]
-Muon.useAlignmentCorrections : False
-Muon.useLooseErrorTuning : False
-Muon.useSegmentMatching : [function]
-Muon.useTGCPriorNextBC : False
-Muon.useTrackSegmentMatching : True
-Muon.useWireSagCorrections : False
-Output.AODFileName : 'myAOD.pool.root'
-Output.ESDFileName : 'myESD.pool.root'
-Output.HISTFileName : 'myHIST.root'
-Output.HITFileName : 'myHIT.pool.root'
-Output.RDOFileName : 'myROD.pool.root'
-Output.doESD : False
-Scheduler.CheckDependencies : True
-Scheduler.ShowControlFlow : False
-Scheduler.ShowDataDeps : False
-Scheduler.ShowDataFlow : False
-Trigger.AODEDMSet : []
-Trigger.EDMDecodingVersion : 2
-Trigger.ESDEDMSet : []
-Trigger.L1.CTPVersion : 4
-Trigger.L1.doBcm : True
-Trigger.L1.doMuons : True
-Trigger.L1Decoder.forceEnableAllChains : False
-Trigger.LVL1ConfigFile : [function]
-Trigger.LVL1TopoConfigFile : [function]
-Trigger.OnlineCondTag : 'CONDBR2-HLTP-2016-01'
-Trigger.OnlineGeoTag : 'ATLAS-R2-2015-04-00-00'
-Trigger.calo.doOffsetCorrection : True
-Trigger.dataTakingConditions : 'FullTrigger'
-Trigger.doHLT : True
-Trigger.doL1Topo : True
-Trigger.doLVL1 : [function]
-Trigger.doTriggerConfigOnly : False
-Trigger.doTruth : False
-Trigger.egamma.calibMVAVersiona : [function]
-Trigger.egamma.clusterCorrectionVersion : [function]
-Trigger.egamma.pidVersion : [function]
-Trigger.generateLVL1Config : False
-Trigger.generateLVL1TopoConfig : False
-Trigger.menu.combined : []
-Trigger.menu.electron : []
-Trigger.menu.muon : []
-Trigger.menu.photon : []
-Trigger.menuVersion : [function]
-Trigger.muon.doEFRoIDrivenAccess : False
-Trigger.run2Config : '2018'
-Trigger.triggerConfig : 'MCRECO:DEFAULT'
-Trigger.triggerMenuSetup : 'MC_pp_v7_tight_mc_prescale'
-Trigger.triggerUseFrontier : False
-Trigger.useL1CaloCalibration : False
-Trigger.useRun1CaloEnergyScale : False
-Trigger.writeBS : False
-Trigger.writeL1TopoValData : True
Py:Athena INFO About to setup Rpc Raw data decoding
Py:ComponentAccumulator DEBUG Adding component EventSelectorByteStream/EventSelector to the job
Py:ComponentAccumulator DEBUG Adding component ByteStreamEventStorageInputSvc/ByteStreamInputSvc to the job
@@ -165,7 +27,6 @@ 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:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
@@ -173,15 +34,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -200,7 +58,6 @@ Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
Py:ComponentAccumulator DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
@@ -225,37 +82,25 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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 Adding component Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool to the job
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component RPCcablingServerSvc/RPCcablingServerSvc to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ROBDataProviderSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
Py:ComponentAccumulator DEBUG Adding component Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool to the job
@@ -266,15 +111,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -294,7 +136,6 @@ Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
@@ -316,38 +157,17 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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 Adding component Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component LVL1TGC::TGCRecRoiSvc/LVL1TGC::TGCRecRoiSvc to the job
Py:ComponentAccumulator DEBUG Adding component TGCcablingServerSvc/TGCcablingServerSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ROBDataProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
Py:ComponentAccumulator DEBUG Adding component Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -356,15 +176,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -384,10 +201,8 @@ Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
Py:ComponentAccumulator DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
Py:ComponentAccumulator DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
@@ -428,12 +243,6 @@ Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderS
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
@@ -465,101 +274,12 @@ Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:IOVDbSvc.CondDB DEBUG Loading basic services for CondDBSetup...
-Py:ConfigurableDb DEBUG loading confDb files...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiHive.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libStoreGate.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiCommonSvc.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libprofhelp.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHelloWorld.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHive.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIOVDbSvc.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libPixelConditionsServices.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArMonTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMdtRawDataMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libxAODBTaggingEfficiency.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRecBackgroundAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloClusterMatching.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRingerTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libParticlesInConeTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToCalo.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToVertex.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libISF_Geant4Tools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrkExStraightLineIntersector.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigTauMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCellCorrection.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCondPhysAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcAnalysis.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsDFlow.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libInDetPhysValMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArRecUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCafJobs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonPhysValMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkExamples.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libElectronPhotonTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetMissingEtTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMissingEtDQA.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonMomentumCorrections.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonResonanceTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonSelectorTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRingerSelectorTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauAnalysisTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLongLivedParticleDPDMaker.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDiTauRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMETUtilities.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonCombinedBaseTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libegammaPerformance.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFastCaloSim.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileCalibAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaEmulationTool.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigConfigSvc.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFTK_RecTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigMissingETHypo.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileSimAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTBRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDataQualityTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCellRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTrackMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkJetEtMiss.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventTagAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIsolationTool.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/WorkDir.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaAnalysisTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetSubStructureMomentTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/GAUDI/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Gaudi.confdb]...
-Py:ConfigurableDb DEBUG -loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Athena.confdb]...
-Py:ConfigurableDb DEBUG loading confDb files... [DONE]
-Py:ConfigurableDb DEBUG loaded 1101 confDb packages
-Py:ConfigurableDb INFO Read module info for 5454 configurables from 75 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-Py:ConfigurableDb DEBUG : Found configurable <class 'GaudiCoreSvc.GaudiCoreSvcConf.MessageSvc'> in module GaudiCoreSvc.GaudiCoreSvcConf
Py:loadBasicAthenaPool DEBUG Loading basic services for AthenaPool...
-Py:ConfigurableDb DEBUG : Found configurable <class 'PoolSvc.PoolSvcConf.PoolSvc'> in module PoolSvc.PoolSvcConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'AthenaServices.AthenaServicesConf.MetaDataSvc'> in module AthenaServices.AthenaServicesConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'StoreGate.StoreGateConf.StoreGateSvc'> in module StoreGate.StoreGateConf
Py:loadBasicAthenaPool DEBUG Loading basic services for AthenaPool... [DONE]
Py:loadBasicIOVDb DEBUG Loading basic services for IOVDbSvc...
-Py:ConfigurableDb DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
Py:Configurable ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
Py:loadBasicEventInfoMgt DEBUG Loading basic services for EventInfoMgt...
-EventInfoMgtInit: Got release version Athena-22.0.1
Py:Configurable ERROR attempt to add a duplicate (ServiceManager.EventPersistencySvc) ... dupe ignored
-Py:ConfigurableDb DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
Py:Configurable ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
Py:loadBasicEventInfoMgt DEBUG Loading basic services for EventInfoMgt... [DONE]
Py:loadBasicIOVDb DEBUG Loading basic services for IOVDb... [DONE]
@@ -575,23 +295,9 @@ Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderS
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component AthenaPoolCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
@@ -603,42 +309,21 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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 Adding component Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool to the job
-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
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
Py:ComponentAccumulator DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ROBDataProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
Py:ComponentAccumulator DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
Py:ComponentAccumulator DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
Py:ComponentAccumulator DEBUG Adding component Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool to the job
@@ -649,15 +334,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -680,32 +362,16 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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 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
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component CSCcablingSvc/CSCcablingSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ROBDataProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
Py:ComponentAccumulator DEBUG Adding component Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -714,15 +380,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -741,7 +404,6 @@ Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
Py:ComponentAccumulator DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
@@ -766,38 +428,14 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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:ConfigurableDb DEBUG : Found configurable <class 'MuonRPC_CnvTools.MuonRPC_CnvToolsConf.Muon__RpcRDO_Decoder'> in module MuonRPC_CnvTools.MuonRPC_CnvToolsConf
Py:ComponentAccumulator DEBUG Adding component Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component RPCcablingServerSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component MuonRPC_CablingSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.RPCCablingDbTool
Py:ComponentAccumulator DEBUG Adding component Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -806,15 +444,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -834,7 +469,6 @@ Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
@@ -856,36 +490,14 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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 Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component LVL1TGC::TGCRecRoiSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TGCcablingServerSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
Py:ComponentAccumulator DEBUG Adding component Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -894,15 +506,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -922,10 +531,8 @@ Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
Py:ComponentAccumulator DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
Py:ComponentAccumulator DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
@@ -964,12 +571,6 @@ Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderS
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
@@ -1009,23 +610,9 @@ Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderS
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component AthenaPoolCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
@@ -1037,42 +624,14 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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 Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component MuonMDT_CablingAlg
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component AthenaPoolCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component MuonMDT_CablingSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component AtlasFieldSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component MdtCalibrationDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component MdtCalibrationSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.MDTCablingDbTool
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.MuonCalib::MdtCalibDbCoolStrTool
Py:ComponentAccumulator DEBUG Adding component Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -1081,15 +640,12 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -1136,12 +692,6 @@ Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
@@ -1154,12 +704,6 @@ Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
@@ -1172,12 +716,6 @@ Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
@@ -1190,12 +728,6 @@ Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
@@ -1208,12 +740,6 @@ Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
@@ -1226,12 +752,6 @@ Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
@@ -1244,18 +764,11 @@ Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
Py:ComponentAccumulator DEBUG Adding component CondInputLoader/CondInputLoader to the job
Py:ComponentAccumulator DEBUG Adding component MuonCalib::CscCoolStrSvc/MuonCalib::CscCoolStrSvc to the job
Py:ComponentAccumulator DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
Py:ComponentAccumulator DEBUG Adding component PoolSvc/PoolSvc to the job
Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
@@ -1264,50 +777,19 @@ Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
Py:ComponentAccumulator DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-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:ConfigurableDb DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscRDO_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'CscCalibTools.CscCalibToolsConf.CscCalibTool'> in module CscCalibTools.CscCalibToolsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CSC_RawDataProviderTool'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscROD_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
Py:ComponentAccumulator DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersistencySvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component TagInfoMgr
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ProxyProviderSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CSCcablingSvc
Py:ComponentAccumulator DEBUG Adding component MuonCalib::CscCoolStrSvc/MuonCalib::CscCoolStrSvc to the job
-Py:ComponentAccumulator DEBUG Reconciled configuration of component IOVDbSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component PoolSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component CondSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component DBReplicaSvc
-Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
Py:ComponentAccumulator DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
Py:ComponentAccumulator DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
Py:ComponentAccumulator DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
-Py:ConfigurableDb DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
-Py:ComponentAccumulator DEBUG Reconciled configuration of component AthenaPoolCnvSvc
Py:Athena INFO Print Config
-Py:ComponentAccumulator INFO Event Inputs
-Py:ComponentAccumulator INFO set([])
-Py:ComponentAccumulator INFO Event Algorithm Sequences
-Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ************************************************************
|-Atomic = False
|-AuditAlgorithms = False
|-AuditBeginRun = False
@@ -1319,61 +801,21 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
|-AuditRestart = False
|-AuditStart = False
|-AuditStop = False
-|-Cardinality = 0
|-ContinueEventloopOnFPE = False
-|-DetStore @0x7f4eee4eb9d0 = ServiceHandle('StoreGateSvc/DetectorStore')
|-Enable = True
|-ErrorCounter = 0
|-ErrorMax = 1
-|-EvtStore @0x7f4eee4eb950 = ServiceHandle('StoreGateSvc')
-|-ExtraInputs @0x7f4eecb072d8 = [] (default: [])
-|-ExtraOutputs @0x7f4eecb07488 = [] (default: [])
|-FilterCircularDependencies = True
|-IgnoreFilterPassed = False
|-IsIOBound = False
-|-Members @0x7f4eecb070e0 = ['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 @0x7f4eecb07560 = [] (default: [])
|-OutputLevel = 0
|-RegisterForContextService = False
|-Sequential = 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 @0x7f4eed1213f0 = 'CscCache' (default: 'StoreGateSvc+')
-| |-DetStore @0x7f4eed1e9950 = ServiceHandle('StoreGateSvc/DetectorStore')
-| |-DisableViewWarning = False
-| |-Enable = True
-| |-ErrorCounter = 0
-| |-ErrorMax = 1
-| |-EvtStore @0x7f4eed1e98d0 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eed2bd0e0 = [] (default: [])
-| |-ExtraOutputs @0x7f4eed1f3fc8 = [] (default: [])
-| |-FilterCircularDependencies = True
-| |-IsIOBound = False
-| |-MdtCsmCacheKey @0x7f4eed1213c0 = 'MdtCsmCache' (default: 'StoreGateSvc+')
-| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eed2bd050 = [] (default: [])
-| |-OutputLevel = 0
-| |-RegisterForContextService = False
-| |-RpcCacheKey @0x7f4eed1217b0 = 'RpcCache' (default: 'StoreGateSvc+')
-| |-TgcCacheKey @0x7f4eed121810 = 'TgcCache' (default: 'StoreGateSvc+')
-| |-Timeline = True
-| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
|=/***** Algorithm Muon::RpcRawDataProvider/RpcRawDataProvider ***************************************
| |-AuditAlgorithms = False
| |-AuditBeginRun = False
@@ -1385,26 +827,17 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f4eed2cab90 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eed2cab10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07758 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb075a8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb075f0 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f4eed5b0528 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
| | (default: 'Muon::RPC_RawDataProviderTool/RpcRawDataProviderTool')
-| |-RegionSelectionSvc @0x7f4eed2cac10 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::RPC_RawDataProviderTool/RpcRawDataProvider.RPC_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1413,11 +846,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f4eed5b0620 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
-| | |-DetStore @0x7f4eed0bc410 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f4eed0bc450 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eed0bf170 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eed0bf098 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RPCSec = 'StoreGateSvc+RPC_SECTORLOGIC'
@@ -1431,10 +859,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStop = False
| | | |-AuditTools = False
| | | |-DataErrorPrintLimit = 1000
-| | | |-DetStore @0x7f4eed0bc510 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eed0bc550 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eed0bf050 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eed0b5f80 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-Sector13Data = False
@@ -1453,23 +877,15 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f4eed1d9b50 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eed1d9ad0 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07950 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb07a28 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb07998 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f4eee28e9b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
| | (default: 'Muon::TGC_RawDataProviderTool/TgcRawDataProviderTool')
| |-RegisterForContextService = False
-| |-Timeline = True
| |=/***** Private AlgTool Muon::TGC_RawDataProviderTool/TgcRawDataProvider.TGC_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1478,12 +894,7 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f4eee28eaa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
| | | (default: 'Muon::TGC_RodDecoderReadout/TGC_RodDecoderReadout')
-| | |-DetStore @0x7f4eed062a50 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f4eed062a90 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eecfe6128 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eecfe60e0 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RdoLocation = 'StoreGateSvc+TGCRDO'
@@ -1495,10 +906,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f4eed062b50 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eed062b90 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eed05fd88 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eed05fef0 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ShowStatusWords = False
@@ -1517,23 +924,15 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f4eed1d2d90 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eed1d2d10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07a70 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb07b00 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb079e0 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f4eed14cc50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
| | (default: 'Muon::MDT_RawDataProviderTool/MdtRawDataProviderTool')
| |-RegisterForContextService = False
-| |-Timeline = True
| |=/***** Private AlgTool Muon::MDT_RawDataProviderTool/MdtRawDataProvider.MDT_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1543,11 +942,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-CsmContainerCacheKey = 'StoreGateSvc+'
-| | |-Decoder @0x7f4eee28ed70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
-| | |-DetStore @0x7f4eecb93650 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f4eecb93690 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eecb947e8 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eecb94878 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RdoLocation = 'StoreGateSvc+MDTCSM'
@@ -1560,10 +954,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f4eecb93750 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eecb93790 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eecb94758 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eecb94710 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ReadKey = 'ConditionStore+MuonMDT_CablingMap'
@@ -1582,23 +972,15 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f4eed2b7cd0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eed2b7c50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07b48 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb07b90 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb07680 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f4eed5b0810 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
| | (default: 'Muon::CSC_RawDataProviderTool/CscRawDataProviderTool')
| |-RegisterForContextService = False
-| |-Timeline = True
| |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRawDataProvider.CSC_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1608,11 +990,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-CscContainerCacheKey = 'StoreGateSvc+'
-| | |-Decoder @0x7f4eed02e050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
-| | |-DetStore @0x7f4eecb50590 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f4eecb505d0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eecb74ef0 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eecb74e60 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RdoLocation = 'StoreGateSvc+CSCRDO'
@@ -1624,10 +1001,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f4eecb50690 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eecb506d0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eecb74d40 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eecb74cf8 = [] (default: [])
| | | |-IsCosmics = False
| | | |-IsOldCosmics = False
| | | |-MonitorService = 'MonitorSvc'
@@ -1646,29 +1019,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DecodingTool @0x7f4eed4c9d20 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
| | (default: 'Muon::RpcRdoToPrepDataTool/RpcRdoToPrepDataTool')
-| |-DetStore @0x7f4eecae4050 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eecb81f90 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07ab8 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb07c68 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb07cb0 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+RPC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f4ef05f4b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f4eecae40d0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool ******
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1678,16 +1041,11 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f4eecafc210 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f4eecafc290 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eecb5d680 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eecb5d830 = [] (default: [])
| | |-InputCollection = 'StoreGateSvc+RPC_triggerHits'
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+RPCPAD'
| | |-OutputLevel = 0
| | |-RPCInfoFromDb = False
-| | |-RdoDecoderTool @0x7f4eecbe83d0 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
| | | (default: 'Muon::RpcRDO_Decoder')
| | |-TriggerOutputCollection = 'StoreGateSvc+RPC_Measurements'
| | |-etaphi_coincidenceTime = 20.0
@@ -1705,10 +1063,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f4eecafc310 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eecafc350 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eecb5d950 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eecb5d908 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::RpcRDO_Decoder/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool.Muon::RpcRDO_Decoder) -----
@@ -1725,30 +1079,20 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DecodingTool @0x7f4eecb04050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
| | (default: 'Muon::TgcRdoToPrepDataTool/TgcPrepDataProviderTool')
-| |-DetStore @0x7f4eecad9f10 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eecad9e90 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07bd8 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb07cf8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb07d40 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+TGC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f4ef05f4b20 = False (default: False)
-| |-RegionSelectorSvc @0x7f4eecad9f90 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Setting = 0
-| |-Timeline = True
| |=/***** Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool ******
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1758,10 +1102,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f4eecafc490 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f4eecafc550 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eecb03488 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eecb03200 = [] (default: [])
| | |-FillCoinData = True
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCoinCollection = 'TrigT1CoinDataCollection'
@@ -1770,9 +1110,7 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-RDOContainer = 'StoreGateSvc+TGCRDO'
| | |-TGCHashIdOffset = 26000
| | |-dropPrdsWithZeroWidth = True
-| | |-outputCoinKey @0x7f4eecb03440 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
| | | (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
-| | |-prepDataKeys @0x7f4eecb03518 = ['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) -----
@@ -1788,29 +1126,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DecodingTool @0x7f4ef06f69f0 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
| | (default: 'Muon::MdtRdoToPrepDataTool/MdtPrepDataProviderTool')
-| |-DetStore @0x7f4eecb6ded0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eecb6de50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07dd0 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb07e60 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb07e18 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f4ef05f4b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f4eecb6df50 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepData.MdtRdoToMdtPrepDataTool ******
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1821,13 +1149,9 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditTools = False
| | |-CalibratePrepData = True
| | |-DecodeData = True
-| | |-DetStore @0x7f4eecafc690 = ServiceHandle('StoreGateSvc/DetectorStore')
| | |-DiscardSecondaryHitTwin = False
| | |-DoPropagationCorrection = False
| | |-DoTofCorrection = True
-| | |-EvtStore @0x7f4eecafc610 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eecb0bef0 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eecb0bd88 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| | |-OutputLevel = 0
@@ -1854,29 +1178,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-CscRdoToCscPrepDataTool @0x7f4eecfba950 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
| | (default: 'Muon::CscRdoToCscPrepDataTool/CscRdoToPrepDataTool')
-| |-DetStore @0x7f4eecb50cd0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eecb50c50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eecb07f38 = [] (default: [])
-| |-ExtraOutputs @0x7f4eecb07638 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eecb07ea8 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f4ef05f4b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f4eecb50d50 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1886,19 +1200,11 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-CSCHashIdOffset = 22000
-| | |-CscCalibTool @0x7f4ef06b7860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
-| | |-CscRdoDecoderTool @0x7f4eecb00878 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
| | |-DecodeData = True
-| | |-DetStore @0x7f4eecafc9d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f4eecafcad0 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f4eecb0e950 = [] (default: [])
-| | |-ExtraOutputs @0x7f4eecb12050 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| | |-OutputLevel = 0
| | |-RDOContainer = 'StoreGateSvc+CSCRDO'
-| | |-RawDataProviderTool @0x7f4eed5b0af8 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
-| | |-useBStoRdoTool @0x7f4ef05f4b00 = True (default: False)
| | |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool *****
| | | |-AuditFinalize = False
| | | |-AuditInitialize = False
@@ -1908,11 +1214,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStop = False
| | | |-AuditTools = False
| | | |-CscContainerCacheKey = 'StoreGateSvc+'
-| | | |-Decoder @0x7f4eed02e230 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
-| | | |-DetStore @0x7f4eecafcbd0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eecafcc10 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eed06cbd8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eecbefb90 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-RdoLocation = 'StoreGateSvc+CSCRDO'
@@ -1924,10 +1225,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | | |-AuditStart = False
| | | | |-AuditStop = False
| | | | |-AuditTools = False
-| | | | |-DetStore @0x7f4eecafcc50 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | | |-EvtStore @0x7f4eecafccd0 = ServiceHandle('StoreGateSvc')
-| | | | |-ExtraInputs @0x7f4eed06c878 = [] (default: [])
-| | | | |-ExtraOutputs @0x7f4eed06c7a0 = [] (default: [])
| | | | |-IsCosmics = False
| | | | |-IsOldCosmics = False
| | | | |-MonitorService = 'MonitorSvc'
@@ -1942,10 +1239,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f4eecafcb10 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eecafcb50 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eecb0e878 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eecb0e098 = [] (default: [])
| | | |-IsOnline = True
| | | |-Latency = 100.0
| | | |-MonitorService = 'MonitorSvc'
@@ -1972,11 +1265,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-CscCalibTool @0x7f4eecafca50 = PublicToolHandle('CscCalibTool')
-| | | |-DetStore @0x7f4eecafca10 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f4eecafca90 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f4eecb0efc8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f4eecb0ef80 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::CscRDO_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscRDO_Decoder) -----
@@ -1993,83 +1281,30 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f4eecb39fd0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f4eecb39f50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f4eeca87050 = [] (default: [])
-| |-ExtraOutputs @0x7f4eeca870e0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f4eeca87128 = [] (default: [])
| |-OutputLevel = 0
| |-RegisterForContextService = False
-| |-Timeline = True
-| |-cluster_builder @0x7f4eeca7f950 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
| | (default: 'CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool')
| \----- (End of Algorithm CscThresholdClusterBuilder/CscThesholdClusterBuilder) ---------------------
\----- (End of Algorithm AthSequencer/AthAlgSeq) ---------------------------------------------------
-Py:ComponentAccumulator INFO Condition Algorithms
-Py:ComponentAccumulator INFO ['CondInputLoader', 'MuonMDT_CablingAlg']
-Py:ComponentAccumulator INFO Services
-Py:ComponentAccumulator INFO ['EventSelector', 'ByteStreamInputSvc', 'EventPersistencySvc', 'ByteStreamCnvSvc', 'ROBDataProviderSvc', 'ByteStreamAddressProviderSvc', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'ProxyProviderSvc', 'ByteStreamAttListMetadataSvc', 'GeoModelSvc', 'DetDescrCnvSvc', 'TagInfoMgr', 'RPCcablingServerSvc', 'IOVDbSvc', 'PoolSvc', 'CondSvc', 'DBReplicaSvc', 'MuonRPC_CablingSvc', 'LVL1TGC::TGCRecRoiSvc', 'TGCcablingServerSvc', 'AthenaPoolCnvSvc', 'MuonMDT_CablingSvc', 'AtlasFieldSvc', 'MdtCalibrationDbSvc', 'MdtCalibrationSvc', 'CSCcablingSvc', 'MuonCalib::CscCoolStrSvc']
-Py:ComponentAccumulator INFO Outputs
-Py:ComponentAccumulator INFO {}
-Py:ComponentAccumulator INFO Public Tools
-Py:ComponentAccumulator INFO [
-Py:ComponentAccumulator INFO IOVDbMetaDataTool/IOVDbMetaDataTool,
-Py:ComponentAccumulator INFO ByteStreamMetadataTool/ByteStreamMetadataTool,
-Py:ComponentAccumulator INFO Muon::MuonIdHelperTool/Muon::MuonIdHelperTool,
-Py:ComponentAccumulator INFO RPCCablingDbTool/RPCCablingDbTool,
-Py:ComponentAccumulator INFO Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool,
-Py:ComponentAccumulator INFO Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool,
-Py:ComponentAccumulator INFO MDTCablingDbTool/MDTCablingDbTool,
-Py:ComponentAccumulator INFO MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool,
-Py:ComponentAccumulator INFO Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool,
-Py:ComponentAccumulator INFO Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool,
-Py:ComponentAccumulator INFO Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool,
-Py:ComponentAccumulator INFO Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool,
-Py:ComponentAccumulator INFO CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool,
-Py:ComponentAccumulator INFO ]
Py:Athena INFO Save Config
JOs reading stage finished, launching Athena from pickle file
-Fri Jan 25 22:58:00 CET 2019
-Preloading tcmalloc_minimal.so
-Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 1 threads
-Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO now loading MuonRdoDecode.pkl ...
-Py:ConfigurableDb INFO Read module info for 5454 configurables from 75 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-[?1034hApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
- running on lxplus063.cern.ch on Fri Jan 25 22:58:26 2019
-====================================================================================================================================
-ApplicationMgr INFO Successfully loaded modules : AthenaServices
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3320 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)
-ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ROBDataProviderSvc INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
@@ -2084,10 +1319,6 @@ 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)(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-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus063.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/
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
@@ -2096,26 +1327,13 @@ PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
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
IOVDbSvc INFO Global tag: CONDBR2-BLKPA-2018-13 set from joboptions
IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Folder /GLOBAL/BField/Maps will be written to file metadata
IOVDbSvc INFO Initialised with 8 connections and 19 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool','ByteStreamMetadataTool/ByteStreamMetadataTool'])
IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
-ClassIDSvc INFO getRegistryEntries: read 3288 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 163 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 4096 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 129 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 3031 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLONL_RPC/CONDBR2
@@ -2196,10 +1414,6 @@ GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
GeoModelSvc::RD...WARNING Getting InDetMaterials with default tag
-GeoModelSvc.Muo... INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
-GeoModelSvc.Muo... INFO (from GeoModelSvc) AtlasVersion = <ATLAS-R2-2016-01-00-01> MuonVersion = <>
-GeoModelSvc.Muo... INFO Keys for Muon Switches are (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
-GeoModelSvc.Muo... INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01> default MuonVersion is <MuonSpectrometer-R.08.01>
GeoModelSvc.Muo... INFO Properties have been set as follows:
GeoModelSvc.Muo... INFO LayoutName R
GeoModelSvc.Muo... INFO IncludeCutouts 0
@@ -2314,7 +1528,6 @@ AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
MuGM:MuonFactory INFO MMIDHELPER retrieved from DetStore
MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ************************
MuGM:MuonFactory INFO *** Start building the Muon Geometry Tree **********************
-MuGM:RDBReadAtlas INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
RDBAccessSvc WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
MuGM:RDBReadAtlas INFO After getQuery XtomoData
In DblQ00Xtomo(data)
@@ -2344,7 +1557,6 @@ MuGM:ProcCutouts INFO Processing Cutouts DONE
MuGM:RDBReadAtlas INFO ProcessTGCreadout - version 7 wirespacing 1.8
MuGM:RDBReadAtlas INFO Intermediate Objects built from primary numbers
MuGM:MuonFactory INFO theMaterialManager retrieven successfully from the DetStore
-MuGM:MuonFactory INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
MuGM:MuonFactory INFO TreeTop added to the Manager
MuGM:MuonFactory INFO Muon Layout R.08.01
MuGM:MuonFactory INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
@@ -2368,13 +1580,9 @@ 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= 44884Kb Time = 0.78S
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
-ClassIDSvc INFO getRegistryEntries: read 1455 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 1794 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
@@ -2384,17 +1592,12 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' )
-ClassIDSvc INFO getRegistryEntries: read 1370 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 743 CLIDRegistry entries for module ALL
RpcRawDataProvider INFO RpcRawDataProvider::initialize
RpcRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
-MuonRPC_CablingSvc INFO Initializing MuonRPC_CablingSvc - package version MuonRPC_Cabling-00-00-00
ToolSvc.RPCCabl... INFO Initializing - folders names are: conf /RPC/CABLING/MAP_SCHEMA / corr /RPC/CABLING/MAP_SCHEMA_CORR
MuonRPC_CablingSvc INFO RPCCablingDbTool retrieved with statusCode = SUCCESS with handle TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')
MuonRPC_CablingSvc INFO Register call-back against 2 folders listed below
MuonRPC_CablingSvc INFO Folder n. 1 </RPC/CABLING/MAP_SCHEMA> found in the DetStore
-ClassIDSvc INFO getRegistryEntries: read 501 CLIDRegistry entries for module ALL
MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA>
MuonRPC_CablingSvc INFO Folder n. 2 </RPC/CABLING/MAP_SCHEMA_CORR> found in the DetStore
MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA_CORR>
@@ -2409,32 +1612,25 @@ RpcRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
RpcRawDataProvi... INFO Tool = RpcRawDataProvider.RPC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
RpcRawDataProvi... INFO initialize() successful in RpcRawDataProvider.RPC_RawDataProviderTool
TgcRawDataProvider INFO TgcRawDataProvider::initialize
-ClassIDSvc INFO getRegistryEntries: read 878 CLIDRegistry entries for module ALL
TgcRawDataProvi... INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder
TgcRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
TgcRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
TgcRawDataProvi... INFO Tool = TgcRawDataProvider.TGC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
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[0x25900c00]+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
MdtRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
MdtRawDataProvi... INFO Processing configuration for layouts with BME chambers.
MdtRawDataProvi... INFO Processing configuration for layouts with BMG chambers.
MdtRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
MdtRawDataProvi... INFO Tool = MdtRawDataProvider.MDT_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
MdtRawDataProvi... INFO initialize() successful in MdtRawDataProvider.MDT_RawDataProviderTool
-ClassIDSvc INFO getRegistryEntries: read 660 CLIDRegistry entries for module ALL
CscRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
CscRawDataProvi... INFO Tool = CscRawDataProvider.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
CscRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
CscRawDataProvi... INFO The Muon Geometry version is R.08.01
CscRawDataProvi... INFO initialize() successful in CscRawDataProvider.CSC_RawDataProviderTool
-ClassIDSvc INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
-RpcRdoToRpcPrep... INFO package version = MuonRPC_CnvTools-00-00-00
RpcRdoToRpcPrep... INFO properties are
RpcRdoToRpcPrep... INFO processingData 0
RpcRdoToRpcPrep... INFO produceRpcCoinDatafromTriggerWords 1
@@ -2449,17 +1645,14 @@ RpcRdoToRpcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::RpcR
TgcRdoToTgcPrep... INFO initialize() successful in TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool
TgcRdoToTgcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
MdtCalibrationSvc INFO Processing configuration for layouts with BMG chambers.
-ClassIDSvc INFO getRegistryEntries: read 194 CLIDRegistry entries for module ALL
AtlasFieldSvc INFO initialize() ...
AtlasFieldSvc INFO maps will be chosen reading COOL folder /GLOBAL/BField/Maps
-ClassIDSvc INFO getRegistryEntries: read 163 CLIDRegistry entries for module ALL
AtlasFieldSvc INFO magnet currents will be read from COOL folder /EXT/DCS/MAGNETS/SENSORDATA
AtlasFieldSvc INFO Booked callback for /EXT/DCS/MAGNETS/SENSORDATA
AtlasFieldSvc INFO initialize() successful
MdtRdoToMdtPrep... INFO Processing configuration for layouts with BME chambers.
MdtRdoToMdtPrep... INFO Processing configuration for layouts with BMG chambers.
MdtRdoToMdtPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
-ClassIDSvc INFO getRegistryEntries: read 60 CLIDRegistry entries for module ALL
CscRdoToCscPrep... INFO The Geometry version is MuonSpectrometer-R.08.01
CscRdoToCscPrep... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
CscRdoToCscPrep... INFO Tool = CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
@@ -2467,19 +1660,9 @@ CscRdoToCscPrep... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscR
CscRdoToCscPrep... INFO The Muon Geometry version is R.08.01
CscRdoToCscPrep... INFO initialize() successful in CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool
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[0x2a791a00]+259 bound to CondAttrListCollection[CSC_PED]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_NOISE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_PSLOPE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_STAT]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_RMS]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_FTHOLD]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_T0BASE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_T0PHASE]
CscRdoToCscPrep... INFO Retrieved CscRdoToCscPrepDataTool = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
CscRdoToCscPrep...WARNING Implicit circular data dependency detected for id ( 'CscRawDataContainer' , 'StoreGateSvc+CSCRDO' )
HistogramPersis...WARNING Histograms saving not required.
-EventSelector INFO Initializing EventSelector - package version ByteStreamCnvSvc-00-00-00
EventSelector WARNING InputCollections not properly set, checking EventStorageInputSvc properties
EventSelector INFO Retrieved StoreGateSvc name of '':StoreGateSvc
EventSelector INFO reinitialization...
@@ -2491,12 +1674,10 @@ ToolSvc.Luminos... INFO BunchLumisTool.empty() is TRUE, skipping...
ToolSvc.Luminos... INFO BunchGroupTool.empty() is TRUE, skipping...
ToolSvc.Luminos... INFO LBLBFolderName is empty, skipping...
EventSelector INFO Retrieved InputCollections from InputSvc
-ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-ClassIDSvc INFO getRegistryEntries: read 1156 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MAP_SCHEMA'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA'
@@ -2574,7 +1755,6 @@ phi high-pt mu11 mu15 mu15
RPCcabling INFO CablingRPC---InitMaps from COOL: going to read configuration
-RPCcabling INFO CablingRPC--->> RPC cabling map from COOL <<
RPCcabling INFO CablingRPC--- ReadConf: map has size 222202
RPCcabling INFO CablingRPC--- ReadConf: map n. of lines read is 924
RPCcabling INFO CablingRPC--- ReadConf: version is 5.0 Atlas R_07_03_RUN2ver104
@@ -2612,174 +1792,58 @@ AtlasFieldSvc INFO Trying to read from DCS: [channel name, index, value]
AtlasFieldSvc INFO Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20397.7
AtlasFieldSvc INFO Currents read from DCS: solenoid 7729.99 toroid 20399.9
AtlasFieldSvc INFO Initializing the field map (solenoidCurrent=7729.99 toroidCurrent=20399.9)
-AtlasFieldSvc INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-ClassIDSvc INFO getRegistryEntries: read 672 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> start processing event #186525031, run #327265 0 events processed so far <<<===
IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMapSchema_BMG_01 for folder /MDT/CABLING/MAP_SCHEMA
IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMezzanineSchema_M5-RUN2 for folder /MDT/CABLING/MEZZANINE_SCHEMA
IOVDbSvc INFO Disconnecting from COOLONL_MDT/CONDBR2
MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) readCdoMez->size()= 24
-MuonMDT_CablingAlg INFO Range of input is {[0,l:0] - [INVALID]}
MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) readCdoMap->size()= 2312
-MuonMDT_CablingAlg INFO Range of input is {[327264,l:4294640031] - [327265,l:4294640030]}
-MuonMDT_CablingAlg INFO recorded new MuonMDT_CablingMap with range {[327264,l:4294640031] - [327265,l:4294640030]} into Conditions Store
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186525031, run #327265 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186524665, run #327265 1 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186524665, run #327265 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186542447, run #327265 2 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186542447, run #327265 3 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186543405, run #327265 3 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186543405, run #327265 4 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186548387, run #327265 4 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186548387, run #327265 5 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186515186, run #327265 5 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186515186, run #327265 6 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186556019, run #327265 6 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186556019, run #327265 7 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186542866, run #327265 7 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186542866, run #327265 8 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186537901, run #327265 8 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186537901, run #327265 9 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186517811, run #327265 9 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186517811, run #327265 10 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186534221, run #327265 10 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186534221, run #327265 11 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186540986, run #327265 11 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186540986, run #327265 12 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186535104, run #327265 12 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186535104, run #327265 13 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186539903, run #327265 13 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186539903, run #327265 14 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186552713, run #327265 14 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186552713, run #327265 15 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186524730, run #327265 15 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186524730, run #327265 16 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186547632, run #327265 16 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186547632, run #327265 17 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186555621, run #327265 17 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186555621, run #327265 18 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186568452, run #327265 18 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186568452, run #327265 19 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186580451, run #327265 19 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
AthenaEventLoopMgr INFO ===>>> done processing event #186580451, run #327265 20 events processed so far <<<===
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
-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/25 (( 0.19 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/271 (( 0.63 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216598 (( 0.81 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/300 (( 1.42 ))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/444470 (( 0.90 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/58804 (( 0.48 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/1 objs/chan/bytes 1613/1613/7562972 (( 2.88 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/1 objs/chan/bytes 1612/1612/8101322 (( 0.21 ))s
-IOVDbFolder INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/7408 (( 0.82 ))s
-IOVDbFolder INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/331329 (( 0.69 ))s
-IOVDbFolder INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/359591 (( 0.13 ))s
-IOVDbFolder INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422629 (( 0.85 ))s
-IOVDbFolder INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/363009 (( 1.96 ))s
-IOVDbFolder INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422831 (( 0.79 ))s
-IOVDbFolder INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/236289 (( 0.64 ))s
-IOVDbFolder INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322855 (( 0.13 ))s
-IOVDbFolder INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3234 (( 0.80 ))s
-IOVDbSvc INFO bytes in (( 14.33 ))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: (( 2.22 ))s
-IOVDbSvc INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: (( 4.47 ))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.99 ))s
-IOVDbSvc INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.63 ))s
-IOVDbSvc INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.82 ))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()
@@ -2803,8 +1867,6 @@ ToolSvc.TGCCabl... INFO finalize
*****Chrono***** INFO ****************************************************************************************************
*****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= 10.8 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
index a89f1a706c65bbaa88edac63959adf9f6585205c..37b554827509da6f192c83e5837a1a2aa561809c 100644
--- a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
+++ b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
@@ -1,142 +1,4 @@
-Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
Flag Name : Value
-Beam.BunchSpacing : 25
-Beam.Energy : [function]
-Beam.NumberOfCollisions : 0
-Beam.Type : 'collisions'
-Beam.estimatedLuminosity : [function]
-Calo.Noise.fixedLumiForNoise : -1
-Calo.Noise.useCaloNoiseLumi : True
-Calo.TopoCluster.doTreatEnergyCutAsAbsol : False
-Calo.TopoCluster.doTwoGaussianNoise : True
-Common.isOnline : False
-Concurrency.NumConcurrentEvents : 0
-Concurrency.NumProcs : 0
-Concurrency.NumThreads : 0
-DQ.DataType : [function]
-DQ.Environment : [function]
-DQ.FileKey : 'CombinedMonitoring'
-DQ.disableAtlasReadyFilter : False
-DQ.doGlobalMon : True
-DQ.doMonitoring : True
-DQ.doStreamAwareMon : True
-GeoModel.AtlasVersion : 'ATLAS-R2-2016-01-00-01'
-GeoModel.Layout : 'atlas'
-IOVDb.DatabaseInstance : [function]
-IOVDb.GlobalTag : 'CONDBR2-BLKPA-2018-13'
-Input.Files : ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
-Input.ProjectName : [function]
-Input.RunNumber : [function]
-Input.isMC : [function]
-LAr.RawChannelSource : [function]
-LAr.doAlign : [function]
-LAr.doCellEmMisCalib : [function]
-LAr.doCellNoiseMasking : True
-LAr.doCellSporadicNoiseMasking : True
-LAr.doHVCorr : [function]
-Muon.Align.UseALines : False
-Muon.Align.UseAsBuilt : False
-Muon.Align.UseBLines : 'none'
-Muon.Align.UseILines : False
-Muon.Calib.CscF001FromLocalFile : False
-Muon.Calib.CscNoiseFromLocalFile : False
-Muon.Calib.CscPSlopeFromLocalFile : False
-Muon.Calib.CscPedFromLocalFile : False
-Muon.Calib.CscRmsFromLocalFile : False
-Muon.Calib.CscStatusFromLocalFile : False
-Muon.Calib.CscT0BaseFromLocalFile : False
-Muon.Calib.CscT0PhaseFromLocalFile : False
-Muon.Calib.EventTag : 'MoMu'
-Muon.Calib.applyRtScaling : True
-Muon.Calib.correctMdtRtForBField : False
-Muon.Calib.correctMdtRtForTimeSlewing : False
-Muon.Calib.correctMdtRtWireSag : False
-Muon.Calib.mdtCalibrationSource : 'MDT'
-Muon.Calib.mdtMode : 'ntuple'
-Muon.Calib.mdtPropagationSpeedBeta : 0.85
-Muon.Calib.readMDTCalibFromBlob : True
-Muon.Calib.useMLRt : True
-Muon.Chi2NDofCut : 20.0
-Muon.createTrackParticles : True
-Muon.doCSCs : True
-Muon.doDigitization : True
-Muon.doFastDigitization : False
-Muon.doMDTs : True
-Muon.doMSVertex : False
-Muon.doMicromegas : False
-Muon.doPseudoTracking : False
-Muon.doRPCClusterSegmentFinding : False
-Muon.doRPCs : True
-Muon.doSegmentT0Fit : False
-Muon.doTGCClusterSegmentFinding : False
-Muon.doTGCs : True
-Muon.dosTGCs : False
-Muon.enableCurvedSegmentFinding : False
-Muon.enableErrorTuning : False
-Muon.optimiseMomentumResolutionUsingChi2 : False
-Muon.patternsOnly : False
-Muon.prdToxAOD : False
-Muon.printSummary : False
-Muon.refinementTool : 'Moore'
-Muon.rpcRawToxAOD : False
-Muon.segmentOrigin : 'Muon'
-Muon.straightLineFitMomentum : 2000.0
-Muon.strategy : []
-Muon.trackBuilder : 'Moore'
-Muon.updateSegmentSecondCoordinate : [function]
-Muon.useAlignmentCorrections : False
-Muon.useLooseErrorTuning : False
-Muon.useSegmentMatching : [function]
-Muon.useTGCPriorNextBC : False
-Muon.useTrackSegmentMatching : True
-Muon.useWireSagCorrections : False
-Output.AODFileName : 'myAOD.pool.root'
-Output.ESDFileName : 'myESD.pool.root'
-Output.HISTFileName : 'myHIST.root'
-Output.HITFileName : 'myHIT.pool.root'
-Output.RDOFileName : 'myROD.pool.root'
-Output.doESD : False
-Scheduler.CheckDependencies : True
-Scheduler.ShowControlFlow : False
-Scheduler.ShowDataDeps : False
-Scheduler.ShowDataFlow : False
-Trigger.AODEDMSet : []
-Trigger.EDMDecodingVersion : 2
-Trigger.ESDEDMSet : []
-Trigger.L1.CTPVersion : 4
-Trigger.L1.doBcm : True
-Trigger.L1.doMuons : True
-Trigger.L1Decoder.forceEnableAllChains : False
-Trigger.LVL1ConfigFile : [function]
-Trigger.LVL1TopoConfigFile : [function]
-Trigger.OnlineCondTag : 'CONDBR2-HLTP-2016-01'
-Trigger.OnlineGeoTag : 'ATLAS-R2-2015-04-00-00'
-Trigger.calo.doOffsetCorrection : True
-Trigger.dataTakingConditions : 'FullTrigger'
-Trigger.doHLT : True
-Trigger.doL1Topo : True
-Trigger.doLVL1 : [function]
-Trigger.doTriggerConfigOnly : False
-Trigger.doTruth : False
-Trigger.egamma.calibMVAVersiona : [function]
-Trigger.egamma.clusterCorrectionVersion : [function]
-Trigger.egamma.pidVersion : [function]
-Trigger.generateLVL1Config : False
-Trigger.generateLVL1TopoConfig : False
-Trigger.menu.combined : []
-Trigger.menu.electron : []
-Trigger.menu.muon : []
-Trigger.menu.photon : []
-Trigger.menuVersion : [function]
-Trigger.muon.doEFRoIDrivenAccess : False
-Trigger.run2Config : '2018'
-Trigger.triggerConfig : 'MCRECO:DEFAULT'
-Trigger.triggerMenuSetup : 'MC_pp_v7_tight_mc_prescale'
-Trigger.triggerUseFrontier : False
-Trigger.useL1CaloCalibration : False
-Trigger.useRun1CaloEnergyScale : False
-Trigger.writeBS : False
-Trigger.writeL1TopoValData : True
Py:Athena INFO About to setup Rpc Raw data decoding
Py:ComponentAccumulator DEBUG Adding component EventSelectorByteStream/EventSelector to the job
Py:ComponentAccumulator DEBUG Adding component ByteStreamEventStorageInputSvc/ByteStreamInputSvc to the job
@@ -165,7 +27,6 @@ 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:ComponentAccumulator DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
Py:ComponentAccumulator DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
Py:ComponentAccumulator DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
@@ -465,101 +326,12 @@ Py:ComponentAccumulator DEBUG Adding component CondSvc/CondSvc to the job
Py:ComponentAccumulator DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
Py:ComponentAccumulator DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
Py:IOVDbSvc.CondDB DEBUG Loading basic services for CondDBSetup...
-Py:ConfigurableDb DEBUG loading confDb files...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiHive.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libStoreGate.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiCommonSvc.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libprofhelp.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHelloWorld.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHive.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIOVDbSvc.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libPixelConditionsServices.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArMonTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMdtRawDataMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libxAODBTaggingEfficiency.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRecBackgroundAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloClusterMatching.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRingerTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libParticlesInConeTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToCalo.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToVertex.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libISF_Geant4Tools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrkExStraightLineIntersector.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigTauMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCellCorrection.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCondPhysAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcAnalysis.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsDFlow.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libInDetPhysValMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArRecUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCafJobs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonPhysValMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkExamples.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libElectronPhotonTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetMissingEtTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMissingEtDQA.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonMomentumCorrections.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonResonanceTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonSelectorTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRingerSelectorTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauAnalysisTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLongLivedParticleDPDMaker.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDiTauRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMETUtilities.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonCombinedBaseTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libegammaPerformance.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFastCaloSim.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileCalibAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecUtils.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaEmulationTool.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigConfigSvc.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFTK_RecTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigMissingETHypo.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileSimAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTBRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDataQualityTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCellRec.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTrackMonitoring.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkJetEtMiss.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventTagAlgs.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIsolationTool.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/WorkDir.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaAnalysisTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetSubStructureMomentTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetTagTools.confdb]...
-Py:ConfigurableDb DEBUG -loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/GAUDI/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Gaudi.confdb]...
-Py:ConfigurableDb DEBUG -loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Athena.confdb]...
-Py:ConfigurableDb DEBUG loading confDb files... [DONE]
-Py:ConfigurableDb DEBUG loaded 1101 confDb packages
-Py:ConfigurableDb INFO Read module info for 5454 configurables from 75 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-Py:ConfigurableDb DEBUG : Found configurable <class 'GaudiCoreSvc.GaudiCoreSvcConf.MessageSvc'> in module GaudiCoreSvc.GaudiCoreSvcConf
Py:loadBasicAthenaPool DEBUG Loading basic services for AthenaPool...
-Py:ConfigurableDb DEBUG : Found configurable <class 'PoolSvc.PoolSvcConf.PoolSvc'> in module PoolSvc.PoolSvcConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'AthenaServices.AthenaServicesConf.MetaDataSvc'> in module AthenaServices.AthenaServicesConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'StoreGate.StoreGateConf.StoreGateSvc'> in module StoreGate.StoreGateConf
Py:loadBasicAthenaPool DEBUG Loading basic services for AthenaPool... [DONE]
Py:loadBasicIOVDb DEBUG Loading basic services for IOVDbSvc...
-Py:ConfigurableDb DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
Py:Configurable ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
Py:loadBasicEventInfoMgt DEBUG Loading basic services for EventInfoMgt...
-EventInfoMgtInit: Got release version Athena-22.0.1
Py:Configurable ERROR attempt to add a duplicate (ServiceManager.EventPersistencySvc) ... dupe ignored
-Py:ConfigurableDb DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
Py:Configurable ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
Py:loadBasicEventInfoMgt DEBUG Loading basic services for EventInfoMgt... [DONE]
Py:loadBasicIOVDb DEBUG Loading basic services for IOVDb... [DONE]
@@ -620,7 +392,9 @@ 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
@@ -697,6 +471,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::CSC_RawDataProviderTool/CSC_RawDataProviderTool to the job
Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
Py:ComponentAccumulator DEBUG Reconciled configuration of component DetDescrCnvSvc
@@ -782,7 +557,6 @@ Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersi
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:ConfigurableDb DEBUG : Found configurable <class 'MuonRPC_CnvTools.MuonRPC_CnvToolsConf.Muon__RpcRDO_Decoder'> in module MuonRPC_CnvTools.MuonRPC_CnvToolsConf
Py:ComponentAccumulator DEBUG Adding component Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool to the job
Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
@@ -1280,10 +1054,6 @@ Py:ComponentAccumulator DEBUG Reconciled configuration of component EventPersi
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:ConfigurableDb DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscRDO_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'CscCalibTools.CscCalibToolsConf.CscCalibTool'> in module CscCalibTools.CscCalibToolsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CSC_RawDataProviderTool'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
-Py:ConfigurableDb DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscROD_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
Py:ComponentAccumulator DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
Py:ComponentAccumulator DEBUG Reconciled configuration of component CondInputLoader
Py:ComponentAccumulator DEBUG Reconciled configuration of component GeoModelSvc
@@ -1301,13 +1071,8 @@ Py:ComponentAccumulator DEBUG Reconciled configuration of component ToolSvc.Mu
Py:ComponentAccumulator DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
Py:ComponentAccumulator DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
Py:ComponentAccumulator DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
-Py:ConfigurableDb DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
Py:ComponentAccumulator DEBUG Reconciled configuration of component AthenaPoolCnvSvc
Py:Athena INFO Print Config
-Py:ComponentAccumulator INFO Event Inputs
-Py:ComponentAccumulator INFO set([])
-Py:ComponentAccumulator INFO Event Algorithm Sequences
-Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ************************************************************
|-Atomic = False
|-AuditAlgorithms = False
|-AuditBeginRun = False
@@ -1319,61 +1084,21 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
|-AuditRestart = False
|-AuditStart = False
|-AuditStop = False
-|-Cardinality = 0
|-ContinueEventloopOnFPE = False
-|-DetStore @0x7f0b3f4b1990 = ServiceHandle('StoreGateSvc/DetectorStore')
|-Enable = True
|-ErrorCounter = 0
|-ErrorMax = 1
-|-EvtStore @0x7f0b3f4b1910 = ServiceHandle('StoreGateSvc')
-|-ExtraInputs @0x7f0b3da4b488 = [] (default: [])
-|-ExtraOutputs @0x7f0b3da4b638 = [] (default: [])
|-FilterCircularDependencies = True
|-IgnoreFilterPassed = False
|-IsIOBound = False
-|-Members @0x7f0b3da4b290 = ['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 @0x7f0b3da4b710 = [] (default: [])
|-OutputLevel = 0
|-RegisterForContextService = False
|-Sequential = 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 @0x7f0b3e0e63f0 = 'CscCache' (default: 'StoreGateSvc+')
-| |-DetStore @0x7f0b3e1ae910 = ServiceHandle('StoreGateSvc/DetectorStore')
-| |-DisableViewWarning = False
-| |-Enable = True
-| |-ErrorCounter = 0
-| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3e1ae890 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3e2820e0 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3e1b8fc8 = [] (default: [])
-| |-FilterCircularDependencies = True
-| |-IsIOBound = False
-| |-MdtCsmCacheKey @0x7f0b3e0e63c0 = 'MdtCsmCache' (default: 'StoreGateSvc+')
-| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3e282050 = [] (default: [])
-| |-OutputLevel = 0
-| |-RegisterForContextService = False
-| |-RpcCacheKey @0x7f0b3e0e67b0 = 'RpcCache' (default: 'StoreGateSvc+')
-| |-TgcCacheKey @0x7f0b3e0e6810 = 'TgcCache' (default: 'StoreGateSvc+')
-| |-Timeline = True
-| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
|=/***** Algorithm Muon::RpcRawDataProvider/RpcRawDataProvider ***************************************
| |-AuditAlgorithms = False
| |-AuditBeginRun = False
@@ -1385,26 +1110,17 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f0b3e28fb50 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3e28fad0 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3da4b908 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4b758 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3da4b7a0 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f0b3e575528 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
| | (default: 'Muon::RPC_RawDataProviderTool/RpcRawDataProviderTool')
-| |-RegionSelectionSvc @0x7f0b3e28fbd0 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::RPC_RawDataProviderTool/RpcRawDataProvider.RPC_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1413,11 +1129,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f0b3e575620 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
-| | |-DetStore @0x7f0b3e0813d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f0b3e081410 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3e084170 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3e084098 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RPCSec = 'StoreGateSvc+RPC_SECTORLOGIC'
@@ -1431,10 +1142,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStop = False
| | | |-AuditTools = False
| | | |-DataErrorPrintLimit = 1000
-| | | |-DetStore @0x7f0b3e0814d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3e081510 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3e084050 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3e07af80 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-Sector13Data = False
@@ -1453,23 +1160,15 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f0b3e19eb10 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3e19ea90 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3da4bb00 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4bbd8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3da4bb48 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f0b3f2539b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
| | (default: 'Muon::TGC_RawDataProviderTool/TgcRawDataProviderTool')
| |-RegisterForContextService = False
-| |-Timeline = True
| |=/***** Private AlgTool Muon::TGC_RawDataProviderTool/TgcRawDataProvider.TGC_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1478,12 +1177,7 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-Decoder @0x7f0b3f253aa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
| | | (default: 'Muon::TGC_RodDecoderReadout/TGC_RodDecoderReadout')
-| | |-DetStore @0x7f0b3e027a10 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f0b3e027a50 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3dfab128 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3dfab0e0 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputLevel = 0
| | |-RdoLocation = 'StoreGateSvc+TGCRDO'
@@ -1495,10 +1189,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f0b3e027b10 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3e027b50 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3e024d88 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3e024ef0 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ShowStatusWords = False
@@ -1506,6 +1196,27 @@ 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
+| |-DisableViewWarning = False
+| |-Enable = True
+| |-ErrorCounter = 0
+| |-ErrorMax = 1
+| |-FilterCircularDependencies = True
+| |-IsIOBound = False
+| |-MonitorService = 'MonitorSvc'
+| |-OutputLevel = 0
+| |-RegisterForContextService = False
+| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
|=/***** Algorithm Muon::MdtRawDataProvider/MdtRawDataProvider ***************************************
| |-AuditAlgorithms = False
| |-AuditBeginRun = False
@@ -1517,23 +1228,15 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f0b3e198d50 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3e198cd0 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3da4bc20 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4bcb0 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3da4bb90 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f0b3e111c50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
| | (default: 'Muon::MDT_RawDataProviderTool/MdtRawDataProviderTool')
| |-RegisterForContextService = False
-| |-Timeline = True
| |=/***** Private AlgTool Muon::MDT_RawDataProviderTool/MdtRawDataProvider.MDT_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1542,14 +1245,7 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-CsmContainerCacheKey @0x7f0b3e0e63c0 = 'MdtCsmCache' (default: 'StoreGateSvc+')
-| | |-Decoder @0x7f0b3f253d70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
-| | |-DetStore @0x7f0b3db58610 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f0b3db58650 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3db59878 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3db59950 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
-| | |-OutputLevel @ 0x16031d8 = 1 (default: 0)
| | |-RdoLocation = 'StoreGateSvc+MDTCSM'
| | |-ReadKey = 'ConditionStore+MuonMDT_CablingMap'
| | |=/***** Private AlgTool MdtROD_Decoder/MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder *****
@@ -1560,10 +1256,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f0b3db58710 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3db58750 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3db59758 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3db59710 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-ReadKey = 'ConditionStore+MuonMDT_CablingMap'
@@ -1582,23 +1274,15 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f0b3e27cc90 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3e27cc10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3da4bd40 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4bc68 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3da4b7e8 = [] (default: [])
| |-OutputLevel = 0
-| |-ProviderTool @0x7f0b3e575810 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
| | (default: 'Muon::CSC_RawDataProviderTool/CscRawDataProviderTool')
| |-RegisterForContextService = False
-| |-Timeline = True
| |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRawDataProvider.CSC_RawDataProviderTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1607,14 +1291,7 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStart = False
| | |-AuditStop = False
| | |-AuditTools = False
-| | |-CscContainerCacheKey @0x7f0b3e0e63f0 = 'CscCache' (default: 'StoreGateSvc+')
-| | |-Decoder @0x7f0b3dff3050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
-| | |-DetStore @0x7f0b3db16550 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f0b3db16590 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3db1a098 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3db1a050 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
-| | |-OutputLevel @ 0x16031d8 = 1 (default: 0)
| | |-RdoLocation = 'StoreGateSvc+CSCRDO'
| | |=/***** Private AlgTool Muon::CscROD_Decoder/CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder *****
| | | |-AuditFinalize = False
@@ -1624,10 +1301,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f0b3db16650 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3db16690 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3db3be18 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3db3bdd0 = [] (default: [])
| | | |-IsCosmics = False
| | | |-IsOldCosmics = False
| | | |-MonitorService = 'MonitorSvc'
@@ -1646,29 +1319,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DecodingTool @0x7f0b3e48ed20 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
| | (default: 'Muon::RpcRdoToPrepDataTool/RpcRdoToPrepDataTool')
-| |-DetStore @0x7f0b3db45fd0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3db45f50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3da4bcf8 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4be60 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3da4bd88 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+RPC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f0b415b9b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f0b3daaa090 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool ******
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1678,16 +1341,11 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f0b3dac11d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f0b3dac1250 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3db23830 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3db239e0 = [] (default: [])
| | |-InputCollection = 'StoreGateSvc+RPC_triggerHits'
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+RPCPAD'
| | |-OutputLevel = 0
| | |-RPCInfoFromDb = False
-| | |-RdoDecoderTool @0x7f0b3dbad3d0 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
| | | (default: 'Muon::RpcRDO_Decoder')
| | |-TriggerOutputCollection = 'StoreGateSvc+RPC_Measurements'
| | |-etaphi_coincidenceTime = 20.0
@@ -1705,10 +1363,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f0b3dac12d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3dac1310 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3db23b00 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3db23ab8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::RpcRDO_Decoder/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool.Muon::RpcRDO_Decoder) -----
@@ -1725,30 +1379,20 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DecodingTool @0x7f0b3dac9050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
| | (default: 'Muon::TgcRdoToPrepDataTool/TgcPrepDataProviderTool')
-| |-DetStore @0x7f0b3da9eed0 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3da9ee50 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3da4bdd0 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4bea8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3da4bef0 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+TGC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f0b415b9b20 = False (default: False)
-| |-RegionSelectorSvc @0x7f0b3da9ef50 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
| |-Setting = 0
-| |-Timeline = True
| |=/***** Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool ******
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1758,10 +1402,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-DecodeData = True
-| | |-DetStore @0x7f0b3dac1450 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f0b3dac1510 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3dac8638 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3dac85f0 = [] (default: [])
| | |-FillCoinData = True
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCoinCollection = 'TrigT1CoinDataCollection'
@@ -1770,9 +1410,7 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-RDOContainer = 'StoreGateSvc+TGCRDO'
| | |-TGCHashIdOffset = 26000
| | |-dropPrdsWithZeroWidth = True
-| | |-outputCoinKey @0x7f0b3dac8050 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
| | | (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
-| | |-prepDataKeys @0x7f0b3dac86c8 = ['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) -----
@@ -1788,29 +1426,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DecodingTool @0x7f0b416bb9f0 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
| | (default: 'Muon::MdtRdoToPrepDataTool/MdtPrepDataProviderTool')
-| |-DetStore @0x7f0b3db32e90 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3db32e10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3dae60e0 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4bfc8 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3da4be18 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f0b415b9b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f0b3db32f10 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepData.MdtRdoToMdtPrepDataTool ******
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1821,13 +1449,9 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditTools = False
| | |-CalibratePrepData = True
| | |-DecodeData = True
-| | |-DetStore @0x7f0b3dac1650 = ServiceHandle('StoreGateSvc/DetectorStore')
| | |-DiscardSecondaryHitTwin = False
| | |-DoPropagationCorrection = False
| | |-DoTofCorrection = True
-| | |-EvtStore @0x7f0b3dac1610 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3dad20e0 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3dad0f38 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+MDT_DriftCircles'
| | |-OutputLevel = 0
@@ -1854,29 +1478,19 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-CscRdoToCscPrepDataTool @0x7f0b3df7f950 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
| | (default: 'Muon::CscRdoToCscPrepDataTool/CscRdoToPrepDataTool')
-| |-DetStore @0x7f0b3db16c90 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-DoSeededDecoding = False
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3db16c10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3dae61b8 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3da4bf38 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3dae6128 = [] (default: [])
| |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| |-OutputLevel = 0
| |-PrintInputRdo = False
-| |-PrintPrepData @0x7f0b415b9b20 = False (default: False)
-| |-RegionSelectionSvc @0x7f0b3db16d10 = ServiceHandle('RegSelSvc')
| |-RegisterForContextService = False
| |-RoIs = 'StoreGateSvc+OutputRoIs'
-| |-Timeline = True
| |=/***** Private AlgTool Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool *****
| | |-AuditFinalize = False
| | |-AuditInitialize = False
@@ -1886,19 +1500,11 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | |-AuditStop = False
| | |-AuditTools = False
| | |-CSCHashIdOffset = 22000
-| | |-CscCalibTool @0x7f0b4167c860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
-| | |-CscRdoDecoderTool @0x7f0b3dac6878 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
| | |-DecodeData = True
-| | |-DetStore @0x7f0b3dac1990 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore @0x7f0b3dac1a90 = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs @0x7f0b3dad7290 = [] (default: [])
-| | |-ExtraOutputs @0x7f0b3dad7128 = [] (default: [])
| | |-MonitorService = 'MonitorSvc'
| | |-OutputCollection = 'StoreGateSvc+CSC_Measurements'
| | |-OutputLevel = 0
| | |-RDOContainer = 'StoreGateSvc+CSCRDO'
-| | |-RawDataProviderTool @0x7f0b3e575af8 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
-| | |-useBStoRdoTool @0x7f0b415b9b00 = True (default: False)
| | |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool *****
| | | |-AuditFinalize = False
| | | |-AuditInitialize = False
@@ -1908,11 +1514,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStop = False
| | | |-AuditTools = False
| | | |-CscContainerCacheKey = 'StoreGateSvc+'
-| | | |-Decoder @0x7f0b3dff3230 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
-| | | |-DetStore @0x7f0b3dac1b90 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3dac1bd0 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3e031bd8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3dbb4bd8 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | |-RdoLocation = 'StoreGateSvc+CSCRDO'
@@ -1924,10 +1525,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | | |-AuditStart = False
| | | | |-AuditStop = False
| | | | |-AuditTools = False
-| | | | |-DetStore @0x7f0b3dac1c10 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | | |-EvtStore @0x7f0b3dac1c90 = ServiceHandle('StoreGateSvc')
-| | | | |-ExtraInputs @0x7f0b3e0317a0 = [] (default: [])
-| | | | |-ExtraOutputs @0x7f0b3e0315a8 = [] (default: [])
| | | | |-IsCosmics = False
| | | | |-IsOldCosmics = False
| | | | |-MonitorService = 'MonitorSvc'
@@ -1942,10 +1539,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-DetStore @0x7f0b3dac1ad0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3dac1b10 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3dad21b8 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3dad2170 = [] (default: [])
| | | |-IsOnline = True
| | | |-Latency = 100.0
| | | |-MonitorService = 'MonitorSvc'
@@ -1972,11 +1565,6 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| | | |-AuditStart = False
| | | |-AuditStop = False
| | | |-AuditTools = False
-| | | |-CscCalibTool @0x7f0b3dac1a10 = PublicToolHandle('CscCalibTool')
-| | | |-DetStore @0x7f0b3dac19d0 = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore @0x7f0b3dac1a50 = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs @0x7f0b3dad24d0 = [] (default: [])
-| | | |-ExtraOutputs @0x7f0b3dad2b00 = [] (default: [])
| | | |-MonitorService = 'MonitorSvc'
| | | |-OutputLevel = 0
| | | \----- (End of Private AlgTool Muon::CscRDO_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscRDO_Decoder) -----
@@ -1993,83 +1581,30 @@ Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ********
| |-AuditRestart = False
| |-AuditStart = False
| |-AuditStop = False
-| |-Cardinality = 1
-| |-DetStore @0x7f0b3dafef90 = ServiceHandle('StoreGateSvc/DetectorStore')
| |-Enable = True
| |-ErrorCounter = 0
| |-ErrorMax = 1
-| |-EvtStore @0x7f0b3dafef10 = ServiceHandle('StoreGateSvc')
-| |-ExtraInputs @0x7f0b3dae6170 = [] (default: [])
-| |-ExtraOutputs @0x7f0b3dae6320 = [] (default: [])
| |-FilterCircularDependencies = True
| |-IsIOBound = False
| |-MonitorService = 'MonitorSvc'
-| |-NeededResources @0x7f0b3dae62d8 = [] (default: [])
| |-OutputLevel = 0
| |-RegisterForContextService = False
-| |-Timeline = True
-| |-cluster_builder @0x7f0b3da46910 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
| | (default: 'CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool')
| \----- (End of Algorithm CscThresholdClusterBuilder/CscThesholdClusterBuilder) ---------------------
\----- (End of Algorithm AthSequencer/AthAlgSeq) ---------------------------------------------------
-Py:ComponentAccumulator INFO Condition Algorithms
-Py:ComponentAccumulator INFO ['CondInputLoader', 'MuonMDT_CablingAlg']
-Py:ComponentAccumulator INFO Services
-Py:ComponentAccumulator INFO ['EventSelector', 'ByteStreamInputSvc', 'EventPersistencySvc', 'ByteStreamCnvSvc', 'ROBDataProviderSvc', 'ByteStreamAddressProviderSvc', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'ProxyProviderSvc', 'ByteStreamAttListMetadataSvc', 'GeoModelSvc', 'DetDescrCnvSvc', 'TagInfoMgr', 'RPCcablingServerSvc', 'IOVDbSvc', 'PoolSvc', 'CondSvc', 'DBReplicaSvc', 'MuonRPC_CablingSvc', 'LVL1TGC::TGCRecRoiSvc', 'TGCcablingServerSvc', 'AthenaPoolCnvSvc', 'MuonMDT_CablingSvc', 'AtlasFieldSvc', 'MdtCalibrationDbSvc', 'MdtCalibrationSvc', 'CSCcablingSvc', 'MuonCalib::CscCoolStrSvc']
-Py:ComponentAccumulator INFO Outputs
-Py:ComponentAccumulator INFO {}
-Py:ComponentAccumulator INFO Public Tools
-Py:ComponentAccumulator INFO [
-Py:ComponentAccumulator INFO IOVDbMetaDataTool/IOVDbMetaDataTool,
-Py:ComponentAccumulator INFO ByteStreamMetadataTool/ByteStreamMetadataTool,
-Py:ComponentAccumulator INFO Muon::MuonIdHelperTool/Muon::MuonIdHelperTool,
-Py:ComponentAccumulator INFO RPCCablingDbTool/RPCCablingDbTool,
-Py:ComponentAccumulator INFO Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool,
-Py:ComponentAccumulator INFO Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool,
-Py:ComponentAccumulator INFO MDTCablingDbTool/MDTCablingDbTool,
-Py:ComponentAccumulator INFO MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool,
-Py:ComponentAccumulator INFO Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool,
-Py:ComponentAccumulator INFO Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool,
-Py:ComponentAccumulator INFO Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool,
-Py:ComponentAccumulator INFO Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool,
-Py:ComponentAccumulator INFO CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool,
-Py:ComponentAccumulator INFO ]
Py:Athena INFO Save Config
JOs reading stage finished, launching Athena from pickle file
-Fri Jan 25 22:53:54 CET 2019
-Preloading tcmalloc_minimal.so
-Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 1 threads
-Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO now loading MuonRdoDecode_Cache.pkl ...
-Py:ConfigurableDb INFO Read module info for 5454 configurables from 75 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-[?1034hApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
- running on lxplus063.cern.ch on Fri Jan 25 22:54:21 2019
-====================================================================================================================================
-ApplicationMgr INFO Successfully loaded modules : AthenaServices
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3320 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)
-ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ROBDataProviderSvc INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
@@ -2084,10 +1619,6 @@ 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)(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-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus063.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/
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
@@ -2096,26 +1627,13 @@ PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
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
IOVDbSvc INFO Global tag: CONDBR2-BLKPA-2018-13 set from joboptions
IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Folder /GLOBAL/BField/Maps will be written to file metadata
IOVDbSvc INFO Initialised with 8 connections and 19 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool','ByteStreamMetadataTool/ByteStreamMetadataTool'])
IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
-ClassIDSvc INFO getRegistryEntries: read 3288 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 163 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 4096 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 129 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 3031 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLONL_RPC/CONDBR2
@@ -2196,10 +1714,6 @@ GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
GeoModelSvc::RD...WARNING Getting InDetMaterials with default tag
-GeoModelSvc.Muo... INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
-GeoModelSvc.Muo... INFO (from GeoModelSvc) AtlasVersion = <ATLAS-R2-2016-01-00-01> MuonVersion = <>
-GeoModelSvc.Muo... INFO Keys for Muon Switches are (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
-GeoModelSvc.Muo... INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01> default MuonVersion is <MuonSpectrometer-R.08.01>
GeoModelSvc.Muo... INFO Properties have been set as follows:
GeoModelSvc.Muo... INFO LayoutName R
GeoModelSvc.Muo... INFO IncludeCutouts 0
@@ -2314,7 +1828,6 @@ AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
MuGM:MuonFactory INFO MMIDHELPER retrieved from DetStore
MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ************************
MuGM:MuonFactory INFO *** Start building the Muon Geometry Tree **********************
-MuGM:RDBReadAtlas INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
RDBAccessSvc WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
MuGM:RDBReadAtlas INFO After getQuery XtomoData
In DblQ00Xtomo(data)
@@ -2344,7 +1857,6 @@ MuGM:ProcCutouts INFO Processing Cutouts DONE
MuGM:RDBReadAtlas INFO ProcessTGCreadout - version 7 wirespacing 1.8
MuGM:RDBReadAtlas INFO Intermediate Objects built from primary numbers
MuGM:MuonFactory INFO theMaterialManager retrieven successfully from the DetStore
-MuGM:MuonFactory INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
MuGM:MuonFactory INFO TreeTop added to the Manager
MuGM:MuonFactory INFO Muon Layout R.08.01
MuGM:MuonFactory INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
@@ -2368,13 +1880,9 @@ 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= 44884Kb Time = 0.83S
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
-ClassIDSvc INFO getRegistryEntries: read 1455 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 1794 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
@@ -2384,17 +1892,12 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' )
-ClassIDSvc INFO getRegistryEntries: read 1370 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 743 CLIDRegistry entries for module ALL
RpcRawDataProvider INFO RpcRawDataProvider::initialize
RpcRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
-MuonRPC_CablingSvc INFO Initializing MuonRPC_CablingSvc - package version MuonRPC_Cabling-00-00-00
ToolSvc.RPCCabl... INFO Initializing - folders names are: conf /RPC/CABLING/MAP_SCHEMA / corr /RPC/CABLING/MAP_SCHEMA_CORR
MuonRPC_CablingSvc INFO RPCCablingDbTool retrieved with statusCode = SUCCESS with handle TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')
MuonRPC_CablingSvc INFO Register call-back against 2 folders listed below
MuonRPC_CablingSvc INFO Folder n. 1 </RPC/CABLING/MAP_SCHEMA> found in the DetStore
-ClassIDSvc INFO getRegistryEntries: read 501 CLIDRegistry entries for module ALL
MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA>
MuonRPC_CablingSvc INFO Folder n. 2 </RPC/CABLING/MAP_SCHEMA_CORR> found in the DetStore
MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA_CORR>
@@ -2409,25 +1912,19 @@ RpcRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
RpcRawDataProvi... INFO Tool = RpcRawDataProvider.RPC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
RpcRawDataProvi... INFO initialize() successful in RpcRawDataProvider.RPC_RawDataProviderTool
TgcRawDataProvider INFO TgcRawDataProvider::initialize
-ClassIDSvc INFO getRegistryEntries: read 878 CLIDRegistry entries for module ALL
TgcRawDataProvi... INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder
TgcRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
TgcRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
TgcRawDataProvi... INFO Tool = TgcRawDataProvider.TGC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
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[0x260c0100]+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
-MdtRawDataProvi... DEBUG Property update for OutputLevel : new value = 1
MdtRawDataProvi...VERBOSE Starting init
MdtRawDataProvi...VERBOSE Getting m_robDataProvider
MdtRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
MdtRawDataProvi...VERBOSE Getting MuonDetectorManager
MdtRawDataProvi...VERBOSE Getting m_decoder
-MdtRawDataProvi... DEBUG Property update for OutputLevel : new value = 1
MdtRawDataProvi... INFO Processing configuration for layouts with BME chambers.
MdtRawDataProvi... INFO Processing configuration for layouts with BMG chambers.
MdtRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
@@ -2435,21 +1932,16 @@ MdtRawDataProvi... INFO Tool = MdtRawDataProvider.MDT_RawDataProviderTool is
MdtRawDataProvi... DEBUG Could not find TrigConf::HLTJobOptionsSvc
MdtRawDataProvi... INFO initialize() successful in MdtRawDataProvider.MDT_RawDataProviderTool
MdtRawDataProvi... DEBUG Adding private ToolHandle tool MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder (MdtROD_Decoder)
-ClassIDSvc INFO getRegistryEntries: read 660 CLIDRegistry entries for module ALL
-CscRawDataProvi... DEBUG Property update for OutputLevel : new value = 1
CscRawDataProvi...VERBOSE ServiceLocatorHelper::service: found service ActiveStoreSvc
CscRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
CscRawDataProvi...VERBOSE ServiceLocatorHelper::service: found service JobOptionsSvc
CscRawDataProvi... INFO Tool = CscRawDataProvider.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
CscRawDataProvi... DEBUG Could not find TrigConf::HLTJobOptionsSvc
-CscRawDataProvi... DEBUG Property update for OutputLevel : new value = 1
CscRawDataProvi... DEBUG Found the CscIdHelper.
CscRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
CscRawDataProvi... INFO The Muon Geometry version is R.08.01
CscRawDataProvi... INFO initialize() successful in CscRawDataProvider.CSC_RawDataProviderTool
CscRawDataProvi... DEBUG Adding private ToolHandle tool CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder (Muon::CscROD_Decoder)
-ClassIDSvc INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
-RpcRdoToRpcPrep... INFO package version = MuonRPC_CnvTools-00-00-00
RpcRdoToRpcPrep... INFO properties are
RpcRdoToRpcPrep... INFO processingData 0
RpcRdoToRpcPrep... INFO produceRpcCoinDatafromTriggerWords 1
@@ -2464,17 +1956,14 @@ RpcRdoToRpcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::RpcR
TgcRdoToTgcPrep... INFO initialize() successful in TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool
TgcRdoToTgcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
MdtCalibrationSvc INFO Processing configuration for layouts with BMG chambers.
-ClassIDSvc INFO getRegistryEntries: read 194 CLIDRegistry entries for module ALL
AtlasFieldSvc INFO initialize() ...
AtlasFieldSvc INFO maps will be chosen reading COOL folder /GLOBAL/BField/Maps
-ClassIDSvc INFO getRegistryEntries: read 163 CLIDRegistry entries for module ALL
AtlasFieldSvc INFO magnet currents will be read from COOL folder /EXT/DCS/MAGNETS/SENSORDATA
AtlasFieldSvc INFO Booked callback for /EXT/DCS/MAGNETS/SENSORDATA
AtlasFieldSvc INFO initialize() successful
MdtRdoToMdtPrep... INFO Processing configuration for layouts with BME chambers.
MdtRdoToMdtPrep... INFO Processing configuration for layouts with BMG chambers.
MdtRdoToMdtPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
-ClassIDSvc INFO getRegistryEntries: read 60 CLIDRegistry entries for module ALL
CscRdoToCscPrep... INFO The Geometry version is MuonSpectrometer-R.08.01
CscRdoToCscPrep... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
CscRdoToCscPrep... INFO Tool = CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
@@ -2482,19 +1971,9 @@ CscRdoToCscPrep... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscR
CscRdoToCscPrep... INFO The Muon Geometry version is R.08.01
CscRdoToCscPrep... INFO initialize() successful in CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool
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[0x33875a00]+259 bound to CondAttrListCollection[CSC_PED]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_NOISE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_PSLOPE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_STAT]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_RMS]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_FTHOLD]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_T0BASE]
-IOVSvcTool INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_T0PHASE]
CscRdoToCscPrep... INFO Retrieved CscRdoToCscPrepDataTool = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
CscRdoToCscPrep...WARNING Implicit circular data dependency detected for id ( 'CscRawDataContainer' , 'StoreGateSvc+CSCRDO' )
HistogramPersis...WARNING Histograms saving not required.
-EventSelector INFO Initializing EventSelector - package version ByteStreamCnvSvc-00-00-00
EventSelector WARNING InputCollections not properly set, checking EventStorageInputSvc properties
EventSelector INFO Retrieved StoreGateSvc name of '':StoreGateSvc
EventSelector INFO reinitialization...
@@ -2506,12 +1985,10 @@ ToolSvc.Luminos... INFO BunchLumisTool.empty() is TRUE, skipping...
ToolSvc.Luminos... INFO BunchGroupTool.empty() is TRUE, skipping...
ToolSvc.Luminos... INFO LBLBFolderName is empty, skipping...
EventSelector INFO Retrieved InputCollections from InputSvc
-ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-ClassIDSvc INFO getRegistryEntries: read 1156 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MAP_SCHEMA'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA'
@@ -2589,7 +2066,6 @@ phi high-pt mu11 mu15 mu15
RPCcabling INFO CablingRPC---InitMaps from COOL: going to read configuration
-RPCcabling INFO CablingRPC--->> RPC cabling map from COOL <<
RPCcabling INFO CablingRPC--- ReadConf: map has size 222202
RPCcabling INFO CablingRPC--- ReadConf: map n. of lines read is 924
RPCcabling INFO CablingRPC--- ReadConf: version is 5.0 Atlas R_07_03_RUN2ver104
@@ -2627,23 +2103,13 @@ AtlasFieldSvc INFO Trying to read from DCS: [channel name, index, value]
AtlasFieldSvc INFO Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20397.7
AtlasFieldSvc INFO Currents read from DCS: solenoid 7729.99 toroid 20399.9
AtlasFieldSvc INFO Initializing the field map (solenoidCurrent=7729.99 toroidCurrent=20399.9)
-AtlasFieldSvc INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-ClassIDSvc INFO getRegistryEntries: read 672 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> start processing event #186525031, run #327265 0 events processed so far <<<===
IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMapSchema_BMG_01 for folder /MDT/CABLING/MAP_SCHEMA
IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMezzanineSchema_M5-RUN2 for folder /MDT/CABLING/MEZZANINE_SCHEMA
IOVDbSvc INFO Disconnecting from COOLONL_MDT/CONDBR2
MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) readCdoMez->size()= 24
-MuonMDT_CablingAlg INFO Range of input is {[0,l:0] - [INVALID]}
MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) readCdoMap->size()= 2312
-MuonMDT_CablingAlg INFO Range of input is {[327264,l:4294640031] - [327265,l:4294640030]}
-MuonMDT_CablingAlg INFO recorded new MuonMDT_CablingMap with range {[327264,l:4294640031] - [327265,l:4294640030]} into Conditions Store
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG fillCollection: starting
@@ -2757,7 +2223,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 0
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 1
-MdtRawDataProvi... DEBUG Collection ID = 0x6048000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 3
MdtRawDataProvi... DEBUG Found the Beginnning of Link
MdtRawDataProvi... DEBUG subdetId : 97 mrodId : 0 csmId : 1
@@ -2765,7 +2230,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 0
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 1
-MdtRawDataProvi... DEBUG Collection ID = 0x6050000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 2
MdtRawDataProvi... DEBUG Decoding data from TDC number : 3
MdtRawDataProvi... DEBUG Decoding data from TDC number : 4
@@ -2775,7 +2239,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 2
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 1
-MdtRawDataProvi... DEBUG Collection ID = 0x6248000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 6
MdtRawDataProvi... DEBUG Found the Beginnning of Link
MdtRawDataProvi... DEBUG subdetId : 97 mrodId : 0 csmId : 3
@@ -2783,7 +2246,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 2
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 1
-MdtRawDataProvi... DEBUG Collection ID = 0x6250000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 0
MdtRawDataProvi... DEBUG Decoding data from TDC number : 7
MdtRawDataProvi... DEBUG Decoding data from TDC number : 8
@@ -2793,7 +2255,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 4
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 1
-MdtRawDataProvi... DEBUG Collection ID = 0x6448000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 15
MdtRawDataProvi... DEBUG Found the Beginnning of Link
MdtRawDataProvi... DEBUG subdetId : 97 mrodId : 0 csmId : 5
@@ -2801,7 +2262,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 4
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 1
-MdtRawDataProvi... DEBUG Collection ID = 0x6450000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 0
MdtRawDataProvi... DEBUG Decoding data from TDC number : 2
MdtRawDataProvi... DEBUG Decoding data from TDC number : 8
@@ -2937,14 +2397,12 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 0
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 2
-MdtRawDataProvi... DEBUG Collection ID = 0x6049000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Found the Beginnning of Link
MdtRawDataProvi... DEBUG subdetId : 97 mrodId : 1 csmId : 1
MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 0
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 2
-MdtRawDataProvi... DEBUG Collection ID = 0x6051000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 1
MdtRawDataProvi... DEBUG Decoding data from TDC number : 3
MdtRawDataProvi... DEBUG Decoding data from TDC number : 10
@@ -2955,7 +2413,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 2
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 2
-MdtRawDataProvi... DEBUG Collection ID = 0x6249000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 3
MdtRawDataProvi... DEBUG Found the Beginnning of Link
MdtRawDataProvi... DEBUG subdetId : 97 mrodId : 1 csmId : 3
@@ -2963,7 +2420,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 2
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 2
-MdtRawDataProvi... DEBUG Collection ID = 0x6251000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 3
MdtRawDataProvi... DEBUG Decoding data from TDC number : 6
MdtRawDataProvi... DEBUG Found the Beginnning of Link
@@ -2972,7 +2428,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 4
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 2
-MdtRawDataProvi... DEBUG Collection ID = 0x6449000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 2
MdtRawDataProvi... DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 2 chan: 22
MdtRawDataProvi... DEBUG Decoding data from TDC number : 4
@@ -2988,7 +2443,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 4
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 2
-MdtRawDataProvi... DEBUG Collection ID = 0x6451000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 5
MdtRawDataProvi... DEBUG Decoding data from TDC number : 6
MdtRawDataProvi... DEBUG Decoding data from TDC number : 8
@@ -3096,21 +2550,18 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 0
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 3
-MdtRawDataProvi... DEBUG Collection ID = 0x604a000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Found the Beginnning of Link
MdtRawDataProvi... DEBUG subdetId : 97 mrodId : 2 csmId : 1
MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 0
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 3
-MdtRawDataProvi... DEBUG Collection ID = 0x6052000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Found the Beginnning of Link
MdtRawDataProvi... DEBUG subdetId : 97 mrodId : 2 csmId : 2
MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 2
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 3
-MdtRawDataProvi... DEBUG Collection ID = 0x624a000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 0
MdtRawDataProvi... DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 0 chan: 20
MdtRawDataProvi... DEBUG Decoding data from TDC number : 1
@@ -3122,7 +2573,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 2
MdtRawDataProvi... DEBUG Eta : 2
MdtRawDataProvi... DEBUG Phi : 3
-MdtRawDataProvi... DEBUG Collection ID = 0x6252000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 5
MdtRawDataProvi... DEBUG Decoding data from TDC number : 7
MdtRawDataProvi... DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 7 chan: 12
@@ -3134,7 +2584,6 @@ MdtRawDataProvi... DEBUG getOfflineIdfromOnlineID result:
MdtRawDataProvi... DEBUG Name : 4
MdtRawDataProvi... DEBUG Eta : 1
MdtRawDataProvi... DEBUG Phi : 3
-MdtRawDataProvi... DEBUG Collection ID = 0x644a000000000000 does not exist, create it
MdtRawDataProvi... DEBUG Decoding data from TDC number : 1
MdtRawDataProvi... DEBUG Decoding data from TDC number : 4
MdtRawDataProvi... DEBUG Decoding data from TDC number : 9
@@ -3156,7 +2605,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x80
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x80 24 8 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 8
@@ -3166,55 +2614,28 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 112
-CscRawDataProvi... DEBUG RPU Header word 0x5000070
CscRawDataProvi... DEBUG RPU ID original = 5
CscRawDataProvi... DEBUG RPU ID Updated = 5
CscRawDataProvi... DEBUG RPU size = 112
CscRawDataProvi... DEBUG SCA Address = 724315438
-CscRawDataProvi... DEBUG Number of Precision Cluster word 0x20202
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 2
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 2
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
-CscRawDataProvi... DEBUG Second cluster word 0x600006c
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 6
CscRawDataProvi... DEBUG Cluster Data Words = 108
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 12
-CscRawDataProvi... DEBUG cluster location word 0x10a2d
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 46
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 31725 6 51 :: measphi0 L2 strId 46 nStr 4 T0 nSampWords 8 [7.51.-1.1.1.2.2.0.46]
-CscRawDataProvi... DEBUG cluster location word 0x10a35
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 54
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 31733 6 51 :: measphi0 L2 strId 54 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.2.0.54]
-CscRawDataProvi... DEBUG cluster location word 0x10c2c
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 45
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 31916 7 51 :: measphi0 L3 strId 45 nStr 5 T0 nSampWords 10 [7.51.-1.1.1.2.3.0.45]
-CscRawDataProvi... DEBUG cluster location word 0x10c37
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 56
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 31927 7 51 :: measphi0 L3 strId 56 nStr 4 T0 nSampWords 8 [7.51.-1.1.1.2.3.0.56]
-CscRawDataProvi... DEBUG cluster location word 0x10e2d
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 46
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 32109 8 51 :: measphi0 L4 strId 46 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.4.0.46]
-CscRawDataProvi... DEBUG cluster location word 0x10e39
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 58
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 32121 8 51 :: measphi0 L4 strId 58 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.4.0.58]
-CscRawDataProvi... DEBUG cluster location word 0x10903
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 4
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 55491 9 51 :: measphi1 L1 strId 4 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.1.1.4]
-CscRawDataProvi... DEBUG cluster location word 0x10b08
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 9
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 55544 9 51 :: measphi1 L2 strId 9 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.2.1.9]
-CscRawDataProvi... DEBUG cluster location word 0x10b1e
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 31
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 55566 9 51 :: measphi1 L2 strId 31 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.2.1.31]
-CscRawDataProvi... DEBUG cluster location word 0x10d07
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 8
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 55591 9 51 :: measphi1 L3 strId 8 nStr 5 T0 nSampWords 10 [7.51.-1.1.1.2.3.1.8]
-CscRawDataProvi... DEBUG cluster location word 0x10d1e
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 31
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 55614 9 51 :: measphi1 L3 strId 31 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.3.1.31]
-CscRawDataProvi... DEBUG cluster location word 0x10f08
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 9
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 8 55640 9 51 :: measphi1 L4 strId 9 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.4.1.9]
CscRawDataProvi... DEBUG ****Total Cluster count = 12 for RPU ID 5
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3223,7 +2644,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x81
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x81 16 0 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 0
@@ -3233,52 +2653,38 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 122
-CscRawDataProvi... DEBUG RPU Header word 0xd00007a
CscRawDataProvi... DEBUG RPU ID original = 13
CscRawDataProvi... DEBUG RPU ID Updated = 11
CscRawDataProvi... DEBUG RPU size = 122
CscRawDataProvi... DEBUG SCA Address = 2358087311
-CscRawDataProvi... DEBUG Number of Precision Cluster word 0x2000002
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 2
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
-CscRawDataProvi... DEBUG Second cluster word 0x7000076
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 7
CscRawDataProvi... DEBUG Cluster Data Words = 118
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 11
CscRawDataProvi... DEBUG cluster location word 0x810
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 17
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 784 0 50 :: measphi0 L1 strId 17 nStr 4 T0 nSampWords 8 [7.50.-1.1.1.2.1.0.17]
CscRawDataProvi... DEBUG cluster location word 0x868
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000007 105
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 872 0 50 :: measphi0 L1 strId 105 nStr 7 T0 nSampWords 14 [7.50.-1.1.1.2.1.0.105]
CscRawDataProvi... DEBUG cluster location word 0xe11
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x1000000a 18
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 1361 3 50 :: measphi0 L4 strId 18 nStr 10 T0 nSampWords 20 [7.50.-1.1.1.2.4.0.18]
CscRawDataProvi... DEBUG cluster location word 0xe41
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 66
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 1409 3 50 :: measphi0 L4 strId 66 nStr 4 T0 nSampWords 8 [7.50.-1.1.1.2.4.0.66]
CscRawDataProvi... DEBUG cluster location word 0x916
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 23
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 24790 4 50 :: measphi1 L1 strId 23 nStr 5 T0 nSampWords 10 [7.50.-1.1.1.2.1.1.23]
CscRawDataProvi... DEBUG cluster location word 0xb16
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 23
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 24838 4 50 :: measphi1 L2 strId 23 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.2.1.23]
CscRawDataProvi... DEBUG cluster location word 0xd03
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 4
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 24867 4 50 :: measphi1 L3 strId 4 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.3.1.4]
CscRawDataProvi... DEBUG cluster location word 0xd15
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 22
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 24885 4 50 :: measphi1 L3 strId 22 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.3.1.22]
CscRawDataProvi... DEBUG cluster location word 0xd2d
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 46
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 24909 4 50 :: measphi1 L3 strId 46 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.3.1.46]
CscRawDataProvi... DEBUG cluster location word 0xf15
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 22
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 24933 4 50 :: measphi1 L4 strId 22 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.4.1.22]
CscRawDataProvi... DEBUG cluster location word 0xf1e
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 31
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 0 24942 4 50 :: measphi1 L4 strId 31 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.4.1.31]
CscRawDataProvi... DEBUG ****Total Cluster count = 11 for RPU ID 11
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3287,7 +2693,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x82
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x82 25 9 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 9
@@ -3297,7 +2702,6 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 50
-CscRawDataProvi... DEBUG RPU Header word 0x5000032
CscRawDataProvi... DEBUG RPU ID original = 5
CscRawDataProvi... DEBUG RPU ID Updated = 5
CscRawDataProvi... DEBUG RPU size = 50
@@ -3307,24 +2711,13 @@ CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 C
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
-CscRawDataProvi... DEBUG Second cluster word 0x200002e
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 2
CscRawDataProvi... DEBUG Cluster Data Words = 46
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 5
-CscRawDataProvi... DEBUG cluster location word 0x12c17
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 24
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 9 33431 7 51 :: measphi0 L3 strId 24 nStr 5 T0 nSampWords 10 [7.51.-1.2.1.2.3.0.24]
-CscRawDataProvi... DEBUG cluster location word 0x12e16
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 23
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 9 33622 8 51 :: measphi0 L4 strId 23 nStr 3 T0 nSampWords 6 [7.51.-1.2.1.2.4.0.23]
-CscRawDataProvi... DEBUG cluster location word 0x12e1a
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 27
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 9 33626 8 51 :: measphi0 L4 strId 27 nStr 3 T0 nSampWords 6 [7.51.-1.2.1.2.4.0.27]
-CscRawDataProvi... DEBUG cluster location word 0x12d24
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 37
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 9 56004 9 51 :: measphi1 L3 strId 37 nStr 4 T0 nSampWords 8 [7.51.-1.2.1.2.3.1.37]
-CscRawDataProvi... DEBUG cluster location word 0x12f24
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 37
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 9 56052 9 51 :: measphi1 L4 strId 37 nStr 3 T0 nSampWords 6 [7.51.-1.2.1.2.4.1.37]
CscRawDataProvi... DEBUG ****Total Cluster count = 5 for RPU ID 5
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3333,7 +2726,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x83
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x83 17 1 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 1
@@ -3343,52 +2735,27 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 116
-CscRawDataProvi... DEBUG RPU Header word 0xd000074
CscRawDataProvi... DEBUG RPU ID original = 13
CscRawDataProvi... DEBUG RPU ID Updated = 11
CscRawDataProvi... DEBUG RPU size = 116
CscRawDataProvi... DEBUG SCA Address = 1920169077
-CscRawDataProvi... DEBUG Number of Precision Cluster word 0x1010102
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
-CscRawDataProvi... DEBUG Second cluster word 0x6000070
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 6
CscRawDataProvi... DEBUG Cluster Data Words = 112
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 11
-CscRawDataProvi... DEBUG cluster location word 0x2818
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 25
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 2328 0 50 :: measphi0 L1 strId 25 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.1.0.25]
-CscRawDataProvi... DEBUG cluster location word 0x2a17
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000006 24
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 2519 1 50 :: measphi0 L2 strId 24 nStr 6 T0 nSampWords 12 [7.50.-1.2.1.2.2.0.24]
-CscRawDataProvi... DEBUG cluster location word 0x2c17
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 24
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 2711 2 50 :: measphi0 L3 strId 24 nStr 5 T0 nSampWords 10 [7.50.-1.2.1.2.3.0.24]
-CscRawDataProvi... DEBUG cluster location word 0x2e18
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 25
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 2904 3 50 :: measphi0 L4 strId 25 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.4.0.25]
-CscRawDataProvi... DEBUG cluster location word 0x2ebc
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 189
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 3068 3 50 :: measphi0 L4 strId 189 nStr 3 T0 nSampWords 6 [7.50.-1.2.1.2.4.0.189]
-CscRawDataProvi... DEBUG cluster location word 0x2909
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 10
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 25161 4 50 :: measphi1 L1 strId 10 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.1.1.10]
-CscRawDataProvi... DEBUG cluster location word 0x2b09
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 10
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 25209 4 50 :: measphi1 L2 strId 10 nStr 5 T0 nSampWords 10 [7.50.-1.2.1.2.2.1.10]
-CscRawDataProvi... DEBUG cluster location word 0x2d09
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 10
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 25257 4 50 :: measphi1 L3 strId 10 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.3.1.10]
-CscRawDataProvi... DEBUG cluster location word 0x2d16
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 23
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 25270 4 50 :: measphi1 L3 strId 23 nStr 3 T0 nSampWords 6 [7.50.-1.2.1.2.3.1.23]
-CscRawDataProvi... DEBUG cluster location word 0x2f09
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 10
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 25305 4 50 :: measphi1 L4 strId 10 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.4.1.10]
-CscRawDataProvi... DEBUG cluster location word 0x2f28
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 41
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 1 25336 4 50 :: measphi1 L4 strId 41 nStr 3 T0 nSampWords 6 [7.50.-1.2.1.2.4.1.41]
CscRawDataProvi... DEBUG ****Total Cluster count = 11 for RPU ID 11
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3397,7 +2764,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x84
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x84 26 10 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 10
@@ -3407,7 +2773,6 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 114
-CscRawDataProvi... DEBUG RPU Header word 0x5000072
CscRawDataProvi... DEBUG RPU ID original = 5
CscRawDataProvi... DEBUG RPU ID Updated = 5
CscRawDataProvi... DEBUG RPU size = 114
@@ -3417,27 +2782,14 @@ CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 C
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 2
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 0
-CscRawDataProvi... DEBUG Second cluster word 0x400006e
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 4
CscRawDataProvi... DEBUG Cluster Data Words = 110
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 6
-CscRawDataProvi... DEBUG cluster location word 0x14c03
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 4
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 10 34947 7 51 :: measphi0 L3 strId 4 nStr 5 T0 nSampWords 10 [7.51.-1.3.1.2.3.0.4]
-CscRawDataProvi... DEBUG cluster location word 0x14c66
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000013 103
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 10 35046 7 51 :: measphi0 L3 strId 103 nStr 19 T0 nSampWords 38 [7.51.-1.3.1.2.3.0.103]
-CscRawDataProvi... DEBUG cluster location word 0x1491b
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 28
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 10 56283 9 51 :: measphi1 L1 strId 28 nStr 3 T0 nSampWords 6 [7.51.-1.3.1.2.1.1.28]
-CscRawDataProvi... DEBUG cluster location word 0x14d09
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000006 10
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 10 56361 9 51 :: measphi1 L3 strId 10 nStr 6 T0 nSampWords 12 [7.51.-1.3.1.2.3.1.10]
-CscRawDataProvi... DEBUG cluster location word 0x14d1f
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 32
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 10 56383 9 51 :: measphi1 L3 strId 32 nStr 3 T0 nSampWords 6 [7.51.-1.3.1.2.3.1.32]
-CscRawDataProvi... DEBUG cluster location word 0x14d23
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x1000000d 36
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 10 56387 9 51 :: measphi1 L3 strId 36 nStr 13 T0 nSampWords 26 [7.51.-1.3.1.2.3.1.36]
CscRawDataProvi... DEBUG ****Total Cluster count = 6 for RPU ID 5
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3446,7 +2798,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x85
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x85 18 2 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 2
@@ -3456,40 +2807,23 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 90
-CscRawDataProvi... DEBUG RPU Header word 0xd00005a
CscRawDataProvi... DEBUG RPU ID original = 13
CscRawDataProvi... DEBUG RPU ID Updated = 11
CscRawDataProvi... DEBUG RPU size = 90
CscRawDataProvi... DEBUG SCA Address = 1482250843
-CscRawDataProvi... DEBUG Number of Precision Cluster word 0x20100
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 2
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 0
-CscRawDataProvi... DEBUG Second cluster word 0x4000056
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 4
CscRawDataProvi... DEBUG Cluster Data Words = 86
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 7
-CscRawDataProvi... DEBUG cluster location word 0x4a18
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000008 25
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 2 4056 1 50 :: measphi0 L2 strId 25 nStr 8 T0 nSampWords 16 [7.50.-1.3.1.2.2.0.25]
-CscRawDataProvi... DEBUG cluster location word 0x4a3a
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 59
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 2 4090 1 50 :: measphi0 L2 strId 59 nStr 4 T0 nSampWords 8 [7.50.-1.3.1.2.2.0.59]
-CscRawDataProvi... DEBUG cluster location word 0x4c1a
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000006 27
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 2 4250 2 50 :: measphi0 L3 strId 27 nStr 6 T0 nSampWords 12 [7.50.-1.3.1.2.3.0.27]
-CscRawDataProvi... DEBUG cluster location word 0x4b11
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 18
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 2 25601 4 50 :: measphi1 L2 strId 18 nStr 3 T0 nSampWords 6 [7.50.-1.3.1.2.2.1.18]
-CscRawDataProvi... DEBUG cluster location word 0x4b18
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 25
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 2 25608 4 50 :: measphi1 L2 strId 25 nStr 5 T0 nSampWords 10 [7.50.-1.3.1.2.2.1.25]
-CscRawDataProvi... DEBUG cluster location word 0x4b1e
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 31
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 2 25614 4 50 :: measphi1 L2 strId 31 nStr 5 T0 nSampWords 10 [7.50.-1.3.1.2.2.1.31]
-CscRawDataProvi... DEBUG cluster location word 0x4d14
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 21
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 2 25652 4 50 :: measphi1 L3 strId 21 nStr 5 T0 nSampWords 10 [7.50.-1.3.1.2.3.1.21]
CscRawDataProvi... DEBUG ****Total Cluster count = 7 for RPU ID 11
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3498,7 +2832,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x86
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x86 27 11 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 11
@@ -3508,7 +2841,6 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 58
-CscRawDataProvi... DEBUG RPU Header word 0x500003a
CscRawDataProvi... DEBUG RPU ID original = 5
CscRawDataProvi... DEBUG RPU ID Updated = 5
CscRawDataProvi... DEBUG RPU size = 58
@@ -3518,21 +2850,12 @@ CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 C
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 2
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 1
-CscRawDataProvi... DEBUG Second cluster word 0x1000036
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 1
CscRawDataProvi... DEBUG Cluster Data Words = 54
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 4
-CscRawDataProvi... DEBUG cluster location word 0x16c2f
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 48
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 11 36527 7 51 :: measphi0 L3 strId 48 nStr 3 T0 nSampWords 6 [7.51.-1.4.1.2.3.0.48]
-CscRawDataProvi... DEBUG cluster location word 0x16c56
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000008 87
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 11 36566 7 51 :: measphi0 L3 strId 87 nStr 8 T0 nSampWords 16 [7.51.-1.4.1.2.3.0.87]
-CscRawDataProvi... DEBUG cluster location word 0x16e57
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000007 88
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 11 36759 8 51 :: measphi0 L4 strId 88 nStr 7 T0 nSampWords 14 [7.51.-1.4.1.2.4.0.88]
-CscRawDataProvi... DEBUG cluster location word 0x16f04
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 5
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 11 56788 9 51 :: measphi1 L4 strId 5 nStr 5 T0 nSampWords 10 [7.51.-1.4.1.2.4.1.5]
CscRawDataProvi... DEBUG ****Total Cluster count = 4 for RPU ID 5
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3541,7 +2864,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x87
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x87 19 3 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 3
@@ -3551,49 +2873,26 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 92
-CscRawDataProvi... DEBUG RPU Header word 0xd00005c
CscRawDataProvi... DEBUG RPU ID original = 13
CscRawDataProvi... DEBUG RPU ID Updated = 11
CscRawDataProvi... DEBUG RPU size = 92
CscRawDataProvi... DEBUG SCA Address = 404298267
-CscRawDataProvi... DEBUG Number of Precision Cluster word 0x1010101
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 1
-CscRawDataProvi... DEBUG Second cluster word 0x6000058
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 6
CscRawDataProvi... DEBUG Cluster Data Words = 88
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 10
-CscRawDataProvi... DEBUG cluster location word 0x6855
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 86
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 5461 0 50 :: measphi0 L1 strId 86 nStr 4 T0 nSampWords 8 [7.50.-1.4.1.2.1.0.86]
-CscRawDataProvi... DEBUG cluster location word 0x6a7c
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 125
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 5692 1 50 :: measphi0 L2 strId 125 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.2.0.125]
-CscRawDataProvi... DEBUG cluster location word 0x6c77
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 120
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 5879 2 50 :: measphi0 L3 strId 120 nStr 5 T0 nSampWords 10 [7.50.-1.4.1.2.3.0.120]
-CscRawDataProvi... DEBUG cluster location word 0x6e71
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 114
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 6065 3 50 :: measphi0 L4 strId 114 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.4.0.114]
-CscRawDataProvi... DEBUG cluster location word 0x691b
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 28
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 25947 4 50 :: measphi1 L1 strId 28 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.1.1.28]
-CscRawDataProvi... DEBUG cluster location word 0x691f
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 32
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 25951 4 50 :: measphi1 L1 strId 32 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.1.1.32]
-CscRawDataProvi... DEBUG cluster location word 0x6924
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 37
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 25956 4 50 :: measphi1 L1 strId 37 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.1.1.37]
-CscRawDataProvi... DEBUG cluster location word 0x6b17
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 24
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 25991 4 50 :: measphi1 L2 strId 24 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.2.1.24]
-CscRawDataProvi... DEBUG cluster location word 0x6d17
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000004 24
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 26039 4 50 :: measphi1 L3 strId 24 nStr 4 T0 nSampWords 8 [7.50.-1.4.1.2.3.1.24]
-CscRawDataProvi... DEBUG cluster location word 0x6f2a
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 43
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 3 26106 4 50 :: measphi1 L4 strId 43 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.4.1.43]
CscRawDataProvi... DEBUG ****Total Cluster count = 10 for RPU ID 11
CscRawDataProvi... DEBUG end of CscROD_Decode::fillCollection()
@@ -3602,7 +2901,6 @@ CscRawDataProvi... DEBUG in CscROD_Decoder::fillCollection :ROD version 401
CscRawDataProvi... DEBUG
CscRawDataProvi... DEBUG ===================================================
CscRawDataProvi... DEBUG in CscROD_Decode::fillCollection() - ROD version 2
-CscRawDataProvi... DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
CscRawDataProvi... DEBUG Online ROD id is 0x88
CscRawDataProvi... DEBUG Online ROD / ROD / collection / subDetector IDs are 0x88 28 12 106
CscRawDataProvi... DEBUG CSC RDO collection does not exist - creating a new one with hash = 12
@@ -3612,50 +2910,28 @@ CscRawDataProvi... DEBUG Is Calibration Enabled?: 0 Calibration Amplitude: 5
CscRawDataProvi... DEBUG Calibration Layer: 0 Latency: 126
CscRawDataProvi... DEBUG Is neutron rejection ON?: 0 Is sparsified data?: 1
CscRawDataProvi... DEBUG CscROD_Decoder Total words received = 74
-CscRawDataProvi... DEBUG RPU Header word 0x500004a
CscRawDataProvi... DEBUG RPU ID original = 5
CscRawDataProvi... DEBUG RPU ID Updated = 5
CscRawDataProvi... DEBUG RPU size = 74
CscRawDataProvi... DEBUG SCA Address = 1499093852
-CscRawDataProvi... DEBUG Number of Precision Cluster word 0x2000001
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 2
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 0
CscRawDataProvi... DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 1
-CscRawDataProvi... DEBUG Second cluster word 0x5000046
CscRawDataProvi... DEBUG Summed Number of Clusters for non-precision layers 5
CscRawDataProvi... DEBUG Cluster Data Words = 70
CscRawDataProvi... DEBUG Total summed Cluster Count for precision and non-precision layers = 8
-CscRawDataProvi... DEBUG cluster location word 0x18831
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 50
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 12 37681 5 51 :: measphi0 L1 strId 50 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.1.0.50]
-CscRawDataProvi... DEBUG cluster location word 0x188ab
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 172
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 12 37803 5 51 :: measphi0 L1 strId 172 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.1.0.172]
-CscRawDataProvi... DEBUG cluster location word 0x18e03
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000005 4
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 12 38211 8 51 :: measphi0 L4 strId 4 nStr 5 T0 nSampWords 10 [7.51.-1.5.1.2.4.0.4]
-CscRawDataProvi... DEBUG cluster location word 0x18908
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 9
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 12 57032 9 51 :: measphi1 L1 strId 9 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.1.1.9]
-CscRawDataProvi... DEBUG cluster location word 0x1892e
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000002 47
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 12 57070 9 51 :: measphi1 L1 strId 47 nStr 2 T0 nSampWords 4 [7.51.-1.5.1.2.1.1.47]
-CscRawDataProvi... DEBUG cluster location word 0x18b00
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000002 1
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 12 57072 9 51 :: measphi1 L2 strId 1 nStr 2 T0 nSampWords 4 [7.51.-1.5.1.2.2.1.1]
-CscRawDataProvi... DEBUG cluster location word 0x18d0d
-CscRawDataProvi... DEBUG cluster time size word : stripId (CscIdHelper) 0x10000003 14
CscRawDataProvi... DEBUG idColl clusHashid spuID stationId :: 12 57133 9 51 :: measphi1 L3 strId 14 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.3.1.14]
-CscRawDataProvi... DEBUG cluster location word 0x18f1c
CscRawDataProvi...WARNING DEBUG message limit (500) reached for CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder. Suppressing further output.
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186525031, run #327265 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186524665, run #327265 1 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3667,10 +2943,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186524665, run #327265 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186542447, run #327265 2 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3682,10 +2954,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186542447, run #327265 3 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186543405, run #327265 3 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3697,10 +2965,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186543405, run #327265 4 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186548387, run #327265 4 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3712,10 +2976,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186548387, run #327265 5 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186515186, run #327265 5 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3727,10 +2987,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186515186, run #327265 6 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186556019, run #327265 6 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3742,10 +2998,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186556019, run #327265 7 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186542866, run #327265 7 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3757,10 +3009,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186542866, run #327265 8 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186537901, run #327265 8 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3772,10 +3020,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186537901, run #327265 9 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186517811, run #327265 9 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3787,10 +3031,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186517811, run #327265 10 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186534221, run #327265 10 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3802,10 +3042,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186534221, run #327265 11 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186540986, run #327265 11 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3817,10 +3053,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186540986, run #327265 12 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186535104, run #327265 12 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3832,10 +3064,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186535104, run #327265 13 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186539903, run #327265 13 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3847,10 +3075,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186539903, run #327265 14 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186552713, run #327265 14 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3862,10 +3086,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186552713, run #327265 15 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186524730, run #327265 15 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3877,10 +3097,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186524730, run #327265 16 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186547632, run #327265 16 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3892,10 +3108,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186547632, run #327265 17 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186555621, run #327265 17 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3907,10 +3119,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186555621, run #327265 18 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186568452, run #327265 18 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3922,10 +3130,6 @@ CscRawDataProvi... DEBUG vector of ROB ID to decode: size = 32
CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186568452, run #327265 19 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #186580451, run #327265 19 events processed so far <<<===
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+MdtCsmCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+CscCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+RpcCache'
-MuonCacheCreator INFO Created cache container 'StoreGateSvc+TgcCache'
MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
MdtRawDataProvi... DEBUG Created container using cache for MdtCsmCache
MdtRawDataProvi... DEBUG After processing numColls=1136
@@ -3938,40 +3142,10 @@ CscRawDataProvi... DEBUG After processing numColls=32
AthenaEventLoopMgr INFO ===>>> done processing event #186580451, run #327265 20 events processed so far <<<===
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
-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/25 (( 1.39 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/271 (( 6.55 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216598 (( 1.41 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/300 (( 0.82 ))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/444470 (( 1.18 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/58804 (( 0.58 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/1 objs/chan/bytes 1613/1613/7562972 (( 2.72 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/1 objs/chan/bytes 1612/1612/8101322 (( 0.60 ))s
-IOVDbFolder INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/7408 (( 0.95 ))s
-IOVDbFolder INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/331329 (( 1.47 ))s
-IOVDbFolder INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/359591 (( 0.40 ))s
-IOVDbFolder INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422629 (( 1.35 ))s
-IOVDbFolder INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/363009 (( 2.15 ))s
-IOVDbFolder INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422831 (( 0.21 ))s
-IOVDbFolder INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/236289 (( 0.76 ))s
-IOVDbFolder INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322855 (( 0.26 ))s
-IOVDbFolder INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3234 (( 1.53 ))s
-IOVDbSvc INFO bytes in (( 24.31 ))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: (( 2.22 ))s
-IOVDbSvc INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: (( 5.09 ))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: (( 8.12 ))s
-IOVDbSvc INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 6.55 ))s
-IOVDbSvc INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.95 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 1.39 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.ByteStr... INFO in finalize()
@@ -3995,17 +3169,12 @@ ToolSvc.TGCCabl... INFO finalize
*****Chrono***** INFO ****************************************************************************************************
*****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= 11.7 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Listing sources of suppressed message:
-=====================================================
Message Source | Level | Count
------------------------------+---------+-------------
CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder| DEBUG | 35169
MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder| DEBUG | 854603
-=====================================================
Py:Athena INFO leaving with code 0: "successful run"
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt
index 3d0362c4e26e1f515d127cdd04da8fb671d4f93c..6b2f0688562ede3b7a7c125e512718fbb377198d 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt
@@ -25,8 +25,7 @@ find_package( ROOT COMPONENTS Core )
# In the standalone build create a "CINT dictionary":
if( XAOD_STANDALONE )
atlas_add_root_dictionary( PATCoreLib PATCoreLibDictSource
- ROOT_HEADERS PATCore/TAccept.h
- PATCore/TSelectorToolBase.h Root/LinkDef.h
+ ROOT_HEADERS PATCore/TSelectorToolBase.h Root/LinkDef.h
EXTERNAL_PACKAGES ROOT )
endif()
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAsgSelectionWithVertexTool.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAsgSelectionWithVertexTool.h
deleted file mode 100644
index bd3404a60e108deb6886f2160b982f01517e844f..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAsgSelectionWithVertexTool.h
+++ /dev/null
@@ -1,64 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// IAsgSelectionWithVertexTool.h.h
-// Header file for class IAsgSelectionWithVertexTool.h
-// Author: Karsten Koeneke <karsten.koeneke@cern.ch>
-///////////////////////////////////////////////////////////////////
-#ifndef PATCORE_IASGSELECTIONWITHVERTEXTOOL_H
-#define PATCORE_IASGSELECTIONWITHVERTEXTOOL_H 1
-
-// STL includes
-
-
-// FrameWork includes
-#include "AsgTools/IAsgTool.h"
-
-// Include the return object
-#include "PATCore/TAccept.h"
-
-// Forward declaration
-namespace xAOD{
- class IParticle;
- class Vertex_v1;
- typedef Vertex_v1 Vertex;
-}
-
-
-
-// this ought to be deprecated, but we have so many clients, that we
-// are not doing it yet.
-class [[deprecated("do not use for multi-threaded code")]] IAsgSelectionWithVertexTool
- : virtual public asg::IAsgTool
-{
- /// Declare the interface ID for this pure-virtual interface class to the Athena framework
- ASG_TOOL_INTERFACE(IAsgSelectionWithVertexTool)
-
-
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
-public:
-
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
-
- /** Method to get the plain TAccept.
- This is needed so that one can already get the TAccept
- and query what cuts are defined before the first object
- is passed to the tool. */
- virtual const Root::TAccept& getTAccept( ) const = 0;
-
-
- /** The main accept method: the actual cuts are applied here */
- virtual const Root::TAccept& accept( const xAOD::IParticle* /*part*/,
- const xAOD::Vertex* /*vertex=0*/ ) const = 0;
-
-
-};
-
-#endif //> !PATCORE_IASGSELECTIONWITHVERTEXTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthSelectorTool.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthSelectorTool.h
deleted file mode 100644
index b784083bfdc6415c505a2177e13d174a5d949db8..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthSelectorTool.h
+++ /dev/null
@@ -1,82 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// IAthSelectorTool.h
-// Header file for class IAthSelectorTool
-// Author: Karsten Koeneke <karsten.koeneke@cern.ch>
-///////////////////////////////////////////////////////////////////
-#ifndef PATCORE_IATHSELECTORTOOL_H
-#define PATCORE_IATHSELECTORTOOL_H 1
-
-// STL includes
-
-// HepMC / CLHEP includes
-
-// FrameWork includes
-#include "GaudiKernel/IAlgTool.h"
-
-// Include the return object
-#include "PATCore/TAccept.h"
-
-// Forward declaration
-class INavigable4Momentum;
-
-
-static const InterfaceID IID_IAthSelectorTool("IAthSelectorTool", 1, 0);
-
-// this ought to be deprecated, but we have so many clients, that we
-// are not doing it yet.
-class [[deprecated("do not use for multi-threaded code")]] IAthSelectorTool
- : virtual public ::IAlgTool
-{
-
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
- public:
-
- /** Destructor:
- */
- //virtual ~IAthSelectorTool(){};
-
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
- static const InterfaceID& interfaceID();
-
-
- /** Method to get the plain TAccept */
- virtual const Root::TAccept& getTAccept( ) = 0;
-
-
- /** The main accept method: the actual cuts are applied here */
- virtual const Root::TAccept& accept( const INavigable4Momentum* /*part*/ ) = 0;
-
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Protected data:
- ///////////////////////////////////////////////////////////////////
- protected:
-
-};
-
-/// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Inline methods:
-///////////////////////////////////////////////////////////////////
-inline const InterfaceID& IAthSelectorTool::interfaceID()
-{
- return IID_IAthSelectorTool;
-}
-
-
-#endif //> !OBJECTSELECTORCORE_IATHSELECTORTOOL_H
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IUserDataCalcTool.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IUserDataCalcTool.h
index d364fa30326967786a6dad5379d2953d611713a3..c2afb661c82339407e4dc325a9ee5534efe11273 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IUserDataCalcTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IUserDataCalcTool.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
*/
// Dear emacs, this is -*-c++-*-
@@ -40,10 +40,6 @@ class IUserDataCalcTool
{
public:
- /** Destructor:
- */
- //virtual ~IAthSelectorTool(){};
-
/** AlgTool interface methods */
static const InterfaceID& interfaceID();
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/PATCoreDict.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/PATCoreDict.h
index 79c90fe3a62fb90c60c2f1cd8eaeec1c95dd84fe..645930cab434b9b3c90afa371b347f474f41b441 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/PATCoreDict.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/PATCoreDict.h
@@ -1,11 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Dear emacs, this is -*-c++-*-
-#ifndef __PATCOREDICT__
-#define __PATCOREDICT__
+#ifndef PATCORE_PATCOREDICT_H
+#define PATCORE_PATCOREDICT_H
/**
@brief For dictionary generation.
@@ -17,15 +17,12 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#include "PATCore/TAccept.h"
#include "PATCore/AcceptInfo.h"
#include "PATCore/AcceptData.h"
#include "PATCore/TSelectorToolBase.h"
#include "PATCore/IAsgSelectionTool.h"
-#include "PATCore/IAsgSelectionWithVertexTool.h"
#ifndef ROOTCORE
-#include "PATCore/IAthSelectorTool.h"
#include "PATCore/IAthHistogramTool.h"
#include "PATCore/IUserDataCalcTool.h"
#endif
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/TAccept.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/TAccept.h
deleted file mode 100644
index f493a3f0df34385411776a730978677f79d25938..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/TAccept.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// Dear emacs, this is -*-c++-*-
-
-#ifndef PATCORE_TACCEPT_H
-#define PATCORE_TACCEPT_H
-
-/**
- @class TAccept
- @brief Object to encode the result of several cuts
-
- @author Karsten Koeneke (CERN)
- @date April 2011
-
-*/
-
-#include <TString.h>
-#include <map>
-#include <bitset>
-
-
-namespace Root {
- // this ought to be deprecated, but we have so many clients, that we
- // are not doing it yet.
- class [[deprecated("please use TAcceptInfo+TAcceptData for multi-threaded code")]] TAccept
- {
-
- public:
- /** The number of bits for cuts */
- static const unsigned int NBITS=32;
-
- /** Standard constructor */
- TAccept(const char* name="TAccept");
-
- /** Standard copy constructor: DO NOT COPY IT! It is expensive to copy! */
- TAccept( const TAccept& parent );
-
- /** Standard assignment operator: DO NOT COPY IT! It is expensive to copy! */
- TAccept& operator= ( const TAccept& rhs );
-
- /** Standard destructor */
- virtual ~TAccept();
-
- public:
- /** Overload the boolean cast; allows for: if(myTAccept) */
- inline operator bool() const
- {
- return (m_accept.count() == m_cutMap.size()) ? true : false ;
- };
-
-
- /** Get the name of the class instance */
- inline const char* getName() const { return m_name; };
-
-
- /** Clear all bits */
- inline void clear() { m_accept.reset(); }
-
- /** Set all bits to true */
- inline void clearPositive()
- {
- for ( unsigned int i=0; i<m_cutMap.size(); ++i ) m_accept[i] = true;
- }
-
-
- /** Get the number of cuts defined */
- inline unsigned int getNCuts() const { return m_cutMap.size(); };
-
-
- /** Add a cut; returning the cut position */
- int addCut( const TString& cutName, const TString& cutDescription );
-
-
- /** Get the bit position of a cut */
- inline unsigned int getCutPosition( const TString& cutName ) const
- {
- std::map< TString, std::pair< TString, unsigned int > >::const_iterator it = m_cutMap.find(cutName);
- return (it != m_cutMap.end()) ? (it->second).second : 999999;
- }
-
-
- /** Get the name of a cut, based on the cut position (slow, avoid usage)*/
- const TString& getCutName( unsigned int cutPosition ) const;
-
-
- /** Get the description of a cut, based on the cut name */
- inline const TString& getCutDescription( const TString& cutName ) const
- {
- std::map< TString, std::pair< TString, unsigned int > >::const_iterator it = m_cutMap.find(cutName);
- return (it != m_cutMap.end()) ? (it->second).first : m_emptyString;
- }
-
- /** Get the description of a cut, based on the cut position */
- const TString& getCutDescription( unsigned int cutPosition ) const;
-
-
- /** Get the result of a cut, based on the cut name (safer) */
- inline bool getCutResult( const TString& cutName ) const
- {
- unsigned int cutPosition = getCutPosition(cutName);
- return getCutResult(cutPosition);
- }
-
- /** Get the result of a cut, based on the cut position (faster) */
- inline bool getCutResult( unsigned int cutPosition ) const
- {
- return m_accept[cutPosition];
- }
-
-
- /** Get the cut result bitset */
- inline std::bitset<NBITS> getCutResultBitSet() const
- {
- return m_accept;
- }
-
- /** Get an inverted bitset of the cut result.
- This is IsEM-style, i.e, 0 means the cut is passed */
- inline std::bitset<NBITS> getCutResultInvertedBitSet() const
- {
- std::bitset<NBITS> inverted;
- // Iterate over the "active" bits and invert them.
- for ( std::size_t i=0; i<m_cutMap.size(); ++i )
- {
- inverted[i] = !(m_accept.test(i));
- }
- return inverted;
- }
-
- /** Get an inverted bitset as an unsigned integer of the cut result.
- This is IsEM-style, i.e, 0 means that all cuts are passed */
- inline unsigned int getCutResultInverted() const
- {
- std::bitset<NBITS> inverted;
- // Iterate over the "active" bits and invert them.
- for ( std::size_t i=0; i<m_cutMap.size(); ++i )
- {
- inverted[i] = !(m_accept.test(i));
- }
- return inverted.to_ulong();
- }
-
-
-
- /** Set the result of a cut, based on the cut name (safer) */
- inline void setCutResult( const TString& cutName, bool cutResult )
- {
- unsigned int cutPosition = getCutPosition(cutName);
- return setCutResult( cutPosition, cutResult );
- }
-
- /** Get the result of a cut, based on the cut position (faster) */
- inline void setCutResult( unsigned int cutPosition, bool cutResult )
- {
- m_accept[cutPosition] = cutResult;
- return;
- }
-
-
- /** Set the result of a cut, based on the cut name (safer) */
- inline void setCutDescription( const TString& cutName, const TString& cutDescription )
- {
- unsigned int cutPosition = getCutPosition(cutName);
- return setCutDescription( cutPosition, cutDescription );
- }
-
- /** Get the result of a cut, based on the cut position (faster) */
- void setCutDescription( unsigned int cutPosition, const TString& cutDescription );
-
-
-#ifdef ROOTCORE
- /** For convenient PROOF support */
- ClassDef(TAccept,1);
-#endif
-
-
- // Protected members
- protected:
- /** The name of the class instance */
- TString m_name;
-
-
- // Private members
- private:
- /** The cut bits */
- std::bitset<NBITS> m_accept;
-
- /** The map for mapping cut names to their description and position */
- std::map< TString, std::pair< TString, unsigned int > > m_cutMap;
-
- /** An empty string as default return for some member methods */
- TString m_emptyString;
-
-
- }; // End: class definition
-
-} // End: namespace Root
-
-
-#endif
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/TSelectorToolBase.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/TSelectorToolBase.h
index 89bc8be0e717f1329c1a1a8a0e9aa2be39e068db..8099712111683ac01501cbc234984d899dda2d43 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/TSelectorToolBase.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/TSelectorToolBase.h
@@ -1,11 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Dear emacs, this is -*-c++-*-
-#ifndef __TSELECTORTOOLBASE__
-#define __TSELECTORTOOLBASE__
+#ifndef PATCORE_TSELECTORTOOLBASE_H
+#define PATCORE_TSELECTORTOOLBASE_H
/**
@class TSelectorToolBase
@@ -19,16 +19,14 @@
#include "TString.h"
// Include the return object
-#include "TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
// include the configuration in RootCore environment
// if this does not exist, call $ROOTCOREDIR/scripts/compile.sh
// don't just comment out this line
#ifdef ROOTCORE
#include <RootCore/Packages.h>
-#ifdef ROOTCORE_PACKAGE_D3PDReader
-#define PAT_CORE_D3PDREADER
-#endif
#endif
class TObject;
@@ -44,7 +42,7 @@ namespace Root {
/** Standard constructor */
TSelectorToolBase(const char* name="TSelectorToolBase") :
m_name(name),
- m_accept( Form("%s_TAccept",name) )
+ m_accept( Form("%s_Accept",name) )
{
}
@@ -65,18 +63,12 @@ namespace Root {
inline const char* getName() const { return m_name.Data(); };
- /** Method to get the plain TAccept */
- const Root::TAccept& getTAccept( ) const
+ /** Method to get the plain AcceptInfo */
+ const asg::AcceptInfo& getAcceptInfo( ) const
{
return m_accept;
}
-#ifdef PAT_CORE_D3PDREADER
- /** The generic D3PDReader accept method */
- virtual const Root::TAccept& accept( const TObject& /*d3pd*/ ) {return m_accept;}
-#endif
-
-
#ifdef ROOTCORE
/** For convenient PROOF support */
ClassDef(TSelectorToolBase,1);
@@ -88,8 +80,8 @@ namespace Root {
/** The name of the class instance */
TString m_name;
- /** The return TAccept object */
- mutable TAccept m_accept;//!
+ /** The return AcceptInfo object */
+ asg::AcceptInfo m_accept;//!
}; // End: class definition
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/selection.xml b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/selection.xml
index 55d09eda23a9ac2542c93e4bc74f36ee048ad78e..eb2e0d8466a8b06e4d9263b56e58f7041f9e47c9 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/selection.xml
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/selection.xml
@@ -1,12 +1,9 @@
<lcgdict>
- <class name="Root::TAccept" />
<class name="asg::AcceptInfo" />
<class name="asg::AcceptData" />
<!--<class name="std::bitset<32>" />-->
<class name="Root::TSelectorToolBase" />
- <class name="IAthSelectorTool" />
<class name="IUserDataCalcTool" />
<class name="IAthHistogramTool" />
<class name="IAsgSelectionTool" />
- <class name="IAsgSelectionWithVertexTool" />
</lcgdict>
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/Root/LinkDef.h b/PhysicsAnalysis/AnalysisCommon/PATCore/Root/LinkDef.h
index b083fcac64fd42f25a4df4e147e5fdf0a77f526a..6ab8d03dc3b4d0537c9211944cd4a572715c5852 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/Root/LinkDef.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/Root/LinkDef.h
@@ -1,16 +1,15 @@
/*
- 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 __PATCORE__
-#define __PATCORE__
+#ifndef PATCORE_LINKDEF_H
+#define PATCORE_LINKDEF_H
#include <vector>
#include <string>
#include <bitset>
#include "TString.h"
-#include "PATCore/TAccept.h"
#include "PATCore/TSelectorToolBase.h"
#ifdef __CINT__
@@ -21,7 +20,6 @@
#pragma link C++ namespace Root ;
-#pragma link C++ class Root::TAccept+ ;
#pragma link C++ class Root::TSelectorToolBase+ ;
#endif
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/Root/TAccept.cxx b/PhysicsAnalysis/AnalysisCommon/PATCore/Root/TAccept.cxx
deleted file mode 100644
index ee3c035519b151109617a41c5b83999bdc464a37..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/Root/TAccept.cxx
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-/******************************************************************************
-Name: TAccept
-
-Author: Karsten Koeneke (CERN)
-Created: April 2011
-
-Description: Object to encode the result of several cuts
-******************************************************************************/
-
-// This class' header
-#include "PATCore/TAccept.h"
-
-
-// include math
-#include <math.h>
-#include <utility>
-#include <map>
-#include <iostream>
-
-// ROOT includes
-#include <TString.h>
-
-
-
-
-//=============================================================================
-// Constructor
-//=============================================================================
-Root::TAccept::TAccept(const char* name) :
- m_name(name),
- m_accept(), // all bits initialized to zero
- m_cutMap(),
- m_emptyString("")
-{
-}
-
-
-
-
-//=============================================================================
-// Copy Constructor: DO NOT COPY IT! It is expensive to copy!
-//=============================================================================
-Root::TAccept::TAccept(const TAccept& parent) :
- m_name( parent.m_name ),
- m_accept( parent.m_accept ),
- m_cutMap( parent.m_cutMap ),
- m_emptyString( parent.m_emptyString )
-{
-}
-
-
-
-
-//=============================================================================
-// Assignemnt operator: DO NOT COPY IT! It is expensive to copy!
-//=============================================================================
-Root::TAccept& Root::TAccept::operator= ( const TAccept& rhs )
-{
- // check for self-assignment by comparing addresses
- if (this == &rhs) return *this;
-
- // do the copy
- m_name = rhs.m_name;
- m_accept = rhs.m_accept;
- m_cutMap = rhs.m_cutMap;
- m_emptyString = rhs.m_emptyString;
-
- // return the existing object
- return *this;
-}
-
-
-
-
-//=============================================================================
-// Destructor
-//=============================================================================
-Root::TAccept::~TAccept()
-{
-}
-
-
-
-
-//=============================================================================
-// Adding a cut
-//=============================================================================
-int Root::TAccept::addCut( const TString& cutName, const TString& cutDescription )
-{
- // Make sure that this new cuts doesn't exceed the number of bits available
- if ( m_cutMap.size() >= NBITS )
- {
- return -1;
- }
-
- // Add the cut to the map
- std::pair< TString, unsigned int > cutPair = std::make_pair( cutDescription, m_cutMap.size() );
- m_cutMap.insert( std::make_pair( cutName, cutPair ) );
-
- // Return the position of the newly added cut in the bitmask
- return (int)(m_cutMap.size() - 1);
-}
-
-
-
-
-//=============================================================================
-// Get the description of a cut based on the cut position
-//=============================================================================
-const TString& Root::TAccept::getCutName( unsigned int cutPosition ) const
-{
- // Make sure that this cut doesn't exceed the number of defined cuts
- if ( cutPosition >= m_cutMap.size() )
- {
- return m_emptyString;
- }
-
- // iterate over the map and find the right position
- std::map< TString, std::pair< TString, unsigned int > >::const_iterator it = m_cutMap.begin();
- std::map< TString, std::pair< TString, unsigned int > >::const_iterator itEnd = m_cutMap.end();
- for ( ; it != itEnd; ++it )
- {
- if ( (it->second).second == cutPosition )
- {
- return (it->first);
- }
- }
-
- return m_emptyString;
-}
-
-
-
-
-//=============================================================================
-// Get the description of a cut based on the cut position
-//=============================================================================
-const TString& Root::TAccept::getCutDescription( unsigned int cutPosition ) const
-{
- // Make sure that this cut doesn't exceed the number of defined cuts
- if ( cutPosition >= m_cutMap.size() )
- {
- return m_emptyString;
- }
-
- // iterate over the map and find the right position
- std::map< TString, std::pair< TString, unsigned int > >::const_iterator it = m_cutMap.begin();
- std::map< TString, std::pair< TString, unsigned int > >::const_iterator itEnd = m_cutMap.end();
- for ( ; it != itEnd; ++it )
- {
- if ( (it->second).second == cutPosition )
- {
- return (it->second).first;
- }
- }
-
- return m_emptyString;
-}
-
-
-
-
-
-//=============================================================================
-// Set the description of a cut based on the cut position
-//=============================================================================
-void Root::TAccept::setCutDescription( const unsigned int cutPosition, const TString& cutDescription )
-{
- // iterate over the map and find the right position
- std::map< TString, std::pair< TString, unsigned int > >::iterator it = m_cutMap.begin();
- std::map< TString, std::pair< TString, unsigned int > >::iterator itEnd = m_cutMap.end();
- for ( ; it != itEnd; ++it )
- {
- if ( (it->second).second == cutPosition )
- {
- ((it->second).first) = cutDescription;
- return;
- }
- }
-
- return;
-}
-
-
-
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py b/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py
index 5aa110044dbcb821e56715474954e846b3f04087..271f083cf7a67287df90d16901a5bf1c0c9d9b27 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#==============================================================================
#
@@ -550,28 +550,28 @@ def CreateTSelectorSourceFile( _packageName, _selectorName, _doubleCutNameList )
_tcLineList.append('//=============================================================================\n')
_tcLineList.append('// Calculate the actual accept of each cut individually.\n')
_tcLineList.append('//=============================================================================\n')
- _tcLineList.append('const Root::TAccept& Root::T%s::accept( /*Here, you need to put your doubles and ints to cut on*/ )\n' % _selectorName )
+ _tcLineList.append('asg::AcceptData Root::T%s::accept( /*Here, you need to put your doubles and ints to cut on*/ )\n' % _selectorName )
_tcLineList.append('{\n')
_tcLineList.append(' // Reset the cut result bits to zero (= fail cut)\n')
- _tcLineList.append(' m_accept.clear();\n')
+ _tcLineList.append(' asg::AcceptData acceptData (&m_accept);\n')
_tcLineList.append('\n')
_tcLineList.append(' // -----------------------------------------------------------\n')
_tcLineList.append(' // Do the actual selection\n')
_tcLineList.append('\n')
for doubleCutName in _doubleCutNameList:
_tcLineList.append(' // Cut %s\n' % doubleCutName )
- _tcLineList.append(' m_accept.setCutResult( m_cutPosition%s, ( var < %s ) ? true : false );\n' % ( doubleCutName, doubleCutName ) )
+ _tcLineList.append(' acceptData.setCutResult( m_cutPosition%s, ( var < %s ) ? true : false );\n' % ( doubleCutName, doubleCutName ) )
pass
if not _cutsGiven:
_tcLineList.append(' // Cut 0\n')
- _tcLineList.append(' m_accept.setCutResult( m_cutPosition0, ( var0 < CutValue0fMax ) ? true : false );\n')
+ _tcLineList.append(' acceptData.setCutResult( m_cutPosition0, ( var0 < CutValue0fMax ) ? true : false );\n')
_tcLineList.append('\n')
_tcLineList.append(' // Cut 1\n')
- _tcLineList.append(' m_accept.setCutResult( m_cutPosition1, ( var1 < CutValue1fMax ) ? true : false );\n')
+ _tcLineList.append(' acceptData.setCutResult( m_cutPosition1, ( var1 < CutValue1fMax ) ? true : false );\n')
pass
_tcLineList.append('\n')
_tcLineList.append('\n')
- _tcLineList.append(' return m_accept;\n')
+ _tcLineList.append(' return acceptData;\n')
_tcLineList.append('}\n')
_tcLineList.append('\n')
@@ -611,7 +611,8 @@ def CreateTSelectorHeaderFile( _packageName, _selectorName, _doubleCutNameList
_thLineList.append('#include <TString.h>\n')
_thLineList.append('\n')
_thLineList.append('// Include the return object and the base class\n')
- _thLineList.append('#include "PATCore/TAccept.h"\n')
+ _thLineList.append('#include "PATCore/AcceptInfo.h"\n')
+ _thLineList.append('#include "PATCore/AcceptData.h"\n')
_thLineList.append('#include "PATCore/TSelectorToolBase.h"\n')
_thLineList.append('\n')
_thLineList.append('\n')
@@ -640,7 +641,7 @@ def CreateTSelectorHeaderFile( _packageName, _selectorName, _doubleCutNameList
_thLineList.append(' inline int finalize() { return 1; };\n')
_thLineList.append('\n')
_thLineList.append(' /** The main accept method: the actual cuts are applied here */\n')
- _thLineList.append(' const Root::TAccept& accept( /*Here, you need to put your const doubles and ints to cut on*/ );\n')
+ _thLineList.append(' asg::AcceptData accept( /*Here, you need to put your const doubles and ints to cut on*/ );\n')
_thLineList.append('\n')
_thLineList.append('\n')
_thLineList.append(' // Public members (the cut values)\n')
@@ -722,7 +723,8 @@ def CreateAthSelectorSourceFile( _packageName, _selectorName, _doubleCutNameList
_athcLineList.append('#include <iostream>\n')
_athcLineList.append('\n')
_athcLineList.append('// Include the return object\n')
- _athcLineList.append('#include "PATCore/TAccept.h"\n')
+ _athcLineList.append('#include "PATCore/AcceptInfo.h"\n')
+ _athcLineList.append('#include "PATCore/AcceptData.h"\n')
_athcLineList.append('\n')
_athcLineList.append('// Include the pure ROOT tool\n')
_athcLineList.append('#include "%s/T%s"\n' % ( _packageName, _selectorName ) )
@@ -740,9 +742,6 @@ def CreateAthSelectorSourceFile( _packageName, _selectorName, _doubleCutNameList
_athcLineList.append(' AthAlgTool(type, name, parent),\n')
_athcLineList.append(' m_rootTool(0)\n')
_athcLineList.append('{\n')
- _athcLineList.append(' // Declare to the framework which interface this tools has\n')
- _athcLineList.append(' declareInterface<IAthSelectorTool>(this);\n')
- _athcLineList.append('\n')
_athcLineList.append(' // Create an instance of the underlying ROOT tool\n')
_athcLineList.append(' m_rootTool = new Root::T%s();\n' % _selectorName )
_athcLineList.append(' // Declare the needed properties\n')
@@ -774,9 +773,6 @@ def CreateAthSelectorSourceFile( _packageName, _selectorName, _doubleCutNameList
_athcLineList.append(' return StatusCode::FAILURE;\n')
_athcLineList.append(' }\n')
_athcLineList.append('\n')
- _athcLineList.append(' // Copy the now filled TAccept to the dummy\n')
- _athcLineList.append(' m_acceptDummy = m_rootTool->getTAccept();\n')
- _athcLineList.append('\n')
_athcLineList.append(' return StatusCode::SUCCESS;\n')
_athcLineList.append('}\n')
_athcLineList.append('\n')
@@ -799,12 +795,12 @@ def CreateAthSelectorSourceFile( _packageName, _selectorName, _doubleCutNameList
_athcLineList.append('//=============================================================================\n')
_athcLineList.append('// The main accept method: the actual cuts are applied here \n')
_athcLineList.append('//=============================================================================\n')
- _athcLineList.append('const Root::TAccept& Ath%s::accept( const INavigable4Momentum* part )\n' % _selectorName )
+ _athcLineList.append('asg::AcceptData Ath%s::accept( const INavigable4Momentum* part )\n' % _selectorName )
_athcLineList.append('{\n')
_athcLineList.append(' if ( !part )\n')
_athcLineList.append(' {\n')
_athcLineList.append(' ATH_MSG_ERROR ( "Did not get a valid pointer!" );\n')
- _athcLineList.append(' return m_acceptDummy;\n')
+ _athcLineList.append(' return asg::AcceptData (&m_rootTool->getAcceptInfo());\n')
_athcLineList.append(' }\n')
_athcLineList.append('\n')
_athcLineList.append('\n')
@@ -845,7 +841,6 @@ def CreateAthSelectorFile( _packageName, _selectorName ) :
_athhLineList.append('*/\n')
_athhLineList.append('\n')
_athhLineList.append('// Include the interface\n')
- _athhLineList.append('#include "PATCore/IAthSelectorTool.h"\n')
_athhLineList.append('#include "AthenaBaseComps/AthAlgTool.h"\n')
_athhLineList.append('\n')
_athhLineList.append('\n')
@@ -857,8 +852,7 @@ def CreateAthSelectorFile( _packageName, _selectorName ) :
_athhLineList.append('\n')
_athhLineList.append('\n')
_athhLineList.append('class Ath%s\n' % _selectorName )
- _athhLineList.append(' : virtual public IAthSelectorTool,\n')
- _athhLineList.append(' public AthAlgTool\n' )
+ _athhLineList.append(' : public AthAlgTool\n' )
_athhLineList.append('{\n')
_athhLineList.append('\n')
_athhLineList.append('public: \n')
@@ -883,7 +877,7 @@ def CreateAthSelectorFile( _packageName, _selectorName ) :
_athhLineList.append(' // Main methods\n')
_athhLineList.append('public:\n')
_athhLineList.append(' /** The main accept method: the actual cuts are applied here */\n')
- _athhLineList.append(' const Root::TAccept& accept( const INavigable4Momentum* part );\n')
+ _athhLineList.append(' asg::AcceptData accept( const INavigable4Momentum* part );\n')
_athhLineList.append('\n')
_athhLineList.append('\n')
_athhLineList.append(' // Public methods\n')
@@ -892,10 +886,10 @@ def CreateAthSelectorFile( _packageName, _selectorName ) :
_athhLineList.append(' inline Root::T%s* getRootTool() { return m_rootTool; };\n' % _selectorName )
_athhLineList.append('\n')
_athhLineList.append('\n')
- _athhLineList.append(' /** Method to get the plain TAccept */\n')
- _athhLineList.append(' inline virtual const Root::TAccept& getTAccept( )\n')
+ _athhLineList.append(' /** Method to get the plain AcceptInfo */\n')
+ _athhLineList.append(' inline virtual const Root::AcceptInfo& getAcceptInfo( )\n')
_athhLineList.append(' {\n')
- _athhLineList.append(' return this->getRootTool()->getTAccept();\n')
+ _athhLineList.append(' return this->getRootTool()->getAcceptInfo();\n')
_athhLineList.append(' }\n')
_athhLineList.append('\n')
_athhLineList.append('\n')
@@ -904,8 +898,6 @@ def CreateAthSelectorFile( _packageName, _selectorName ) :
_athhLineList.append(' /** Pointer to the underlying ROOT based tool */\n')
_athhLineList.append(' Root::T%s* m_rootTool;\n' % _selectorName )
_athhLineList.append('\n')
- _athhLineList.append(' /** A dummy return TAccept object */\n')
- _athhLineList.append(' Root::TAccept m_acceptDummy;\n')
_athhLineList.append('\n')
_athhLineList.append('\n')
_athhLineList.append('}; // End: class definition\n')
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/CompositeParticle_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/CompositeParticle_p1.h
index 41d58de18965e8f4b45c031b6d60c0aef8de0754..38adffe158de33fee8b44d0e451cdfe0ad4b8979 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/CompositeParticle_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/CompositeParticle_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// CompositeParticle_p1.h
@@ -48,7 +48,7 @@ public:
/** Destructor:
*/
- ~CompositeParticle_p1();
+ ~CompositeParticle_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocs_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocs_p1.h
index 00b2ff26ba27739ee84100974a29a0af77d81759..7075fae3fe8fc9a9b4eff234fa0fcf46284710b7 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocs_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocs_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// INav4MomToTrackParticleAssocs_p1.h
@@ -53,7 +53,7 @@ public:
/** Destructor:
*/
- ~INav4MomToTrackParticleAssocs_p1();
+ ~INav4MomToTrackParticleAssocs_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
@@ -82,7 +82,4 @@ INav4MomToTrackParticleAssocs_p1::INav4MomToTrackParticleAssocs_p1() :
m_assocStores()
{}
-inline INav4MomToTrackParticleAssocs_p1::~INav4MomToTrackParticleAssocs_p1()
-{}
-
#endif //> PARTICLEEVENTTPCNV_INAV4MOMTOTRACKPARTICLEASSOCS_p1_H
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p1.h
index e3660b96ba022f1c1d24e2b59515373eeb128d82..f703b4ab19a483c935f82a233dfc8900d293278f 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Neutrino_p1.h
@@ -44,7 +44,7 @@ public:
/** Destructor:
*/
- ~Neutrino_p1();
+ ~Neutrino_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p2.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p2.h
index b3776a3455a549b7dcb29fbf9b4188667a201511..9792944a4f3663de1c73199f44c9cd84f7f56699 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p2.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/Neutrino_p2.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Neutrino_p2.h
@@ -44,7 +44,7 @@ public:
/** Destructor:
*/
- ~Neutrino_p2();
+ ~Neutrino_p2() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p1.h
index 88a56f5eb895318d9a034e6f65f1fdb7700b3c5d..e7cd1cccca2355f79acb45b23a01d1866bdf919d 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// ParticleBase_p1.h
@@ -43,7 +43,7 @@ class ParticleBase_p1
/** Destructor:
*/
- ~ParticleBase_p1() {}
+ ~ParticleBase_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p2.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p2.h
index 3a7ea334499036bac5c1369367dddb99709c982a..7c913d9d6d799d370c12ba8763ad8de4433f933f 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p2.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleBase_p2.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// ParticleBase_p2.h
@@ -43,7 +43,7 @@ class ParticleBase_p2
/** Destructor:
*/
- ~ParticleBase_p2() {}
+ ~ParticleBase_p2() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleLinks_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleLinks_p1.h
index df228d932ed85e9eb6c03a286f5e6fb5a85aa4a9..c08dfaaba678ab9a2e28ec8b075447e9dfc4a998 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleLinks_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleLinks_p1.h
@@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////// -*- 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
*/
// ParticleLinks_p1.h
@@ -20,7 +20,7 @@
class ParticleLinks_p1{
public:
ParticleLinks_p1(){;}
- ~ParticleLinks_p1(){;}
+ ~ParticleLinks_p1() = default;
private:
SelectedParticles_p1 m_sel;
DataLink_p1 m_containerLink;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleShallowClone_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleShallowClone_p1.h
index 248c627ff84df2849dcf4ee28a1c9a8235ce77d1..6a84e90a6a7ac253f2ad53968757cbc730cb6392 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleShallowClone_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/ParticleShallowClone_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// ParticleShallowClone_p1.h
@@ -47,7 +47,7 @@ public:
/** Destructor:
*/
- ~ParticleShallowClone_p1();
+ ~ParticleShallowClone_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocs_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocs_p1.h
index b9a6fac77bff13f86065c72863d3924237d92fc0..e586609fbea3bb579e8f1f7f3850630d2155549c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocs_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocs_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// TrackParticleAssocs_p1.h
@@ -54,7 +54,7 @@ class TrackParticleAssocs_p1
/** Destructor:
*/
- ~TrackParticleAssocs_p1();
+ ~TrackParticleAssocs_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
@@ -83,7 +83,4 @@ TrackParticleAssocs_p1::TrackParticleAssocs_p1() :
m_assocStores()
{}
-inline TrackParticleAssocs_p1::~TrackParticleAssocs_p1()
-{}
-
#endif //> PARTICLEEVENTTPCNV_INAV4MOMASSOCS_p3_H
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/CompositeParticle_p1.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/CompositeParticle_p1.cxx
index 4e87ae9ba95c99f51118a070263a1242494e1473..2628777e0bd6a74f705d0c39e63b91db4906bdd9 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/CompositeParticle_p1.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/CompositeParticle_p1.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// CompositeParticle_p1.cxx
@@ -13,9 +13,3 @@
// ParticleEventTPCnv includes
#include "ParticleEventTPCnv/CompositeParticle_p1.h"
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-CompositeParticle_p1::~CompositeParticle_p1()
-{}
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p1.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p1.cxx
index b90011aeb912ae4a0abe39f06ceaabb2bb5802e3..3b0696bf188f350a476d297d43e2acd670902a2b 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p1.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p1.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Neutrino_p1.cxx
@@ -13,9 +13,3 @@
// ParticleEventTPCnv includes
#include "ParticleEventTPCnv/Neutrino_p1.h"
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-Neutrino_p1::~Neutrino_p1()
-{}
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p2.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p2.cxx
index 2becac4dc066e51573a20ea4eac5ccf03f37e012..ede7cb8ca526adc8876ce6e2ae8c4f67eccd083e 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p2.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/Neutrino_p2.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Neutrino_p2.cxx
@@ -13,9 +13,3 @@
// ParticleEventTPCnv includes
#include "ParticleEventTPCnv/Neutrino_p2.h"
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-Neutrino_p2::~Neutrino_p2()
-{}
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/ParticleShallowClone_p1.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/ParticleShallowClone_p1.cxx
index c6a2423dd9fdba5d750141b6b5c49a7021444078..cefcad2b9d94bec400c38054b41f5e5bac30201c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/ParticleShallowClone_p1.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/src/ParticleShallowClone_p1.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// ParticleShallowClone_p1.cxx
@@ -13,9 +13,3 @@
// ParticleEventTPCnv includes
#include "ParticleEventTPCnv/ParticleShallowClone_p1.h"
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-ParticleShallowClone_p1::~ParticleShallowClone_p1()
-{}
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx
index 039557694038b40107c5d812ce56a4a7cfd57ec6..bfcf4f39548c356be19ed15887638cb15ed08372 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.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
*/
@@ -8,7 +8,6 @@
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "InDetIdentifier/PixelID.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
namespace D3PD {
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/IUnassociatedHitsGetterTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/IUnassociatedHitsGetterTool.h
index 1e2a0d3657aeb131cdc1983da0de4df062e50057..950728ee408ed730cc3e6bfca6ce6d50627802f6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/IUnassociatedHitsGetterTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/IUnassociatedHitsGetterTool.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 DERIVATIONFRAMEWORK_IUNASSOCIATEDHITSGETTERTOOL_H
@@ -28,7 +28,7 @@ class IUnassociatedHitsGetterTool : virtual public IAlgTool
*
* This is implemented in terms of @c getTypeinfo().
*/
- virtual const MinBiasPRDAssociation* get (bool allowMissing = false) = 0;
+ virtual const MinBiasPRDAssociation* get (bool allowMissing = false) const = 0;
/**
* @brief Type-safe wrapper for @c releaseObjectUntyped.
@@ -41,7 +41,7 @@ class IUnassociatedHitsGetterTool : virtual public IAlgTool
*
* This is implemented in terms of @c releaseObjectTypeinfo().
*/
- virtual void releaseObject (const MinBiasPRDAssociation* p) = 0;
+ virtual void releaseObject (const MinBiasPRDAssociation* p) const = 0;
};
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/UnassociatedHitsGetterTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/UnassociatedHitsGetterTool.h
index 5375ce07dddf5324eab6f9f74b368f453eac8f1e..787c21765e195c4d96bfb155f716c9011b876d50 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/UnassociatedHitsGetterTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/UnassociatedHitsGetterTool.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 DERIVATIONFRAMEWORK_UNASSOCIATEDHITSGETTERTOOL_H
@@ -14,6 +14,7 @@
#include "GaudiKernel/ToolHandle.h"
+#include <atomic>
#include <string>
class MinBiasPRDAssociation;
@@ -38,12 +39,12 @@ public:
compute the number of unassociated his
wrap the info in a MinBiasPRDAssociation object
*/
- virtual const MinBiasPRDAssociation* get (bool allowMissing = false);
+ virtual const MinBiasPRDAssociation* get (bool allowMissing = false) const;
/**
delete the pointer created by get
*/
- virtual void releaseObject (const MinBiasPRDAssociation* p);
+ virtual void releaseObject (const MinBiasPRDAssociation* p) const;
private:
@@ -63,8 +64,8 @@ private:
/* PRD association tool **/
ToolHandle<Trk::IPRD_AssociationTool> m_assoTool;
- bool m_firstTime;
- bool m_disabled;
+ mutable std::atomic_bool m_firstTime;
+ mutable std::atomic_bool m_disabled;
}; // class UnassociatedHitsGetterTool
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/UnassociatedHitsGetterTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/UnassociatedHitsGetterTool.cxx
index 1b7b5406deea8a5e0ffeda73e18582cc687595a0..afa4e3ef58366f1096ca1702dc596eae399e2ba5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/UnassociatedHitsGetterTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/UnassociatedHitsGetterTool.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 "DerivationFrameworkInDet/UnassociatedHitsGetterTool.h"
@@ -56,7 +56,7 @@ StatusCode UnassociatedHitsGetterTool::initialize(){
return StatusCode::SUCCESS;
}
-const MinBiasPRDAssociation* UnassociatedHitsGetterTool::get (bool /*allowMissing*/){
+const MinBiasPRDAssociation* UnassociatedHitsGetterTool::get (bool /*allowMissing*/) const {
// If we fail to find something we need in SG on the first call,
// issue a warning and don't try again (this can happen if we're
@@ -229,7 +229,7 @@ const MinBiasPRDAssociation* UnassociatedHitsGetterTool::get (bool /*allowMissin
return PRDAssociation;
}
-void UnassociatedHitsGetterTool::releaseObject (const MinBiasPRDAssociation* p){
+void UnassociatedHitsGetterTool::releaseObject (const MinBiasPRDAssociation* p) const {
if(p) delete p;
}
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
index e736511426a3a54ddb262969be6b32374951d1c6..8d801a41339fcf673abe92f849d0c44313477cb3 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
@@ -115,8 +115,8 @@ void GlobalTriggerTagTool::handle ( const Incident& incident ) {
}
}
const EventIncident* evtinc = dynamic_cast<const EventIncident*>(&incident);
- if(evtinc==0) ATH_MSG_ERROR("Couldn't get EventIncident object => EventInfo not available");
- unsigned long run = evtinc->eventInfo().event_ID()->run_number();
+ if(evtinc==0) ATH_MSG_ERROR("Couldn't get EventIncident object => Event Info not available");
+ unsigned long run = incident.context().eventID().run_number();
unsigned int index = 0;
std::map<std::string,std::string> bitmap;
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
new file mode 100644
index 0000000000000000000000000000000000000000..883cbf4a689b3dc4e394eda3367e14ed0b17afa5
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
@@ -0,0 +1,478 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from IOVDbSvc.IOVDbSvcConfig import addFolders
+from BTagging.BTaggingFlags import BTaggingFlags
+
+def setupTrackAssociator(TrackCollection, options={}, Verbose = False, ContainerName = ""):
+
+ options = dict(options)
+ options['name'] = TrackCollection
+ from BTagging.BTaggingConfiguration import toolBTagTrackToJetAssociator
+ tool = toolBTagTrackToJetAssociator(**options)
+
+ return tool
+
+def setupMuonAssociator(MuonCollectionName, JetCollection, options={}, Verbose = False, ContainerName = ""):
+ """Sets up a muon associator (and adds it to the ToolSvc).
+
+ input: MuonCollectionName: Muon collection name. Must be unique.
+ JetCollection: The jet collection name.
+ options: Python dictionary with options to be passed to the associator.
+ Verbose: Whether to print the associator settings afterwards.
+ ContainerName: Name of the muon container in SG. If left blank BTaggingFlags.MuonCollectionName will be used.
+
+ output: The tool."""
+
+ options = dict(options)
+ options['name'] = MuonCollectionName
+ from BTagging.BTaggingConfiguration import toolBTagMuonToJetAssociator
+ tool = toolBTagMuonToJetAssociator(**options)
+
+ return tool
+
+
+def setupBTagTrackAssociation(name, JetCollection, TaggerList, Verbose = False, options={}):
+
+ # Setup associators
+ BTagTrackToJetAssociatorList = []
+ BTagTrackToJetAssocNameList = []
+ if 'IP2D' in TaggerList or 'IP3D' in TaggerList:
+ tracktojetassociator = setupTrackAssociator('BTagTrackToJetAssociator', **options)
+ BTagTrackToJetAssociatorList.append(tracktojetassociator)
+ BTagTrackToJetAssocNameList.append('BTagTrackToJetAssociator')
+
+ if 'MultiSVbb1' in TaggerList or 'MultiSVbb2' in TaggerList:
+ tracktojetassociatorbb = setupTrackAssociator('BTagTrackToJetAssociatorBB',
+ options={'shareTracks': False,
+ 'useVariableSizedTrackCone' : True,
+ 'coneSizeFitPar1' : 3.15265e-01,
+ 'coneSizeFitPar2' : -3.66502e-01,
+ 'coneSizeFitPar3' : -1.56387e-05})
+ BTagTrackToJetAssociatorList.append(tracktojetassociatorbb)
+ BTagTrackToJetAssocNameList.append('BTagTrackToJetAssociatorBB')
+
+ MuonToJetAssociatorList = []
+ MuonToJetAssocNameList = []
+ MuonContainerNameList = []
+ if 'SoftMu' in TaggerList:
+ tool = setupMuonAssociator('BTagMuonToJetAssociator', JetCollection, Verbose = BTaggingFlags.OutputLevel < 3)
+ MuonToJetAssociatorList.append(tool)
+ MuonToJetAssocNameList.append('BTagMuonToJetAssociator')
+ MuonContainerNameList.append('Muons')
+
+
+ # NOTE: The secondary vertex finders etc. don't need to be set up here depending on the flags; they are set up when needed by the
+ options = dict(options)
+ options.setdefault('TrackToJetAssociatorList', BTagTrackToJetAssociatorList)
+ options.setdefault('TrackToJetAssocNameList', BTagTrackToJetAssocNameList)
+ options.setdefault('MuonToJetAssociatorList', MuonToJetAssociatorList)
+ options.setdefault('MuonToJetAssocNameList', MuonToJetAssocNameList)
+ options.setdefault('MuonContainerNameList', MuonContainerNameList)
+ options.setdefault('BTagAssociation', BTaggingFlags.doStandardAssoc)
+ options['name'] = name
+ from BTagging.BTaggingConf import Analysis__BTagTrackAssociation
+ tool = Analysis__BTagTrackAssociation(**options)
+ return tool
+
+def setupSecVtxTool(name, JetCollection, Verbose = False, options={}, outputObjs = None):
+ """Adds a SecVtxTool instance and registers it.
+
+ input: name: The tool's name.
+ JetCollection The name of the jet collections.
+ ToolSvc: The ToolSvc instance.
+ Verbose: Whether to print detailed information about the tool.
+ options: Python dictionary of options to be passed to the SecVtxTool.
+ output: The tool.
+ If outputObjs is set, then it is filled with objects written to SG."""
+ from BTagging.BTaggingConfiguration import getConfiguration
+ ConfInstance = getConfiguration()
+
+ jetcol = JetCollection
+ secVtxFinderList = []
+ secVtxFinderTrackNameList = []
+ secVtxFinderxAODBaseNameList = []
+ from BTagging.NewJetFitterVxFinder_SVConfig import NewJetFitterVxFinder_SVCfg
+
+ newJetFitterVxFinder = NewJetFitterVxFinder_SVCfg('JFVxFinder')
+ secVtxFinderList.append(newJetFitterVxFinder)
+ secVtxFinderTrackNameList.append('BTagTrackToJetAssociator')
+ secVtxFinderxAODBaseNameList.append('JetFitter')
+ from BTagging.BTaggingConfiguration_NewJetFitterCollection import toolJetFitterVariablesFactory
+ jetFitterVF = toolJetFitterVariablesFactory('JFVarFactory')
+
+ from BTagging.BTaggingConfiguration_InDetVKalVxInJetTool import toolInDetVKalVxInJetTool
+ inDetVKalVxInJetTool = toolInDetVKalVxInJetTool("IDVKalVxInJet")
+ secVtxFinderList.append(inDetVKalVxInJetTool)
+ secVtxFinderTrackNameList.append('BTagTrackToJetAssociator')
+ secVtxFinderxAODBaseNameList.append('SV1')
+
+ from BTagging.BTaggingConfiguration_InDetVKalVxMultiVxInJetTool import toolInDetVKalMultiVxInJetTool
+ inDetVKalMultiVxInJetTool = toolInDetVKalMultiVxInJetTool("IDVKalMultiVxInJet")
+ secVtxFinderList.append(inDetVKalMultiVxInJetTool)
+ secVtxFinderTrackNameList.append('BTagTrackToJetAssociatorBB')
+ secVtxFinderxAODBaseNameList.append('MSV')
+
+ from BTagging.BTaggingConfiguration_InDetVKalVxMultiVxInJetTool import toolMSVVariablesFactory
+ varFactory = toolMSVVariablesFactory("MSVVarFactory")
+
+ options = dict(options)
+ options.setdefault('SecVtxFinderList', secVtxFinderList)
+ options.setdefault('SecVtxFinderTrackNameList', secVtxFinderTrackNameList)
+ options.setdefault('SecVtxFinderxAODBaseNameList', secVtxFinderxAODBaseNameList)
+ options.setdefault('PrimaryVertexName',BTaggingFlags.PrimaryVertexCollectionName)
+ options.setdefault('vxPrimaryCollectionName',BTaggingFlags.PrimaryVertexCollectionName)
+ options.setdefault('BTagJFVtxCollectionName', ConfInstance.getOutputFilesPrefix() + jetcol + ConfInstance._OutputFilesJFVxname)
+ options.setdefault('BTagSVCollectionName', ConfInstance.getOutputFilesPrefix() + jetcol + ConfInstance._OutputFilesSVname)
+ options.setdefault('OutputLevel', BTaggingFlags.OutputLevel)
+ options.setdefault('JetFitterVariableFactory', jetFitterVF)
+ options.setdefault('MSVVariableFactory', varFactory)
+ options['name'] = name
+ if outputObjs:
+ outputObjs['xAOD::VertexContainer'] = options['BTagSVCollectionName']
+ outputObjs['xAOD::BTagVertexContainer'] = options['BTagJFVtxCollectionName']
+ from BTagging.BTaggingConf import Analysis__BTagSecVertexing
+ tool = Analysis__BTagSecVertexing(**options)
+ return tool
+
+def setupBTagTool(ConfigFlags, jetcol, TaggerList, useBTagFlagsDefaults = True, Verbose = False, options={}):
+ """Adds a new myBTagTool instance and registers it.
+
+ input: jetcol: The name of the jet collections.
+ ToolSvc: The ToolSvc instance.
+ Verbose: Whether to print detailed information about the tool.
+ options: Python dictionary of options to be passed to the BTagTool.
+ (note the options storeSecondaryVerticesInJet is passed to the removal tool instead)
+
+ The following default options exist:
+
+ BTagLabelingTool default: None
+ storeSecondaryVerticesInJet default: BTaggingFlags.writeSecondaryVertices
+
+ output: The btagtool for the desired jet collection."""
+
+ from BTagging.BTaggingConfiguration import getConfiguration
+ ConfInstance = getConfiguration()
+
+ tagToolList = []
+
+ if 'IP2D' in TaggerList:
+ from JetTagTools.IP2DTagConfig import IP2DTagCfg
+ ip2dtool = IP2DTagCfg('IP2DTag')
+ tagToolList.append(ip2dtool)
+
+ if 'IP3D' in TaggerList:
+ from JetTagTools.IP3DTagConfig import IP3DTagCfg
+ ip3dtool = IP3DTagCfg('IP3DTag')
+ tagToolList.append(ip3dtool)
+
+ if 'SV1' in TaggerList:
+ sv1tool = SV1TagCfg('SV1Tag')
+ tagToolList.append(sv1tool)
+
+ if 'RNNIP' in TaggerList:
+ from JetTagTools.RNNIPTagConfig import RNNIPTagCfg
+ rnniptool = RNNIPTagCfg('RNNIPTag')
+ tagToolList.append(rnniptool)
+
+ if 'JetFitterNN' in TaggerList:
+ jetfitterNNtool = JetFitterTagNNCfg('JetFitterTagNN')
+ tagToolList.append(jetfitterNNtool)
+
+ if 'SoftMu' in TaggerList:
+ softmutool = SoftMuonTagCfg('SoftMu')
+ tagToolList.append(softmutool)
+
+ if 'MultiSVbb1' in TaggerList:
+ multisvbb1tool = MultiSVbb1TagCfg('MultiSVbb1')
+ tagToolList.append(multisvbb1tool)
+
+
+ options = dict(options)
+ if useBTagFlagsDefaults:
+ defaults = { 'Runmodus' : BTaggingFlags.Runmodus,
+ 'PrimaryVertexName' : BTaggingFlags.PrimaryVertexCollectionName,
+ 'BaselineTagger' : BTaggingFlags.BaselineTagger,
+ 'BTagLabelingTool' : None,
+ 'vxPrimaryCollectionName' : BTaggingFlags.PrimaryVertexCollectionName,
+ 'TagToolList' : tagToolList,
+ 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = 'btag'
+ from BTagging.BTaggingConf import Analysis__BTagTool
+ btagtool = Analysis__BTagTool(**options)
+
+ return btagtool
+
+def toolBTagTrackToJetAssociator(name, useBTagFlagsDefaults = True, **options):
+ """Sets up a BTagTrackToJetAssociator tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from ParticleJetTools.ParticleJetToolsConf import Analysis__ParticleToJetAssociator
+ return Analysis__ParticleToJetAssociator(**options)
+
+
+def setupJetBTaggerAlg(ConfigFlags, JetCollection="", TaggerList=[], SetupScheme="", Verbose = True, options={}, StripJetsSuffix = True):
+
+ jetcol = JetCollection
+
+ from BTagging.BTaggingConfiguration import getConfiguration
+ ConfInstance = getConfiguration()
+
+ btagtool = setupBTagTool(ConfigFlags, jetcol, TaggerList, Verbose = Verbose, options=options)
+ options.setdefault('BTagTool', btagtool)
+
+ from BTagging.BTaggingConf import Analysis__JetBTaggerAlg as JetBTaggerAlg
+ objs = {}
+ options = dict(options)
+ options.setdefault('OutputLevel', BTaggingFlags.OutputLevel)
+
+ # setup the Analysis__BTagTrackAssociation tool
+ thisBTagTrackAssociation = setupBTagTrackAssociation('TrackAssociation', jetcol, TaggerList, Verbose = Verbose)
+ options.setdefault('BTagTrackAssocTool', thisBTagTrackAssociation)
+
+ # setup the secondary vertexing tool
+ thisSecVtxTool = setupSecVtxTool('SecVx'+ConfInstance.GeneralToolSuffix(), jetcol, Verbose, outputObjs = objs)
+ options.setdefault('BTagSecVertexing', thisSecVtxTool)
+
+ # Set remaining options
+ btagname = ConfInstance.getOutputFilesPrefix() + jetcol
+ options.setdefault('name', 'FTAG')
+ options.setdefault('JetCollectionName', jetcol.replace('Track','PV0Track') + "Jets")
+ options.setdefault('BTaggingCollectionName', btagname)
+
+ # -- create main BTagging algorithm
+ jetbtaggeralg = JetBTaggerAlg(**options)
+ return jetbtaggeralg
+
+
+def JetFitterTagNNCfg(name, suffix = "", options = {}):
+ options['xAODBaseName'] = 'JetFitter'
+
+ #tool_type was used to define the name of the tool and the metadata to be used
+ if (suffix == ""):
+ from BTagging.BTaggingConfiguration_NewJetFitterCollection import toolJetFitterTagNN
+ return toolJetFitterTagNN(name, **options)
+
+
+def SV1TagCfg(name, suffix = "", options = {}):
+ options['xAODBaseName'] = 'SV1'
+
+ #tool_type was used to define the name of the tool and the metadata to be used
+ if (suffix == ""):
+ from BTagging.BTaggingConfiguration_SV1Tag import toolSV1Tag
+ return toolSV1Tag(name, **options)
+
+def SoftMuonTagCfg(name, suffix = "", options = {}):
+
+ #tool_type was used to define the name of the tool and the metadata to be used
+ if (suffix == ""):
+ from BTagging.BTaggingConfiguration_SoftMuonTag import toolSoftMuonTag
+ return toolSoftMuonTag(name, **options)
+
+def MultiSVbb1TagCfg(name, suffix = "", options = {}):
+ options['xAODBaseName'] = 'MSV'
+ if (suffix == ""):
+ from BTagging.BTaggingConfiguration_MultiSVbb1Tag import toolMultiSVbb1Tag
+ return toolMultiSVbb1Tag(name, **options)
+
+def JetTagCalibCfg(ConfigFlags, scheme=""):
+ result=ComponentAccumulator()
+
+ #if ConfInstance.checkFlagsUsingBTaggingFlags():
+ if True:
+ #IP2D
+ grades= [ "0HitIn0HitNInExp2","0HitIn0HitNInExpIn","0HitIn0HitNInExpNIn","0HitIn0HitNIn",
+ "0HitInExp", "0HitIn",
+ "0HitNInExp", "0HitNIn",
+ "InANDNInShared", "PixShared", "SctShared",
+ "InANDNInSplit", "PixSplit",
+ "Good"]
+
+ #IP3D
+ #Same as IP2D. Revisit JetTagCalibCondAlg.cxx if not.
+
+ from JetTagCalibration.JetTagCalibrationConf import Analysis__JetTagCalibCondAlg as JetTagCalibCondAlg
+ jettagcalibcondalg = "JetTagCalibCondAlg"
+ readkeycalibpath = "/GLOBAL/BTagCalib/RUN12"
+ connSchema = "GLOBAL_OFL"
+ if not ConfigFlags.Input.isMC:
+ readkeycalibpath = readkeycalibpath.replace("/GLOBAL/BTagCalib","/GLOBAL/Onl/BTagCalib")
+ connSchema = "GLOBAL"
+ taggerList = ['IP2D','IP3D','MultiSVbb1','MultiSVbb2','SV1','SoftMu','JetFitterNN','MV2c10','MV2c10mu','MV2c10rnn','MV2c100','MV2cl100','RNNIP','DL1','DL1mu','DL1rnn','JetVertexCharge']
+ histoskey = "JetTagCalibHistosKey"
+ result.merge(addFolders(ConfigFlags,[readkeycalibpath], connSchema, className='CondAttrListCollection'))
+ #conddb.addFolder(connSchema, readkeycalibpath, className='CondAttrListCollection')
+ JetTagCalib = JetTagCalibCondAlg(jettagcalibcondalg, ReadKeyCalibPath=readkeycalibpath, HistosKey = histoskey, taggers = taggerList, channelAliases = BTaggingFlags.CalibrationChannelAliases, IP2D_TrackGradePartitions = grades, RNNIP_NetworkConfig = BTaggingFlags.RNNIPConfig)
+
+ # Maybe needed for trigger use
+ #from IOVDbSvc.CondDB import conddb
+ #if conddb.dbdata == 'COMP200':
+ # conddb.addFolder("GLOBAL_ONL", "/GLOBAL/Onl/BTagCalib/RUN12", className='CondAttrListCollection')
+ # if globalflags.DataSource()!='data':
+ # conddb.addFolder("GLOBAL_ONL", "/GLOBAL/Onl/TrigBTagCalib/RUN12", className='CondAttrListCollection')
+ #elif conddb.isMC:
+ # conddb.addFolder("GLOBAL_OFL", "/GLOBAL/BTagCalib/RUN12", className='CondAttrListCollection')
+ # conddb.addFolder("GLOBAL_OFL", "/GLOBAL/TrigBTagCalib/RUN12", className='CondAttrListCollection')
+
+ result.addCondAlgo(JetTagCalib)
+
+ return result
+
+def AllBTaggingPublicToolsCfg(inputFlags,**kwargs):
+ result=ComponentAccumulator()
+
+
+ #Material updator
+ from TrkExTools.TrkExToolsConf import Trk__MaterialEffectsUpdator
+ materialupdator = Trk__MaterialEffectsUpdator(name = 'AtlasMaterialEffectsUpdator')
+ result.addPublicTool(materialupdator) #TODO remove one day
+
+ return result
+
+def BTagCfg(inputFlags,**kwargs):
+
+ #This is monolithic for now.
+ #Once a first complete example runs, this will be split into small modular chunks.
+ #Some such items may be best placed elsewehere (e.g. put magnetic field setup in magnetic field git folder etc)
+ result=ComponentAccumulator()
+
+ from StoreGate.StoreGateConf import StoreGateSvc
+ result.addService(StoreGateSvc("DetectorStore"))
+
+ from AtlasGeoModel.GeoModelConfig import GeoModelCfg
+ result.mergeAll(GeoModelCfg(inputFlags))
+
+ from TrkDetDescrSvc.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ acc, geom_svc = TrackingGeometrySvcCfg(inputFlags)
+ result.merge(acc)
+
+ from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_AlignCondAlg
+ result.addCondAlgo(SCT_AlignCondAlg(name = "SCT_AlignCondAlg",UseDynamicAlignFolders = False))
+
+ from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DetectorElementCondAlg
+ result.addCondAlgo(SCT_DetectorElementCondAlg(name = "SCT_DetectorElementCondAlg"))
+
+ from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
+ result.merge(MuonGeoModelCfg(inputFlags))
+
+ from GeometryDBSvc.GeometryDBSvcConf import GeometryDBSvc
+ result.addService(GeometryDBSvc("InDetGeometryDBSvc"))
+
+ from AthenaCommon import CfgGetter
+ result.getService("GeoModelSvc").DetectorTools += [ CfgGetter.getPrivateTool("PixelDetectorTool", checkType=True) ]
+ result.getService("GeoModelSvc").DetectorTools += [ CfgGetter.getPrivateTool("SCT_DetectorTool", checkType=True) ]
+
+ from TRT_GeoModel.TRT_GeoModelConf import TRT_DetectorTool
+ trtDetectorTool = TRT_DetectorTool()
+ result.getService("GeoModelSvc").DetectorTools += [ trtDetectorTool ]
+
+ from InDetServMatGeoModel.InDetServMatGeoModelConf import InDetServMatTool
+ result.getService("GeoModelSvc").DetectorTools += [ InDetServMatTool() ]
+
+ from IOVDbSvc.IOVDbSvcConfig import addFolders, addFoldersSplitOnline,IOVDbSvcCfg
+ result.merge(addFolders(inputFlags,['/GLOBAL/BField/Maps <noover/>'],'GLOBAL_OFL'))
+ result.merge(addFolders(inputFlags,['/EXT/DCS/MAGNETS/SENSORDATA'],'DCS_OFL'))
+
+ iovDbSvc=result.getService("IOVDbSvc")
+ iovDbSvc.FoldersToMetaData+=['/GLOBAL/BField/Maps']
+
+ from MagFieldServices.MagFieldServicesConf import MagField__AtlasFieldSvc
+ kwargs.setdefault( "UseDCS", True )
+ result.addService(MagField__AtlasFieldSvc("AtlasFieldSvc",**kwargs))
+
+ #load folders needed for Run2 ID alignment
+ result.merge(addFoldersSplitOnline(inputFlags,"INDET","/Indet/Onl/Align","/Indet/Align",className="AlignableTransformContainer"))
+ result.merge(addFolders(inputFlags,['/TRT/Align'],'TRT_OFL'))
+
+ #load folders needed for IBL
+ result.merge(addFolders(inputFlags,['/Indet/IBLDist'],'INDET_OFL'))
+
+ #hard-code MC conditions tag needed for my ESD file - must be a better way? how to auto-configure?
+ iovDbSvc.GlobalTag="OFLCOND-MC16-SDR-20"
+
+ #BTagging part
+ from BTagging.BTaggingConfiguration import getConfiguration
+ ConfInstance = getConfiguration()
+
+ #Should be parameters
+ jet = 'AntiKt4EMTopo'
+ #jet = 'AntiKt4LCTopo'
+ #Register input ESD container
+ ConfInstance.RegisterOutputContainersForJetCollection(JetCollection = jet, Verbose=True)
+ #Create BTagging containers with prefix "New" and register containers
+ ConfInstance.setOutputFilesPrefix('New'+ConfInstance.getOutputFilesPrefix())
+ ConfInstance.RegisterOutputContainersForJetCollection(JetCollection = jet, Verbose=True)
+
+ #Rename the element link of the BTagging container from the Jet container
+ from SGComps.SGCompsConf import AddressRemappingSvc
+ AddressRemappingSvc = AddressRemappingSvc("AddressRemappingSvc")
+ AddressRemappingSvc.TypeKeyRenameMaps += ['xAOD::JetAuxContainer#AntiKt4EMTopoJets.btaggingLink->AntiKt4EMTopoJets.oldbtaggingLink']
+ result.addService(AddressRemappingSvc)
+ result.getService('ProxyProviderSvc').ProviderNames += [ "AddressRemappingSvc" ]
+
+ taggerList = ['IP2D','IP3D','MultiSVbb1','MultiSVbb2','SV1','SoftMu','JetFitterNN','MV2c10','MV2c10mu','MV2c10rnn','MV2c100','MV2cl100','RNNIP','DL1','DL1mu','DL1rnn','JetVertexCharge']
+ taggerList = ['IP2D', 'IP3D', 'RNNIP']
+ btagger = setupJetBTaggerAlg(inputFlags, JetCollection = jet, TaggerList = taggerList)
+
+ result.addEventAlgo(btagger)
+
+ return result
+
+if __name__=="__main__":
+
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=1
+
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags as cfgFlags
+
+ cfgFlags.Input.isMC=True
+ cfgFlags.Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"]
+
+ cfgFlags.Output.ESDFileName="esdOut.pool.root"
+ cfgFlags.lock()
+
+ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+ cfg=MainServicesSerialCfg()
+
+
+ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+ cfg.merge(PoolReadCfg(cfgFlags))
+
+ cfg.merge(JetTagCalibCfg(cfgFlags))
+ cfg.merge(AllBTaggingPublicToolsCfg(cfgFlags))
+
+ Acc=BTagCfg(cfgFlags)
+
+ cfg.merge(Acc)
+
+
+ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ cfg.merge(OutputStreamCfg(cfgFlags,"ESD", ItemList=BTaggingFlags.btaggingESDList))
+ cfg.getEventAlgo("OutputStreamESD").ForceRead = True
+
+
+ cfg.getService("StoreGateSvc").Dump=True
+
+
+ cfg.setAppProperty("EvtMax",10)
+
+ cfg.printConfig(withDetails=True)
+
+
+ cfg.run()
+ #f=open("BTag.pkl","w")
+ #cfg.store(f)
+ #f.close()
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_CommonTools.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_CommonTools.py
index f59304c2f7efbe4fd4dad092363a4bc25c011bfd..0ca696d99bfbda18f146ca0e1803444d938c0fbf 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_CommonTools.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_CommonTools.py
@@ -45,9 +45,13 @@ def toolthisBTagLabeling(name, useBTagFlagsDefaults = True, **options):
useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
**options: Python dictionary with options for the tool.
output: The actual tool, which can then be added to ToolSvc via ToolSvc += output."""
- btagJetTruthMatching = toolBTagJetTruthMatching('BTagJetTruthMatching')
+ if useBTagFlagsDefaults:
+ btagJetTruthMatching = toolBTagJetTruthMatching('BTagJetTruthMatching')
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'JetTruthMatchTool' : btagJetTruthMatching }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
options['name'] = name
- options['JetTruthMatchTool'] = btagJetTruthMatching
from BTagging.BTaggingConf import Analysis__BTagLabeling
return Analysis__BTagLabeling(**options)
@@ -180,6 +184,8 @@ def toolBTagTrackToVertexTool(name, useBTagFlagsDefaults = True, **options):
**options: Python dictionary with options for the tool.
output: The actual tool, which can then be added to ToolSvc via ToolSvc += output."""
options['name'] = name
+ atlasExtrapolator = toolAtlasExtrapolator('AtlasExtrapolator')
+ options.setdefault('Extrapolator', atlasExtrapolator)
from TrackToVertex.TrackToVertexConf import Reco__TrackToVertex
return Reco__TrackToVertex(**options)
@@ -199,9 +205,11 @@ def toolBTagFullLinearizedTrackFactory(name, useBTagFlagsDefaults = True, **opti
here only for consistency.
**options: Python dictionary with options for the tool.
output: The actual tool, which can then be added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ atlasExtrapolator = toolAtlasExtrapolator('AtlasExtrapolator')
+ defaults = { 'Extrapolator' : atlasExtrapolator}
+ for option in defaults:
+ options.setdefault(option, defaults[option])
options['name'] = name
- atlasExtrapolator = toolAtlasExtrapolator('AtlasExtrapolator')
- options['Extrapolator'] = atlasExtrapolator
-
from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__FullLinearizedTrackFactory
return Trk__FullLinearizedTrackFactory(**options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtils_SVConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtils_SVConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..2faee6a95ef160c411c1c95bfef79b30abb4575b
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtils_SVConfig.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from JetTagTools.BTagFullLinearizedTrackFactoryConfig import BTagFullLinearizedTrackFactoryCfg
+from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+
+# importi the FullLinearizedTrackFactory configurable
+from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetJetFitterUtils
+
+
+# define the class
+class InDetJetFitterUtils_SVCfg( InDet__InDetJetFitterUtils ):
+ # constructor
+ def __init__(self, name = 'InDetJFUtils', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a InDetJetFitterUtils tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+ if useBTagFlagsDefaults:
+ jetFitterFullLinearizedTrackFactory = BTagFullLinearizedTrackFactoryCfg('JFFullLinearizedTrackFactory')
+ jetFitterExtrapolator = AtlasExtrapolatorCfg('JFExtrapolator')
+ defaults = { 'LinearizedTrackFactory': jetFitterFullLinearizedTrackFactory,
+ 'Extrapolator' : jetFitterExtrapolator }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ InDet__InDetJetFitterUtils.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/NewJetFitterVxFinder_SVConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/NewJetFitterVxFinder_SVConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..02995905b770e1b1006486f509e803e1594f62e1
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/NewJetFitterVxFinder_SVConfig.py
@@ -0,0 +1,57 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from BTagging.BTaggingFlags import BTaggingFlags
+from BTagging.InDetJetFitterUtils_SVConfig import InDetJetFitterUtils_SVCfg
+from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from BTagging.BTaggingConfiguration_NewJetFitterCollection import toolImprovedJetFitterRoutines, toolJetFitterMode3dTo1dFinder, toolInDetImprovedJetFitterTrackSelectorTool, toolJetFitterSequentialVertexFitter_SV, toolImprovedJetFitterInitializationHelper, toolVxInternalEdmFactory_SV
+
+
+# importi the InDetImprovedJetFitterVxFinder configurable
+from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
+
+# define the class
+class NewJetFitterVxFinder_SVCfg( InDet__InDetImprovedJetFitterVxFinder ):
+ # constructor
+ def __init__(self, name = 'JFVxFinder', suffix = "", useBTagFlagsDefaults = True, options = {}):
+ """Sets up a NewJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ VxPrimaryContainer default: BTaggingFlags.PrimaryVertexCollectionName
+ MaxNumDeleteIterations default: 30
+ VertexProbCut default: 0.001
+ MaxClusteringIterations default: 30
+ VertexClusteringProbabilityCut default: 0.005
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+ if useBTagFlagsDefaults:
+ if not 'InDetKeys' in dir():
+ from InDetRecExample.InDetKeys import InDetKeys
+ inDetJetFitterUtils = InDetJetFitterUtils_SVCfg('InDetJFUtils'+suffix)
+ improvedJetFitterRoutines = toolImprovedJetFitterRoutines('ImprovedJFRoutines'+suffix)
+ jetFitterMode3dTo1dFinder = toolJetFitterMode3dTo1dFinder('JFMode3dTo1dFinder'+suffix)
+ inDetImprovedJetFitterTrackSelectorTool = toolInDetImprovedJetFitterTrackSelectorTool('InDetImprovedJFTrackSelTool'+suffix)
+ jetFitterSequentialVertexFitter = toolJetFitterSequentialVertexFitter_SV('JFSeqVxFitter'+suffix)
+ jetFitterExtrapolator = AtlasExtrapolatorCfg('JFExtrapolator'+suffix)
+ improvedJetFitterInitializationHelper = toolImprovedJetFitterInitializationHelper('ImprovedJFInitHelper'+suffix)
+ vertexEdmFactory = toolVxInternalEdmFactory_SV('VxInternalEdmFactory'+suffix)
+ defaults = { 'VxPrimaryContainer' : BTaggingFlags.PrimaryVertexCollectionName,
+ 'MaxNumDeleteIterations' : 30,
+ 'VertexProbCut' : 0.001,
+ 'MaxClusteringIterations' : 30,
+ 'VertexClusteringProbabilityCut' : 0.005 ,
+ 'VertexEdmFactory' : vertexEdmFactory,
+ 'JetFitterInitializationHelper' : improvedJetFitterInitializationHelper,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'Extrapolator' : jetFitterExtrapolator,
+ 'JetFitterRoutines' : improvedJetFitterRoutines,
+ 'TrackSelector' : inDetImprovedJetFitterTrackSelectorTool,
+ 'Mode3dFinder' : jetFitterMode3dTo1dFinder,
+ 'SequentialVertexFitter' : jetFitterSequentialVertexFitter}
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ InDet__InDetImprovedJetFitterVxFinder.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTool.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTool.cxx
index 8c228f37459305d9f68fd1a61214fb48fb6c1050..fdd7483f782bc29977e60bb0979967b4f10ca2e6 100755
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTool.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTool.cxx
@@ -58,15 +58,16 @@ namespace Analysis {
/* ----------------------------------------------------------------------------------- */
/* RETRIEVE SERVICES FROM STOREGATE */
/* ----------------------------------------------------------------------------------- */
- //std::cout << "AARON in BTagTool::initialize" << std::endl;
- /* new for ToolHandleArray
- retrieve tag tools
- */
- if ( m_bTagToolHandleArray.retrieve().isFailure() ) {
- ATH_MSG_ERROR("#BTAG# Failed to retreive " << m_bTagToolHandleArray);
- return StatusCode::FAILURE;
- } else {
- ATH_MSG_DEBUG("#BTAG# Retrieved " << m_bTagToolHandleArray);
+ if ( m_bTagToolHandleArray.empty() ) {
+ ATH_MSG_DEBUG("#BTAG# No tagging tools defined. Please revisit configuration.");
+ }
+ else {
+ if ( m_bTagToolHandleArray.retrieve().isFailure() ) {
+ ATH_MSG_ERROR("#BTAG# Failed to retrieve " << m_bTagToolHandleArray);
+ return StatusCode::FAILURE;
+ } else {
+ ATH_MSG_DEBUG("#BTAG# Retrieved " << m_bTagToolHandleArray);
+ }
}
// get BJetTagTools
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetConstituent.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetConstituent.h
index c9a9225b965ff2a48501a1520020cc7d0a08807c..b155e9379cf02e65e39ffb6b6d209d419419b5d6 100755
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetConstituent.h
+++ b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetConstituent.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
*/
/***************************************************************************
@@ -50,7 +50,7 @@ namespace Analysis
public:
JetConstituent() ; //!< constructor
JetConstituent(NameType& name) ; //!< constructor
- ~JetConstituent() ; //!< destructor
+ ~JetConstituent() = default;
virtual void setName(NameType& name);
//!< to set the name
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackAssociation.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackAssociation.h
index a9715d93cd9da15000b5f845c2357976e49c2704..c6d8d151fe4d5689bb18311c15c66ff994ab8c43 100755
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackAssociation.h
+++ b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackAssociation.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 ANALYSIS_TRACKASSOCIATION_H
@@ -25,7 +25,7 @@ namespace Analysis
public:
TrackAssociation() ; //!< constructor
TrackAssociation(const NameType& name); //!< constructor
- ~TrackAssociation() ; //!< destructor
+ ~TrackAssociation() = default;
typedef Navigable<Rec::TrackParticleContainer,double>::object_iter iterator;
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackConstituents.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackConstituents.h
index f2d8b96d2213986e8295729c69e4bf53ab77bc84..29a443e059fa20ac8a7dc80efb6dcda9dd6b7ffe 100755
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackConstituents.h
+++ b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackConstituents.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
*/
/***************************************************************************
@@ -43,7 +43,7 @@ namespace Analysis
public:
TrackConstituents() ; //!< constructor
TrackConstituents(NameType& name) ; //!< constructor
- ~TrackConstituents() ; //!< destructor
+ ~TrackConstituents() = default;
typedef Navigable<Rec::TrackParticleContainer,double>::object_iter iterator;
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/JetConstituent.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/JetConstituent.cxx
index 8d615c26ba925d9c0eea1f9b89cdb1c6244e94d7..983a5d93b45f568e4d7c1748430b29d33d03455f 100755
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/JetConstituent.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagEvent/src/JetConstituent.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
*/
/***************************************************************************
@@ -29,9 +29,6 @@ namespace Analysis
m_energyInSample ( CaloSampling::Unknown )//reserve space in vector
{ m_name = name; }
- JetConstituent::~JetConstituent()
- { }
-
void JetConstituent::setName(NameType& name) {m_name = name;}
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackAssociation.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackAssociation.cxx
index e232fa143baed8d34048c8709868998e4df674a5..a2f2541f1e71745fe5e74140075c5986b1442599 100755
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackAssociation.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackAssociation.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,9 +15,6 @@ namespace Analysis
TrackAssociation::TrackAssociation(const NameType& name)
{ this->setName(name); }
- TrackAssociation::~TrackAssociation()
- { }
-
JetAssociationBase* TrackAssociation::clone() const
{
return new TrackAssociation( *this );
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackConstituents.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackConstituents.cxx
index a0e5c25285d3f15e4706d3d774992d2fe5e307bc..c7303594897113b12c479dc7cef5634da938b776 100755
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackConstituents.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackConstituents.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
*/
/***************************************************************************
@@ -26,10 +26,6 @@ namespace Analysis
TrackConstituents::TrackConstituents(NameType& name)
{ m_name = name; }
- TrackConstituents::~TrackConstituents()
- { }
-
-
void TrackConstituents::setName(NameType& name) {m_name = name;}
NameType TrackConstituents::name() const { return m_name;}
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/IPTrackInfo.h b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/IPTrackInfo.h
index 72473e43e74cc9dc10d1965c6603e1db5629eb5c..4c809ad2f9d07a09225b4d88c8d432be56582b26 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/IPTrackInfo.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/IPTrackInfo.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 JETTAGINFO_IPTRACKINFO
@@ -29,7 +29,6 @@ namespace Analysis {
bool isFromV0,
double d0val, double d0sig,
double z0val, double z0sig);
- virtual ~IPTrackInfo();
inline void setTrackWeight2D(double w) { m_trackWeight2D = w; }
inline void setTrackWeight3D(double w) { m_trackWeight3D = w; }
inline void setTrackProbJP(double p) { m_trackProbJP = p; }
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/MSVVtxInfo.h b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/MSVVtxInfo.h
index 2b765347edc5706463ee7b65b5fbf429ad4e944a..009e32ad807a4bc8cbd489e5b4ddef4fa8f55da0 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/MSVVtxInfo.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/MSVVtxInfo.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 JETTAGINFO_MSVVTXINFO_H
@@ -18,7 +18,6 @@ namespace Analysis
public:
MSVVtxInfo();
- virtual ~MSVVtxInfo();
/** Set methods */
void setRecSvx(const Trk::RecVertex&);
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SETrackInfo.h b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SETrackInfo.h
index 637df5b5d052e05e7f5336ee2a9530b6a3235494..c502c171c692a8a507191dbf52b46e61695e2fff 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SETrackInfo.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SETrackInfo.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 JETTAGINFO_SETRACKINFO
@@ -38,7 +38,6 @@ namespace Analysis {
double d0val,
double pTrel,
std::vector<double>&& tagLikelihood);
- virtual ~SETrackInfo();
bool isPhoton() const;
const egamma* electron() const;
inline double d0Value() const { return m_valD0wrtPV; }
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SLTrueInfo.h b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SLTrueInfo.h
index 9d55248b4a43f9d32bfd420cbc26883dd99bc67e..c2fa87a84917c4ebb01d574f731a29b10a485027 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SLTrueInfo.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SLTrueInfo.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 JETTAGINFO_SLTRUEINFO
@@ -16,7 +16,6 @@ namespace Analysis {
public:
SLTrueInfo();
SLTrueInfo(int, int, int, bool, bool, bool, const Eigen::Vector3d&, const Eigen::Vector3d&);
- virtual ~SLTrueInfo();
inline int barcode() const { return m_barcode; }
inline int pdgId() const { return m_pdgCode; }
inline int pdgIdMother() const { return m_pdgCodeMother; }
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SMTrackInfo.h b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SMTrackInfo.h
index 0403fff41b797e3cbdd12a9aa6834bd509b7e2db..a35f4224fdea9fee97af11e6185d508c13fde94d 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SMTrackInfo.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SMTrackInfo.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 JETTAGINFO_SMTRACKINFO
@@ -26,7 +26,6 @@ namespace Analysis {
double d0val,
double pTrel,
std::vector<double>&& tagLikelihood);
- virtual ~SMTrackInfo();
const Muon* muon() const;
inline const ElementLink<MuonContainer>& muonLink() const { return m_muon; }
inline double d0Value() const { return m_valD0wrtPV; }
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SVTrackInfo.h b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SVTrackInfo.h
index 2cc289eef93dacd314ca220f695ac28d3b8cd4be..7f909d9f6e6f986f4e4baf847700de7fdd0d5af4 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SVTrackInfo.h
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/JetTagInfo/SVTrackInfo.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 JETTAGINFO_SVTRACKINFO
@@ -20,7 +20,6 @@ namespace Analysis {
inline SVTrackInfo(const Rec::TrackParticleContainer* coll,
const Rec::TrackParticle* trk);
inline SVTrackInfo(const ElementLink<Rec::TrackParticleContainer>& track);
- inline virtual ~SVTrackInfo() {}
inline const Rec::TrackParticle* track() const;
inline const ElementLink<Rec::TrackParticleContainer>& trackLink() const;
private:
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/src/IPTrackInfo.cxx b/PhysicsAnalysis/JetTagging/JetTagInfo/src/IPTrackInfo.cxx
index 178e6bec1e13aa314399b6f2a448c907a0fbf28e..6e6fa9cc149e71f9d2bec53e701496ce504261be 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/src/IPTrackInfo.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/src/IPTrackInfo.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 "JetTagInfo/IPTrackInfo.h"
@@ -67,9 +67,6 @@ IPTrackInfo::IPTrackInfo(const ElementLink<Rec::TrackParticleContainer>& track,
{
}
-IPTrackInfo::~IPTrackInfo() {
-}
-
const Rec::TrackParticle* IPTrackInfo::track() const {
if( m_track.isValid() ) {
return *(m_track);
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/src/MSVVtxInfo.cxx b/PhysicsAnalysis/JetTagging/JetTagInfo/src/MSVVtxInfo.cxx
index 94f80ecc9716e65369ce4e4ab4662d3738cfb463..ef41b568dbf872f8d38929e27aed685178eda4b1 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/src/MSVVtxInfo.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/src/MSVVtxInfo.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 "JetTagInfo/MSVVtxInfo.h"
@@ -19,9 +19,5 @@ namespace Analysis
/////...
}
- MSVVtxInfo::~MSVVtxInfo(){
- ////....
- }
-
} //// namespace
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/src/SETrackInfo.cxx b/PhysicsAnalysis/JetTagging/JetTagInfo/src/SETrackInfo.cxx
index 3335b086548c13dae35dfff2b1b6b86dd55a582e..3b4b030785f8c9593e4b10d8f78f0bdabecf31ac 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/src/SETrackInfo.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/src/SETrackInfo.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 "JetTagInfo/SETrackInfo.h"
@@ -65,9 +65,6 @@ SETrackInfo::SETrackInfo(const ElementLink<PhotonContainer>& gamLink,
{
}
-SETrackInfo::~SETrackInfo() {
-}
-
const egamma* SETrackInfo::electron() const {
if( m_electron.isValid() ) {
return *(m_electron);
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/src/SLTrueInfo.cxx b/PhysicsAnalysis/JetTagging/JetTagInfo/src/SLTrueInfo.cxx
index 0ec8ea3552dc5154574db14939639c5c467f6fc5..4d2808004b4b409cb48d3d951a59da5001689ae9 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/src/SLTrueInfo.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/src/SLTrueInfo.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 "JetTagInfo/SLTrueInfo.h"
@@ -31,9 +31,6 @@ SLTrueInfo::SLTrueInfo(int barc, int pdg, int pdgm, bool b, bool d, bool w, cons
m_ProductionVertex = r;
}
-SLTrueInfo::~SLTrueInfo() {
-}
-
MsgStream& operator<<( MsgStream& out, const SLTrueInfo& info) {
out << " -> SLTrueInfo "
<< " barcode = " << info.barcode()
diff --git a/PhysicsAnalysis/JetTagging/JetTagInfo/src/SMTrackInfo.cxx b/PhysicsAnalysis/JetTagging/JetTagInfo/src/SMTrackInfo.cxx
index b8d7accd238b37f2a060faf04dd5a25ba97e1346..e2ce5e99bc550ad04d1a975a29ed0964b4b7ff0e 100644
--- a/PhysicsAnalysis/JetTagging/JetTagInfo/src/SMTrackInfo.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagInfo/src/SMTrackInfo.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 "JetTagInfo/SMTrackInfo.h"
@@ -40,9 +40,6 @@ SMTrackInfo::SMTrackInfo(const ElementLink<MuonContainer>& muonLink,
{
}
-SMTrackInfo::~SMTrackInfo() {
-}
-
const Muon* SMTrackInfo::muon() const {
if( m_muon.isValid() ) {
return *(m_muon);
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py b/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
index 748966e9ac24ccec22472dcfd0f6099c516b828e..bdbfe19136853cf39b9b7fdd9997545cebd15182 100644
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
@@ -5,13 +5,16 @@ monManJetTag = AthenaMonManager(name="JetTagMonManager",
ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(),
DataType = DQMonFlags.monManDataType())
+from BTagging.BTaggingConfiguration_CommonTools import toolBTagTrackToVertexTool as toolBTagTrackToVertexTool
+trackToVertexTool = toolBTagTrackToVertexTool('BTagTrackToVertexTool')
+options = {}
+options.setdefault('trackToVertexTool', trackToVertexTool)
+options.setdefault('name', "Analysis::TrackSelector")
+options.setdefault('nHitBLayer', 0)
from JetTagTools.JetTagToolsConf import Analysis__TrackSelector
-trackSelectorTool = Analysis__TrackSelector (
- name = "Analysis::TrackSelector"
- )
+trackSelectorTool = Analysis__TrackSelector (**options)
ToolSvc += trackSelectorTool
#trackSelectorTool.OutputLevel = VERBOSE
-trackSelectorTool.nHitBLayer = 0
from JetTagMonitoring.JetTagMonitoringConf import JetTagMonitoring
jetTagMonTool = JetTagMonitoring (
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/CMakeLists.txt b/PhysicsAnalysis/JetTagging/JetTagTools/CMakeLists.txt
index c3894aa56ca51e50349aef11ec39ceee938a7436..058c7e1eb98b2c9590821bdf615d98790b6dcf2e 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/CMakeLists.txt
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/CMakeLists.txt
@@ -110,4 +110,4 @@ atlas_add_component( JetTagTools
# Install files from the package:
atlas_install_runtime( share/*.root share/*.txt )
-
+atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagFullLinearizedTrackFactoryConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagFullLinearizedTrackFactoryConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..d5c8a97c1eb16ae5f6725dbeae46d0586b2d358c
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagFullLinearizedTrackFactoryConfig.py
@@ -0,0 +1,32 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+
+# importi the FullLinearizedTrackFactory configurable
+from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__FullLinearizedTrackFactory
+
+# define the class
+class BTagFullLinearizedTrackFactoryCfg( Trk__FullLinearizedTrackFactory ):
+ # constructor
+ def __init__(self, name = 'FullLinearizedTrackFactory', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a BTagFullLinearizedTrackFactory tool and returns it.
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ Note however that this tool has no BTaggingFlags defaults; the option is
+ here only for consistency.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then be added to ToolSvc via ToolSvc += output."""
+
+ if useBTagFlagsDefaults:
+ atlasExtrapolator = AtlasExtrapolatorCfg('AtlasExtrapolator')
+ defaults = { 'Extrapolator' : atlasExtrapolator}
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ Trk__FullLinearizedTrackFactory.__init__(self,**options)
+
+
+
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexIPEstimatorConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexIPEstimatorConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..e687c97a17670aad67a80eeeeeacbb10ef55c3c9
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexIPEstimatorConfig.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from JetTagTools.BTagFullLinearizedTrackFactoryConfig import BTagFullLinearizedTrackFactoryCfg
+from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+
+# import the TrackToVertexIPEstimator configurable
+from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__TrackToVertexIPEstimator
+
+# define the class
+class BTagTrackToVertexIPEstimatorCfg( Trk__TrackToVertexIPEstimator ):
+ # constructor
+ def __init__(self, name = 'TrkToVxIPEstimator', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a TrackToVertexIPEstimator tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+ if useBTagFlagsDefaults:
+ btagFullLinearizedTrackFactory = BTagFullLinearizedTrackFactoryCfg('FullLinearizedTrackFactory')
+ atlasExtrapolator = AtlasExtrapolatorCfg('AtlasExtrapolator')
+ defaults = { 'Extrapolator' : atlasExtrapolator,
+ 'LinearizedTrackFactory' : btagFullLinearizedTrackFactory, }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+
+ Trk__TrackToVertexIPEstimator.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..a4fc0674b62f8ce48c5f4fc99e1abc31a715b2f1
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+
+# import the TrackToVertexIPEstimator configurable
+from TrackToVertex.TrackToVertexConf import Reco__TrackToVertex
+
+# define the class
+class BTagTrackToVertexToolCfg( Reco__TrackToVertex ):
+ # constructor
+ def __init__(self, name = 'BTagTrackToVertexTool', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a BTagTrackToVertexTool tool and returns it.
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ Note however that this tool has no BTaggingFlags defaults; the option is
+ here only for consistency.
+
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+ atlasExtrapolator = AtlasExtrapolatorCfg('AtlasExtrapolator')
+ options.setdefault('Extrapolator', atlasExtrapolator)
+ options['name'] = name
+
+ Reco__TrackToVertex.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/IP2DTagConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/IP2DTagConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..72575185fcf65fc1ee5057e8825786d78c273211
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/IP2DTagConfig.py
@@ -0,0 +1,79 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from BTagging.BTaggingFlags import BTaggingFlags
+from JetTagTools.BTagTrackToVertexIPEstimatorConfig import BTagTrackToVertexIPEstimatorCfg
+from JetTagTools.SVForIPToolConfig import SVForIPToolCfg
+from JetTagTools.IPDetailedTrackGradeFactoryConfig import IPDetailedTrackGradeFactoryCfg
+from JetTagTools.IPTrackSelectorConfig import IPTrackSelectorCfg
+from JetTagTools.IPNewLikelihoodToolConfig import IPNewLikelihoodToolCfg
+
+# import the IPTag configurable
+from JetTagTools.JetTagToolsConf import Analysis__IPTag
+
+# define the class
+class IP2DTagCfg( Analysis__IPTag ):
+ # constructor
+ def __init__(self, name = 'IP2DTag', scheme = '', useBTagFlagsDefaults = True, options = {}):
+
+ """Sets up a IP2DTag tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ Runmodus default: BTaggingFlags.Runmodus
+ referenceType default: BTaggingFlags.ReferenceType
+ impactParameterView default: "2D"
+ trackGradePartitions default: [ "Good", "BlaShared", "PixShared", "SctShared", "0HitBLayer" ]
+ RejectBadTracks default: False
+ originalTPCollectionName default: BTaggingFlags.TrackParticleCollectionName
+ jetCollectionList default: BTaggingFlags.Jets
+ unbiasIPEstimation default: False (switch to true (better!) when creating new PDFs)
+ SecVxFinderName default: "SV1"
+ UseCHypo default: True
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+ options['name'] = name
+ options['xAODBaseName'] = 'IP2D'
+ options['trackAssociationName'] = 'BTagTrackToJetAssociator'
+
+ if (scheme == ""):
+ if useBTagFlagsDefaults:
+ grades= [ "0HitIn0HitNInExp2","0HitIn0HitNInExpIn","0HitIn0HitNInExpNIn","0HitIn0HitNIn",
+ "0HitInExp", "0HitIn",
+ "0HitNInExp", "0HitNIn",
+ "InANDNInShared", "PixShared", "SctShared",
+ "InANDNInSplit", "PixSplit",
+ "Good"]
+ trackToVertexIPEstimator = BTagTrackToVertexIPEstimatorCfg('TrkToVxIPEstimator')
+ svForIPTool = SVForIPToolCfg('SVForIPTool')
+ trackGradeFactory = IPDetailedTrackGradeFactoryCfg('IP2DDetailedTrackGradeFactory')
+ trackSelectorTool = IPTrackSelectorCfg('IP2DTrackSelector')
+ likelihood = IPNewLikelihoodToolCfg('IP2DNewLikelihoodTool', 'IP2D')
+
+ defaults = { 'Runmodus' : BTaggingFlags.Runmodus,
+ 'referenceType' : BTaggingFlags.ReferenceType,
+ 'jetPtMinRef' : BTaggingFlags.JetPtMinRef,
+ 'impactParameterView' : '2D',
+ 'trackGradePartitions' : grades,
+ 'RejectBadTracks' : True,
+ 'originalTPCollectionName' : BTaggingFlags.TrackParticleCollectionName,
+ 'jetCollectionList' : BTaggingFlags.Jets,
+ 'unbiasIPEstimation' : False,
+ 'UseCHypo' : True,
+ 'SecVxFinderName' : 'SV1',
+ 'storeTrackParticles': True,
+ 'storeTrackParameters': True,
+ 'storeIpValues': False,
+ 'LikelihoodTool' : likelihood,
+ 'trackSelectorTool' : trackSelectorTool,
+ 'SVForIPTool' : svForIPTool,
+ 'trackGradeFactory' : trackGradeFactory,
+ 'TrackToVertexIPEstimator' : trackToVertexIPEstimator,
+ }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ Analysis__IPTag.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/IP3DTagConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/IP3DTagConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..520271ecd990aadeab85657aeb50b46c74b7e5fa
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/IP3DTagConfig.py
@@ -0,0 +1,84 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from BTagging.BTaggingFlags import BTaggingFlags
+from JetTagTools.BTagTrackToVertexIPEstimatorConfig import BTagTrackToVertexIPEstimatorCfg
+from JetTagTools.SVForIPToolConfig import SVForIPToolCfg
+from JetTagTools.IPDetailedTrackGradeFactoryConfig import IPDetailedTrackGradeFactoryCfg
+from JetTagTools.IPTrackSelectorConfig import IPTrackSelectorCfg
+from JetTagTools.IPNewLikelihoodToolConfig import IPNewLikelihoodToolCfg
+from JetTagTools.InDetTrackSelectorConfig import InDetTrackSelectorCfg
+from JetTagTools.SpecialTrackAssociatorConfig import SpecialTrackAssociatorCfg
+
+# import the IPTag configurable
+from JetTagTools.JetTagToolsConf import Analysis__IPTag
+
+# define the class
+class IP3DTagCfg( Analysis__IPTag ):
+ # constructor
+ def __init__(self, name = 'IP3DTag', scheme = '', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a IP3DTag tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ Runmodus default: BTaggingFlags.Runmodus
+ referenceType default: BTaggingFlags.ReferenceType
+ impactParameterView default: "3D"
+ trackGradePartitions default: [ "Good", "BlaShared", "PixShared", "SctShared", "0HitBLayer" ]
+ RejectBadTracks default: False
+ originalTPCollectionName default: BTaggingFlags.TrackParticleCollectionName
+ jetCollectionList default: BTaggingFlags.Jets
+ unbiasIPEstimation default: False (switch to true (better!) when creating new PDFs)
+ SecVxFinderName default: "SV1"
+ UseCHypo default: True
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+ options['name'] = name
+ options['xAODBaseName'] = 'IP3D'
+ options['trackAssociationName'] = 'BTagTrackToJetAssociator'
+
+ if (scheme == ""):
+ if useBTagFlagsDefaults:
+ grades= [ "0HitIn0HitNInExp2","0HitIn0HitNInExpIn","0HitIn0HitNInExpNIn","0HitIn0HitNIn",
+ "0HitInExp", "0HitIn",
+ "0HitNInExp", "0HitNIn",
+ "InANDNInShared", "PixShared", "SctShared",
+ "InANDNInSplit", "PixSplit",
+ "Good"]
+ trackToVertexIPEstimator = BTagTrackToVertexIPEstimatorCfg('TrkToVxIPEstimator')
+ svForIPTool = SVForIPToolCfg('SVForIPTool')
+ trackGradeFactory = IPDetailedTrackGradeFactoryCfg('IP3DDetailedTrackGradeFactory')
+ trackSelectorTool = IPTrackSelectorCfg('IP3DTrackSelector')
+ likelihood = IPNewLikelihoodToolCfg('IP3DNewLikelihoodTool', 'IP3D')
+ inDetTrackSelectionTool = InDetTrackSelectorCfg('InDetTrackSelector')
+ trackVertexAssociationTool = SpecialTrackAssociatorCfg('SpecialTrackAssociator')
+
+ defaults = { 'Runmodus' : BTaggingFlags.Runmodus,
+ 'referenceType' : BTaggingFlags.ReferenceType,
+ 'jetPtMinRef' : BTaggingFlags.JetPtMinRef,
+ 'impactParameterView' : '3D',
+ 'trackGradePartitions' : grades,
+ 'RejectBadTracks' : True,
+ 'originalTPCollectionName' : BTaggingFlags.TrackParticleCollectionName,
+ 'jetCollectionList' : BTaggingFlags.Jets,
+ 'unbiasIPEstimation' : False,
+ 'UseCHypo' : True,
+ 'SecVxFinderName' : 'SV1',
+ 'storeTrackParticles': True,
+ 'storeTrackParameters': True,
+ 'storeIpValues': False,
+ 'LikelihoodTool' : likelihood,
+ 'trackSelectorTool' : trackSelectorTool,
+ 'SVForIPTool' : svForIPTool,
+ 'trackGradeFactory' : trackGradeFactory,
+ 'TrackToVertexIPEstimator' : trackToVertexIPEstimator,
+ 'InDetTrackSelectionTool' : inDetTrackSelectionTool,
+ 'TrackVertexAssociationTool' : trackVertexAssociationTool,
+ }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ Analysis__IPTag.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/IPDetailedTrackGradeFactoryConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/IPDetailedTrackGradeFactoryConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..0bb569bbde785cef48d4c4277b69e30d7bd8cc75
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/IPDetailedTrackGradeFactoryConfig.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# import the DetailedTrackGradeFactory configurable
+from JetTagTools.JetTagToolsConf import Analysis__DetailedTrackGradeFactory
+
+# define the class
+class IPDetailedTrackGradeFactoryCfg( Analysis__DetailedTrackGradeFactory ):
+ # constructor
+ def __init__(self, name = 'IPDetailedTrackGradeFactory', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a IPDetailedTrackGradeFactory tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ useSharedHitInfo default: True
+ useDetailSharedHitInfo default: True
+ useRun2TrackGrading default: False
+ hitBLayerGrade default: True
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+ #btagrun1 was used to check old config, not sure we need it for Run3
+ btagrun1 = False
+
+ if useBTagFlagsDefaults:
+ defaults = { 'useSharedHitInfo' : True,
+ 'useDetailSharedHitInfo' : True,
+ 'useRun2TrackGrading' : (btagrun1 == False),
+ 'useInnerLayers0HitInfo' : (btagrun1 == False),
+ 'useDetailSplitHitInfo' : (btagrun1 == False),
+ 'hitBLayerGrade' : True }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ Analysis__DetailedTrackGradeFactory.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/IPNewLikelihoodToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/IPNewLikelihoodToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..62ed531de1260ef64894b281eebfce595a9c50bd
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/IPNewLikelihoodToolConfig.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# import the NewLikelihoodTool configurable
+from JetTagTools.JetTagToolsConf import Analysis__NewLikelihoodTool
+
+# define the class
+class IPNewLikelihoodToolCfg( Analysis__NewLikelihoodTool ):
+ # constructor
+ def __init__(self, name = 'NewLikelihoodTool', taggername = 'IP2D', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a NewLikelihoodTool tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ taggerName default: "IP2D"
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+
+ options['name'] = name
+
+ if useBTagFlagsDefaults:
+ defaults = {'taggerName' : taggername }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ Analysis__NewLikelihoodTool.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/IPTrackSelectorConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/IPTrackSelectorConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..a2c95bfb40732b70827fae9cf2b9b925ee574692
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/IPTrackSelectorConfig.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from JetTagTools.BTagTrackToVertexToolConfig import BTagTrackToVertexToolCfg
+
+# import the TrackSelector configurable
+from JetTagTools.JetTagToolsConf import Analysis__TrackSelector
+
+# define the class
+class IPTrackSelectorCfg( Analysis__TrackSelector ):
+ # constructor
+ def __init__(self, name = 'IPTrackSelector', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a IPTrackSelector tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ useBLayerHitPrediction default: True
+ usepTDepTrackSel default: False
+ nHitBLayer default: 0
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+ if useBTagFlagsDefaults:
+ trackToVertexTool = BTagTrackToVertexToolCfg('BTagTrackToVertexTool')
+ defaults = {'useBLayerHitPrediction' : True,
+ 'nHitBLayer' : 0 ,
+ 'usepTDepTrackSel' : False,
+ 'trackToVertexTool' : trackToVertexTool}
+
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ Analysis__TrackSelector.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/InDetTrackSelectorConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/InDetTrackSelectorConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..07784f3d7e2a6e7a76751c6bb27eb6cf23dc7a4d
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/InDetTrackSelectorConfig.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# import the TrackToVertexIPEstimator configurable
+from InDetTrackSelectionTool.InDetTrackSelectionToolConf import InDet__InDetTrackSelectionTool
+
+# define the class
+class InDetTrackSelectorCfg( InDet__InDetTrackSelectionTool ):
+ # constructor
+ def __init__(self, name = 'InDetTrackSelector', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a InDetTrackSelector tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+ if useBTagFlagsDefaults:
+ defaults = {'CutLevel' : "Loose",
+ 'maxZ0SinTheta' : 3 }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+
+ InDet__InDetTrackSelectionTool.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/RNNIPTagConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/RNNIPTagConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..e43ba7ff40471af9427cbf686d92038bdc6823d8
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/RNNIPTagConfig.py
@@ -0,0 +1,79 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from BTagging.BTaggingFlags import BTaggingFlags
+from JetTagTools.BTagTrackToVertexIPEstimatorConfig import BTagTrackToVertexIPEstimatorCfg
+from JetTagTools.SVForIPToolConfig import SVForIPToolCfg
+from JetTagTools.IPDetailedTrackGradeFactoryConfig import IPDetailedTrackGradeFactoryCfg
+from JetTagTools.IPTrackSelectorConfig import IPTrackSelectorCfg
+from JetTagTools.IPNewLikelihoodToolConfig import IPNewLikelihoodToolCfg
+
+# import the IPTag configurable
+from JetTagTools.JetTagToolsConf import Analysis__RNNIPTag
+
+# define the class
+class RNNIPTagCfg( Analysis__RNNIPTag ):
+ # constructor
+ def __init__(self, name = 'RNNIP', scheme = '', calibration=None, useBTagFlagsDefaults = True, options = {}):
+ """Sets up a RNNIPTag tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ trackGradePartitions default: [ "Good", "BlaShared", "PixShared", "SctShared", "0HitBLayer" ]
+ RejectBadTracks default: False
+ originalTPCollectionName default: BTaggingFlags.TrackParticleCollectionName
+ jetCollectionList default: BTaggingFlags.Jets
+ SecVxFinderName default: "SV1"
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+
+ options['name'] = name
+ basename = 'RNNIP'
+ options['xAODBaseName'] = basename
+ options['trackAssociationName'] = 'BTagTrackToJetAssociator'
+ cal_dir = calibration or basename
+ is_flipped=False
+ if (scheme == "Flip"):
+ is_flipped=True
+
+ if useBTagFlagsDefaults:
+ grades= [ "0HitIn0HitNInExp2","0HitIn0HitNInExpIn","0HitIn0HitNInExpNIn","0HitIn0HitNIn",
+ "0HitInExp", "0HitIn",
+ "0HitNInExp", "0HitNIn",
+ "InANDNInShared", "PixShared", "SctShared",
+ "InANDNInSplit", "PixSplit",
+ "Good"]
+ trackToVertexIPEstimator = BTagTrackToVertexIPEstimatorCfg('TrkToVxIPEstimator')
+ svForIPTool = SVForIPToolCfg('SVForIPTool')
+ trackGradeFactory = IPDetailedTrackGradeFactoryCfg('RNNIPDetailedTrackGradeFactory')
+ trackSelectorTool = IPTrackSelectorCfg('RNNIPTrackSelector')
+
+ defaults = {
+ 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'trackGradePartitions' : grades ,
+ 'RejectBadTracks' : True,
+ 'originalTPCollectionName' : BTaggingFlags.TrackParticleCollectionName,
+ 'NetworkConfig' : BTaggingFlags.RNNIPConfig,
+ 'unbiasIPEstimation' : False,
+ 'SecVxFinderName' : 'SV1',
+ 'calibration_directory' : cal_dir,
+ 'writeInputsToBtagObject' : BTaggingFlags.WriteRNNInputs,
+ 'trackSelectorTool' : trackSelectorTool,
+ 'SVForIPTool' : svForIPTool,
+ 'trackGradeFactory' : trackGradeFactory,
+ 'TrackToVertexIPEstimator' : trackToVertexIPEstimator,
+ }
+ if is_flipped:
+ defaults.update({
+ 'flipIPSign' : True,
+ 'usePosIP' : True,
+ 'useNegIP' : False,
+ })
+
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ Analysis__RNNIPTag.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/SVForIPToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/SVForIPToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..71492a65b4302c6786f4f95825544f729603a00d
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/SVForIPToolConfig.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# import the SVForIPTool configurable
+from JetTagTools.JetTagToolsConf import Analysis__SVForIPTool
+
+# define the class
+class SVForIPToolCfg( Analysis__SVForIPTool ):
+ # constructor
+ def __init__(self, name = 'SVForIPTool', options = {}):
+ """Sets up a SVForIPTool_IP2D tool and returns it.
+
+ input: name: The name of the tool (should be unique).
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+
+ options['name'] = name
+
+ return Analysis__SVForIPTool.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/SpecialTrackAssociatorConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/SpecialTrackAssociatorConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..8bcc37694ce1a5b7e9bd8096d88c352198e75b46
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/SpecialTrackAssociatorConfig.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# import the TrackToVertexIPEstimator configurable
+from TrackVertexAssociationTool.TrackVertexAssociationToolConf import CP__TightTrackVertexAssociationTool
+
+# define the class
+class SpecialTrackAssociatorCfg( CP__TightTrackVertexAssociationTool ):
+ # constructor
+ def __init__(self, name = 'SpecialTrackAssociator', useBTagFlagsDefaults = True, options = {}):
+ """Sets up a SpecialTrackAssociator tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool."""
+ if useBTagFlagsDefaults:
+ defaults = { 'dzSinTheta_cut' : 3,
+ 'doPV' : True }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+
+ CP__TightTrackVertexAssociationTool.__init__(self, **options)
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/MultivariateTagManager.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/MultivariateTagManager.cxx
index 92e1e4fdf00c07d84d6ee5977e58317b10d838dd..14b9d3f3a9be596465edf451c16a15fcb14e2447 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/MultivariateTagManager.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/MultivariateTagManager.cxx
@@ -121,7 +121,7 @@ namespace Analysis {
fill_jetfitter(inputs, BTag); // fill JetFitter variables
fill_sv0(inputs, BTag); // fill sv0 variables
fill_sv1(inputs, BTag); // fill sv1 variables
- fill_mvb(inputs, jetToTag, BTag);// fill MVb variables
+ //fill_mvb(inputs, jetToTag, BTag);// fill MVb variables
fill_mv2cl100(inputs, BTag); // fill MV2cl100 variables
fill_trkSum(inputs,BTag);
fill_softmuon(inputs,BTag);
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx
index 7235b4d5a5fb28e334a3dbb76875688cb5e2f7b6..9e27c4ac94d61b2ca769d87c4052b17259d28815 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx
@@ -75,13 +75,6 @@ namespace Analysis {
StatusCode TrackSelector::initialize() {
for(int i=0;i<numCuts;i++) m_ntrc[i]=0;
- /** retrieving ToolSvc: */
- IToolSvc* toolSvc;
- StatusCode sc = service("ToolSvc", toolSvc);
- if (StatusCode::SUCCESS != sc) {
- ATH_MSG_ERROR("#BTAG# Can't get ToolSvc");
- return StatusCode::FAILURE;
- }
/** retrieving TrackToVertex: */
if ( m_trackToVertexTool.retrieve().isFailure() ) {
ATH_MSG_FATAL("#BTAG# Failed to retrieve tool " << m_trackToVertexTool);
diff --git a/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonAssociation.h b/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonAssociation.h
index f89fa0e9cd8a9c6ef1e6b8180c4f80c612e72546..54d70e3b287d0e029f9a6f3ba9c270df5362a49d 100755
--- a/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonAssociation.h
+++ b/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonAssociation.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
*/
@@ -31,7 +31,7 @@ namespace Analysis
public:
MuonAssociation() ; //!< constructor
MuonAssociation(const NameType& name) ; //!< constructor
- ~MuonAssociation() ; //!< destructor
+ ~MuonAssociation() = default;
virtual JetAssociationBase* clone() const;
//!< a clone method for the proper workings of the copy constructor
diff --git a/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonConstituent.h b/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonConstituent.h
index 39ed3d1e3a019431ed906c1085127f296b8ab86e..768b4f4c66dec806bbd0da33ce39018cdabc3d96 100755
--- a/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonConstituent.h
+++ b/PhysicsAnalysis/MuonID/MuonIDEvent/MuonIDEvent/MuonConstituent.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
*/
/***************************************************************************
@@ -50,7 +50,7 @@ namespace Analysis
public:
MuonConstituent() ; //!< constructor
MuonConstituent(NameType& name) ; //!< constructor
- ~MuonConstituent() ; //!< destructor
+ ~MuonConstituent() = default;
virtual void setName(NameType& name);
//!< to set the name
diff --git a/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonAssociation.cxx b/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonAssociation.cxx
index 64cfd45336e8eed99356f486758001ab13ea463e..e9814c1e793d11416ef24696bf6989fe881321fe 100755
--- a/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonAssociation.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonAssociation.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,9 +15,6 @@ namespace Analysis
MuonAssociation::MuonAssociation(const NameType& name)
{ this->setName(name); }
- MuonAssociation::~MuonAssociation()
- { }
-
JetAssociationBase* MuonAssociation::clone() const
{ return new MuonAssociation( *this );}
diff --git a/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonConstituent.cxx b/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonConstituent.cxx
index 6b3b82566980069ae0074720c7ce6f7ad2ee8808..ef5cfb5fbbc5688a0ddd65d6e3d1f0f3a26fb81e 100755
--- a/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonConstituent.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDEvent/src/MuonConstituent.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
*/
/***************************************************************************
@@ -25,10 +25,6 @@ namespace Analysis
MuonConstituent::MuonConstituent(NameType& name)
{ m_name = name; }
- MuonConstituent::~MuonConstituent()
- { }
-
-
void MuonConstituent::setName(NameType& name) {m_name = name;}
NameType MuonConstituent::name() const { return m_name;}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthEtIsolations_p1.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthEtIsolations_p1.h
index 9bde78450b4ad4568bd46d2ee6f632a9ef5d709b..3714edc33b73ed3514238ffdb28f917c0f4227ac 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthEtIsolations_p1.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthEtIsolations_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// TruthEtIsolations_p1.h
@@ -59,7 +59,7 @@ public:
/** Destructor:
*/
- ~TruthEtIsolations_p1();
+ ~TruthEtIsolations_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
@@ -94,8 +94,4 @@ TruthEtIsolations_p1::TruthEtIsolations_p1() :
m_etIsolations( )
{}
-inline
-TruthEtIsolations_p1::~TruthEtIsolations_p1()
-{}
-
#endif //> MCPARTICLEEVENTTPCNV_TRUTHETISOLATIONS_P1_H
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p5.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p5.h
index 0ce6183d4fe878f01a5435c74598ea3e4874c495..80a30032b265ad8de0389e73e4995209986d9212 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p5.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p5.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// TruthParticleContainer_p5.h
@@ -44,7 +44,7 @@ class TruthParticleContainer_p5
/** Destructor:
*/
- ~TruthParticleContainer_p5();
+ ~TruthParticleContainer_p5() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
@@ -80,8 +80,4 @@ inline TruthParticleContainer_p5::TruthParticleContainer_p5() :
m_etIsolations( )
{}
-inline
-TruthParticleContainer_p5::~TruthParticleContainer_p5()
-{}
-
#endif //> MCPARTICLEEVENTTPCNV_TRUTHPARTICLECONTAINER_P5_H
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p6.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p6.h
index c65687aa0243164f08b48899fb1cf5e40d482c2e..4843ba72178093697132994df7010fae9ac243c6 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p6.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/McParticleEventTPCnv/TruthParticleContainer_p6.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// TruthParticleContainer_p6.h
@@ -44,7 +44,7 @@ class TruthParticleContainer_p6
/** Destructor:
*/
- ~TruthParticleContainer_p6();
+ ~TruthParticleContainer_p6() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
@@ -80,8 +80,4 @@ inline TruthParticleContainer_p6::TruthParticleContainer_p6() :
m_etIsolations( )
{}
-inline
-TruthParticleContainer_p6::~TruthParticleContainer_p6()
-{}
-
#endif //> MCPARTICLEEVENTTPCNV_TRUTHPARTICLECONTAINER_P6_H
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 3118b6d8f41680473957c49bed3c7338184332c7..7ef7144a8df0ef0b5f4faa056c7b91139092e199 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -164,7 +164,7 @@
+ InnerDetector/InDetConditions/BeamSpotConditions
+ InnerDetector/InDetConditions/BeamSpotConditionsData
+ InnerDetector/InDetConditions/InDetCondFolders
-+ InnerDetector/InDetConditions/InDetCondServices
++ InnerDetector/InDetConditions/InDetCondTools
+ InnerDetector/InDetConditions/InDetConditionsAthenaPool
+ InnerDetector/InDetConditions/InDetConditionsSummaryService
+ InnerDetector/InDetConditions/InDetCoolCoralClientUtils
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetAssociationBase_p1.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetAssociationBase_p1.h
index 6e2fc696832045bae2fa4b461f4dfd576b237340..32c46b299e1bb166118ef2e85f3ab5b0f2b948f7 100644
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetAssociationBase_p1.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetAssociationBase_p1.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 JETEVENT_JETASSOCIATIONBASE_P1_H
@@ -11,7 +11,7 @@ class JetAssociationBase_p1
public:
JetAssociationBase_p1() {};
- ~JetAssociationBase_p1() {};
+ ~JetAssociationBase_p1() = default;
/// Stored in the base class
unsigned int m_keyIndex{};
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetKeyDescriptor_p1.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetKeyDescriptor_p1.h
index c0dc6a135c610bbdcaa4ba405605db5386fba2d9..1102c5a8f837e607decda2c4d1cac21849207598 100644
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetKeyDescriptor_p1.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetKeyDescriptor_p1.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 JETEVENT_JETKEYDESCRIPTOR_P1_H
@@ -14,7 +14,7 @@ class JetKeyDescriptor_p1
public:
JetKeyDescriptor_p1() {};
- ~JetKeyDescriptor_p1() {};
+ ~JetKeyDescriptor_p1() = default;
std::vector<unsigned int> m_keyStoreLength;
std::vector<std::string> m_keyStore;
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p1.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p1.h
index 9994c40770ced657ffa9a7a5d2bd7363931e74c8..a655d153dc2a17a057d6c40f10da8263beea9edc 100644
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p1.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p1.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 JETEVENTTPCNV_JETMOMENTMAP_P1_H
@@ -18,7 +18,7 @@ class JetMomentMap_p1
public:
JetMomentMap_p1() { };
- virtual ~JetMomentMap_p1() { };
+ virtual ~JetMomentMap_p1() = default;
protected:
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p6.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p6.h
index 7f98cd57590f3d0c220715502567c779d563ebf4..aaef59dd8f0ca04b5512d676a76f0968a72ddd26 100644
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p6.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetMomentMap_p6.h
@@ -1,7 +1,7 @@
// emacs , this -*- 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 JETEVENTTPCNV_JETMOMENTMAP_p6_H
@@ -16,7 +16,7 @@ class JetMomentMap_p6
public:
JetMomentMap_p6() { };
- virtual ~JetMomentMap_p6() { };
+ virtual ~JetMomentMap_p6() = default;
// this limit the number of persified moments to 256
typedef unsigned char mom_num_t;
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p1.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p1.h
index 9101bc0bba61ec5f0be5fcea95dc4f5c12f99cb8..1c22f7980a1539f043b58ab3ccc34207c6322608 100644
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p1.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// JetSampling_p1.h
@@ -53,7 +53,7 @@ public:
/** Destructor:
*/
- ~JetSampling_p1();
+ ~JetSampling_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p2.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p2.h
index c5c939ee3b55dd87bb15f22db3df70237a07d37a..f41432becf32e53e0feed2bf12a6fa8fabceb0d0 100644
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p2.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/JetSampling_p2.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// JetSampling_p2.h
@@ -58,7 +58,7 @@ public:
/** Destructor:
*/
- ~JetSampling_p2();
+ ~JetSampling_p2() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p1.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p1.h
index 34f629e2c17faf45192ec31ada081f3214345b2f..ccd6df3fdeed08607a95fcaf3b3c7a8ef453f1c7 100755
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p1.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Jet_p1.h
@@ -44,7 +44,7 @@ public:
/** Destructor:
*/
- ~Jet_p1();
+ ~Jet_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p6.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p6.h
index ca2a80745975759024fa191692021bf5f524bfc3..a5a5bfc1ad9c529de7253afecc6c390d09eb9076 100644
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p6.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/Jet_p6.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Jet_p6.h
@@ -60,7 +60,7 @@ public:
/** Destructor:
*/
- ~Jet_p6();
+ ~Jet_p6() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/ParticleJet_p1.h b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/ParticleJet_p1.h
index 918f988e67ee3ee505383343bbadaa4622a099dd..2189cbe2419637dad32a70fa4363fb9684f98f21 100755
--- a/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/ParticleJet_p1.h
+++ b/Reconstruction/Jet/JetEventTPCnv/JetEventTPCnv/ParticleJet_p1.h
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// ParticleJet_p1.h
@@ -51,7 +51,7 @@ public:
/** Destructor:
*/
- ~ParticleJet_p1();
+ ~ParticleJet_p1() = default;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p1.cxx b/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p1.cxx
index 012cc340b73fb4efc4552dde5640d2ffc80838ec..8beee56c702ee8907a7203c67e047faaf9652dd2 100644
--- a/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p1.cxx
+++ b/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p1.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// JetSampling_p1.cxx
@@ -87,6 +87,3 @@ JetSampling_p1::JetSampling_p1()
m_erad.assign(0);
}
-JetSampling_p1::~JetSampling_p1()
-{}
-
diff --git a/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p2.cxx b/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p2.cxx
index 2e6006f9b30aa32521a36e30e3eef5c43cf8d1eb..d7a6266b912a475976636e05f6350c8d0b83ee51 100644
--- a/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p2.cxx
+++ b/Reconstruction/Jet/JetEventTPCnv/src/JetSampling_p2.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// JetSampling_p2.cxx
@@ -87,6 +87,3 @@ JetSampling_p2::JetSampling_p2()
m_erad_tracks.assign(0);
}
-JetSampling_p2::~JetSampling_p2()
-{}
-
diff --git a/Reconstruction/Jet/JetEventTPCnv/src/Jet_p1.cxx b/Reconstruction/Jet/JetEventTPCnv/src/Jet_p1.cxx
index 47decbdb0dc2d10255583898ecdf42b251138f02..55f73d65a268f522138558dbbd1dcfe2c485a5fe 100755
--- a/Reconstruction/Jet/JetEventTPCnv/src/Jet_p1.cxx
+++ b/Reconstruction/Jet/JetEventTPCnv/src/Jet_p1.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Jet_p1.cxx
@@ -13,10 +13,3 @@
// JetEventTPCnv includes
#include "JetEventTPCnv/Jet_p1.h"
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-Jet_p1::~Jet_p1()
-{}
-
diff --git a/Reconstruction/Jet/JetEventTPCnv/src/Jet_p6.cxx b/Reconstruction/Jet/JetEventTPCnv/src/Jet_p6.cxx
index 32eb4efcc00c3447ca199ae7dd8c1c065ed13ccd..478d44f2096c1d25f5b8c7e5f9a0b159c5827ece 100644
--- a/Reconstruction/Jet/JetEventTPCnv/src/Jet_p6.cxx
+++ b/Reconstruction/Jet/JetEventTPCnv/src/Jet_p6.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// Jet_p6.cxx
@@ -13,13 +13,3 @@
// JetEventTPCnv includes
#include "JetEventTPCnv/Jet_p6.h"
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-
-
-// Delete the pointed-to objects, if we own them.
-Jet_p6::~Jet_p6()
-{ }
-
diff --git a/Reconstruction/Jet/JetEventTPCnv/src/ParticleJet_p1.cxx b/Reconstruction/Jet/JetEventTPCnv/src/ParticleJet_p1.cxx
index dd8878587544139ba8fba138cc745fab04a03829..c7550221a229253500b4bce93844866abd2ad890 100755
--- a/Reconstruction/Jet/JetEventTPCnv/src/ParticleJet_p1.cxx
+++ b/Reconstruction/Jet/JetEventTPCnv/src/ParticleJet_p1.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- 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
*/
// ParticleJet_p1.cxx
@@ -14,9 +14,3 @@
// ParticleEventTPCnv includes
#include "JetEventTPCnv/ParticleJet_p1.h"
-///////////////////////////////////////////////////////////////////
-/// Public methods:
-///////////////////////////////////////////////////////////////////
-
-ParticleJet_p1::~ParticleJet_p1()
-{}
diff --git a/Reconstruction/RecEventTPCnv/RecEventTPCnv/RecoTimingObj_p1.h b/Reconstruction/RecEventTPCnv/RecEventTPCnv/RecoTimingObj_p1.h
index 7ad31f298f57de308df2a3322366aeb29cbd6e07..11dcd0fa404b148808159db69d36acbda82ae8f5 100644
--- a/Reconstruction/RecEventTPCnv/RecEventTPCnv/RecoTimingObj_p1.h
+++ b/Reconstruction/RecEventTPCnv/RecEventTPCnv/RecoTimingObj_p1.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 RECTPCNV_RECOTIMINGOBJ_P1_H
@@ -20,7 +20,7 @@ class RecoTimingObj_p1
RecoTimingObj_p1() : m_isTimings(true) {};
/** destructor */
- ~RecoTimingObj_p1() {};
+ ~RecoTimingObj_p1() = default;
// protected:
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx b/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx
index 5b677b886ea54045c559f8546094cfe95b61a96f..14b557d20e2beaccad16419db2f038456d8c1826 100755
--- a/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx
+++ b/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx
@@ -27,7 +27,7 @@ const Amg::Vector3D Reco::TrackToVertex::s_origin(0.,0.,0.);
// constructor
Reco::TrackToVertex::TrackToVertex(const std::string& t, const std::string& n, const IInterface* p) :
AthAlgTool(t,n,p),
- m_extrapolator("Trk::Extrapolator/AtlasExtrapolator")
+ m_extrapolator("Trk::Extrapolator/AtlasExtrapolator", this)
{
declareInterface<ITrackToVertex>(this);
// the extrapolatr and the BeamCondSvc
diff --git a/Reconstruction/iPat/iPatTrackFollower/iPatTrackFollower/SiliconLayerAssociator.h b/Reconstruction/iPat/iPatTrackFollower/iPatTrackFollower/SiliconLayerAssociator.h
index e93ddf1c3816753281e4d55009a879d6d6f84286..38d5a48b13ab801063fb5f536c30eed23ea48fef 100755
--- a/Reconstruction/iPat/iPatTrackFollower/iPatTrackFollower/SiliconLayerAssociator.h
+++ b/Reconstruction/iPat/iPatTrackFollower/iPatTrackFollower/SiliconLayerAssociator.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
*/
///////////////////////////////////////////////////////////////////
@@ -21,7 +21,6 @@
#include "iPatInterfaces/ISiliconLayerAssociator.h"
#include "iPatTrackFollower/LayerAssociation.h"
#include "iPatTrackFollower/SiliconClusterMap.h"
-#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
//<<<<<< CLASS DECLARATIONS >>>>>>
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
index 178f05448166b30ff62e1c567bd6992c07f23574..a9fa8ce47c34323b256b4a17d0fa682e77d72761 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
@@ -50,14 +50,21 @@
#define TILESIMALGS_TILEDIGITSFROMPULSE_H
// Tile includes
+#include "TileEvent/TileDigitsContainer.h"
+#include "TileEvent/TileRawChannelContainer.h"
#include "TileConditions/TileCondToolNoiseSample.h"
+// Athena includes
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "CLHEP/Random/RandomEngine.h"
+#include "StoreGate/WriteHandleKey.h"
+
+// Gaudi includes
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/ToolHandle.h"
+#include "CLHEP/Random/RandomEngine.h"
+
#include <string>
//Simulation includes
@@ -100,6 +107,12 @@ private:
ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample{this,
"TileCondToolNoiseSample", "TileCondToolNoiseSample", "Tile sample noise tool"};
+
+ SG::WriteHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
+ "TileDigitsContainer", "TileDigitsCnt", "Output Tile digits container key"};
+
+ 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
diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
index 4dfc452aa437fb6327dd29b4a1dad84e021d1776..d26dac72a08c3c313a736ed9a639bdebe9c3472b 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx
@@ -17,27 +17,29 @@
//
//*****************************************************************************
-#include "TileEvent/TileDigits.h"
-
-#include "AthAllocators/DataPool.h"
-#include "PathResolver/PathResolver.h"
-
// Tile includes
+#include "TileSimAlgs/TileDigitsFromPulse.h"
+#include "TileEvent/TileDigits.h"
+#include "TileEvent/TileMutableDigitsContainer.h"
+#include "TileEvent/TileMutableRawChannelContainer.h"
#include "TileIdentifier/TileHWID.h"
#include "TileConditions/TileInfo.h"
-#include "TileEvent/TileDigitsContainer.h"
-#include "TileEvent/TileRawChannelContainer.h"
-#include "TileSimAlgs/TileDigitsFromPulse.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
-//C++ STL includes
-#include <vector>
-
//Simulator includes
#include "TilePulseSimulator/TileSampleGenerator.h"
#include "TilePulseSimulator/TileSampleBuffer.h"
#include "TilePulseSimulator/TilePulseShape.h"
+// Athena includes
+#include "AthAllocators/DataPool.h"
+#include "PathResolver/PathResolver.h"
+//Random number service
+#include "AthenaKernel/IAtRndmGenSvc.h"
+
+#include <CLHEP/Random/Randomize.h>
+#include <CLHEP/Units/SystemOfUnits.h>
+
//Root includes
#include "TRandom3.h"
#include "TFile.h"
@@ -45,10 +47,9 @@
#include "TKey.h"
#include "TF1.h"
-//Random number service
-#include "AthenaKernel/IAtRndmGenSvc.h"
-#include <CLHEP/Random/Randomize.h>
-#include <CLHEP/Units/SystemOfUnits.h>
+//C++ STL includes
+#include <vector>
+
using CLHEP::RandGaussQ;
using CLHEP::RandFlat;
@@ -67,7 +68,6 @@ TileDigitsFromPulse::TileDigitsFromPulse(std::string name, ISvcLocator* pSvcLoca
m_rChUnit = TileRawChannelUnit::ADCcounts;
m_rChType = TileFragHash::Default;
- declareProperty("OutputContainer", m_outputContainer = "TileDigitsCnt");
declareProperty("ImperfectionMean", m_imperfectionMean = 1.01);
declareProperty("ImperfectionRms", m_imperfectionRms = 0.02);
declareProperty("InTimeAmp", m_inTimeAmp = 300.);
@@ -146,7 +146,12 @@ StatusCode TileDigitsFromPulse::initialize() {
ATH_CHECK(m_tileToolNoiseSample.retrieve());
- ATH_MSG_INFO("output container: " << m_outputContainer);
+ ATH_CHECK(m_digitsContainerKey.initialize());
+ ATH_MSG_INFO("Output digits container: " << m_digitsContainerKey.key());
+
+ ATH_CHECK(m_rawChannelContainerKey.initialize());
+ ATH_MSG_INFO("Output raw channel container: " << m_rawChannelContainerKey.key());
+
//Build pulse shapes
m_ps[0]->setPulseShape(m_tileInfo->digitsFullShapeLo());
@@ -219,16 +224,17 @@ StatusCode TileDigitsFromPulse::execute() {
ATH_MSG_DEBUG("in execute()");
// Create new container for digits
- TileDigitsContainer* outputCont = new TileDigitsContainer(true, SG::VIEW_ELEMENTS);
- if (!outputCont) {
- ATH_MSG_FATAL("Could not create a new TileDigitsContainer");
- return StatusCode::FAILURE;
- }
+ auto digitsContainer = std::make_unique<TileMutableDigitsContainer>(true,
+ TileFragHash::Digitizer,
+ TileRawChannelUnit::ADCcounts,
+ SG::VIEW_ELEMENTS);
+
+ ATH_CHECK( digitsContainer->status() );
//Create RawChannel for truth values.
- TileRawChannel * pRawChannel;
- TileRawChannelContainer * pRawChannelContainer;
- pRawChannelContainer = new TileRawChannelContainer(true, m_rChType, m_rChUnit);
+ auto rawChannelContainer = std::make_unique<TileMutableRawChannelContainer>(true, m_rChType, m_rChUnit);
+ ATH_CHECK( rawChannelContainer->status() );
+
DataPool < TileDigits > tileDigitsPool(m_tileHWID->adc_hash_max());
TRandom3 *random = new TRandom3(m_seed); //Randomizer for pulse-shape imperfection
@@ -375,25 +381,25 @@ StatusCode TileDigitsFromPulse::execute() {
TileDigits * digit = tileDigitsPool.nextElementPtr();
*digit = TileDigits (m_tileHWID->adc_id(ros, drawer, channel, gain),
std::move(samples));
- outputCont->push_back(digit);
- pRawChannel = new TileRawChannel(digit->adc_HWID(), n_inTimeAmp, tFit, m_ootAmp, m_ootOffset);
- pRawChannelContainer->push_back(pRawChannel);
+ ATH_CHECK( digitsContainer->push_back(digit) );
+
+ auto rawChannel = std::make_unique<TileRawChannel>(digit->adc_HWID(),
+ n_inTimeAmp,
+ tFit,
+ m_ootAmp,
+ m_ootOffset);
+
+ ATH_CHECK( rawChannelContainer->push_back(std::move(rawChannel)) );
}
}
}
- CHECK(evtStore()->record(pRawChannelContainer, "TrueAmp", false));
+ SG::WriteHandle<TileRawChannelContainer> rawChannelCnt(m_rawChannelContainerKey);
+ ATH_CHECK( rawChannelCnt.record(std::move(rawChannelContainer)) );
- if (m_outputContainer.size() > 0) {
-
- CHECK(evtStore()->record(outputCont, m_outputContainer, false));
-
- } else if (outputCont) {
-
- ATH_MSG_DEBUG("Deleting filtered digits container");
- delete outputCont;
- }
+ SG::WriteHandle<TileDigitsContainer> digitsCnt(m_digitsContainerKey);
+ ATH_CHECK( digitsCnt.record(std::move(digitsContainer)) );
if (!m_simQIE) {
delete pdf;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
index a70731bd1ddc70deceb0334e76b4349d2f9137b8..00da31feb79f25699188b479ddf424a81683845d 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.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
*/
//****************************************************************************
@@ -19,12 +19,13 @@
// Tile includes
#include "TileSimAlgs/TileDigitsMaker.h"
+#include "TileEvent/TileMutableDigitsContainer.h"
+#include "TileEvent/TileRawChannelContainer.h"
#include "TileIdentifier/TileHWID.h"
#include "TileConditions/TileInfo.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileConditions/TileCablingService.h"
#include "TileConditions/TilePulseShapes.h"
-#include "TileEvent/TileRawChannelContainer.h"
// Calo includes
#include "CaloIdentifier/TileID.h"
@@ -431,16 +432,26 @@ StatusCode TileDigitsMaker::execute() {
/* step2: Set up Digits container */
- SG::WriteHandle<TileDigitsContainer> digitsContainer(m_digitsContainerKey);
- ATH_CHECK( digitsContainer.record(std::make_unique<TileDigitsContainer>(true)) );
- std::unique_ptr<TileDigitsContainer> digitsContainer_DigiHSTruth;
+ auto digitsContainer = std::make_unique<TileMutableDigitsContainer>(true,
+ TileFragHash::Digitizer,
+ TileRawChannelUnit::ADCcounts);
+ ATH_CHECK( digitsContainer->status() );
+
+ std::unique_ptr<TileMutableDigitsContainer> digitsContainer_DigiHSTruth;
if(m_doDigiTruth){
- digitsContainer_DigiHSTruth = std::make_unique<TileDigitsContainer>(true, SG::VIEW_ELEMENTS);
+ digitsContainer_DigiHSTruth = std::make_unique<TileMutableDigitsContainer>(true,
+ TileFragHash::Digitizer,
+ TileRawChannelUnit::ADCcounts);
+ ATH_CHECK( digitsContainer_DigiHSTruth->status() );
}
- std::unique_ptr<TileDigitsContainer> filteredContainer;
+ std::unique_ptr<TileMutableDigitsContainer> filteredContainer;
if (!m_filteredDigitsContainerKey.key().empty()) {
- filteredContainer = std::make_unique<TileDigitsContainer>(true, SG::VIEW_ELEMENTS);
+ filteredContainer = std::make_unique<TileMutableDigitsContainer>(true,
+ TileFragHash::Digitizer,
+ TileRawChannelUnit::ADCcounts,
+ SG::VIEW_ELEMENTS);
+ ATH_CHECK( filteredContainer->status() );
}
/* Set up buffers for handling information in a single collection. */
@@ -1063,11 +1074,13 @@ StatusCode TileDigitsMaker::execute() {
}
ATH_MSG_DEBUG( "Masking Channel " << ros << '/' << drawer << '/' << ich << "/1 HG" );
}
- TileDigits* pDigits = new TileDigits(adc_id, digitsBuffer);
- digitsContainer->push_back(pDigits);
+
+ auto pDigits = std::make_unique<TileDigits>(adc_id, digitsBuffer);
+ ATH_CHECK( digitsContainer->push_back(std::move(pDigits)) );
+
if(m_doDigiTruth && digitsContainer_DigiHSTruth != nullptr){
- TileDigits* digits_DigiHSTruth = new TileDigits(adc_id, digitsBuffer_DigiHSTruth);
- digitsContainer_DigiHSTruth->push_back(digits_DigiHSTruth);
+ auto digits_DigiHSTruth = std::make_unique<TileDigits>(adc_id, digitsBuffer_DigiHSTruth);
+ ATH_CHECK( digitsContainer_DigiHSTruth->push_back(std::move(digits_DigiHSTruth)) );
}
if (chanLoIsBad) {
@@ -1077,12 +1090,13 @@ StatusCode TileDigitsMaker::execute() {
}
ATH_MSG_DEBUG( "Masking Channel " << ros << '/' << drawer << '/' << ich << "/0 LG");
}
- TileDigits* pDigitsLo = new TileDigits(adc_id_lo, digitsBufferLo);
- digitsContainer->push_back(pDigitsLo);
+ auto pDigitsLo = std::make_unique<TileDigits>(adc_id_lo, digitsBufferLo);
+ ATH_CHECK( digitsContainer->push_back(std::move(pDigitsLo)) );
+
if(m_doDigiTruth && digitsContainer_DigiHSTruth != nullptr){
- TileDigits* pDigitsLo_DigiHSTruth = new TileDigits(adc_id_lo, digitsBufferLo_DigiHSTruth);
- digitsContainer_DigiHSTruth->push_back(pDigitsLo_DigiHSTruth);
+ auto pDigitsLo_DigiHSTruth = std::make_unique<TileDigits>(adc_id_lo, digitsBufferLo_DigiHSTruth);
+ ATH_CHECK( digitsContainer_DigiHSTruth->push_back(std::move(pDigitsLo_DigiHSTruth)) );
}
} else { //normal run
@@ -1158,15 +1172,10 @@ StatusCode TileDigitsMaker::execute() {
}
}
- TileDigits* pDigits = new TileDigits(adc_id, digitsBuffer);
- digitsContainer->push_back(pDigits);
- if(m_doDigiTruth && digitsContainer_DigiHSTruth != nullptr){
- TileDigits* pDigits_DigiHSTruth = new TileDigits(adc_id, digitsBuffer_DigiHSTruth);
- digitsContainer_DigiHSTruth->push_back(pDigits_DigiHSTruth);
- }
+ auto pDigits = std::make_unique<TileDigits>(adc_id, digitsBuffer);
if (ech_int[ich] > m_filterThreshold || ech_int[ich] < -m_filterThresholdMBTS) {
- if (filteredContainer) filteredContainer->push_back(pDigits);
+ if (filteredContainer) ATH_CHECK( filteredContainer->push_back(pDigits.get()) );
if (hiGain) {
++nChHiFlt;
} else {
@@ -1174,6 +1183,12 @@ StatusCode TileDigitsMaker::execute() {
}
}
+ ATH_CHECK( digitsContainer->push_back(std::move(pDigits)) );
+ if(m_doDigiTruth && digitsContainer_DigiHSTruth != nullptr){
+ auto pDigits_DigiHSTruth = std::make_unique<TileDigits>(adc_id, digitsBuffer_DigiHSTruth);
+ ATH_CHECK( digitsContainer_DigiHSTruth->push_back(std::move(pDigits_DigiHSTruth)) );
+ }
+
if (msgLvl(MSG::VERBOSE)) {
double pedSim = ((hiGain) ? pedSimHi : pedSimLo);
double ampInTime = digitsBuffer[m_iTrig] - pedSim;
@@ -1248,7 +1263,11 @@ StatusCode TileDigitsMaker::execute() {
}
}
+
// step3: register the Digit container in the TES
+ SG::WriteHandle<TileDigitsContainer> digitsCnt(m_digitsContainerKey);
+ ATH_CHECK( digitsCnt.record(std::move(digitsContainer)) );
+
if(m_doDigiTruth && digitsContainer_DigiHSTruth){
SG::WriteHandle<TileDigitsContainer> digits_DigiHSTruth(m_digitsContainer_DigiHSTruthKey);
ATH_CHECK( digits_DigiHSTruth.record(std::move(digitsContainer_DigiHSTruth)) );
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
index 0faa792c41357da3a5fe39622acc21b0908a5498..8a2a56261508656b374e416529fef978b134a7a6 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitToRawChannel.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
*/
//*****************************************************************************
@@ -18,11 +18,12 @@
// Tile includes
#include "TileSimAlgs/TileHitToRawChannel.h"
+#include "TileEvent/TileHitContainer.h"
+#include "TileEvent/TileMutableRawChannelContainer.h"
#include "TileIdentifier/TileHWID.h"
#include "TileCalibBlobObjs/TileCalibUtils.h"
#include "TileConditions/TileInfo.h"
#include "TileConditions/TileCablingService.h"
-#include "TileEvent/TileHitContainer.h"
// Calo includes
#include "CaloIdentifier/TileID.h"
@@ -194,8 +195,8 @@ StatusCode TileHitToRawChannel::execute() {
IdContext drawer_context = m_tileHWID->drawer_context();
// step2: form raw channels, and put them in container
- SG::WriteHandle<TileRawChannelContainer> rawChannelContainer(m_rawChannelContainerKey);
- ATH_CHECK( rawChannelContainer.record(std::make_unique<TileRawChannelContainer>(true, m_rChType, m_rChUnit)));
+ auto rawChannelContainer = std::make_unique<TileMutableRawChannelContainer>(true, m_rChType, m_rChUnit);
+ ATH_CHECK( rawChannelContainer->status() );
// iterate over all collections in a container
for (const TileHitCollection* hitCollection : *hitContainer) {
@@ -350,8 +351,8 @@ StatusCode TileHitToRawChannel::execute() {
if (lrcGood) {
- std::unique_ptr<TileRawChannel> rawChannel = std::make_unique<TileRawChannel>(adc_id, amp, adc_time[ch], adc_qual[ch]);
- rawChannelContainer->push_back(rawChannel.release());
+ auto rawChannel = std::make_unique<TileRawChannel>(adc_id, amp, adc_time[ch], adc_qual[ch]);
+ ATH_CHECK( rawChannelContainer->push_back(std::move(rawChannel)) );
if (TileID::HIGHGAIN == gain) {
++nChHG;
@@ -388,6 +389,10 @@ StatusCode TileHitToRawChannel::execute() {
<< " eChHG=" << eChHG << endmsg;
}
+
+ SG::WriteHandle<TileRawChannelContainer> rawChannelCnt(m_rawChannelContainerKey);
+ ATH_CHECK( rawChannelCnt.record(std::move(rawChannelContainer)) );
+
return StatusCode::SUCCESS;
}
diff --git a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
index fb9b36f1f449fb59006d9f5dc739154e74396d1a..c7c9dfec82dbb39f168c53839e7914fda11a1f27 100644
--- a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
@@ -31,6 +31,8 @@
// Tile includes
#include "TileSimAlgs/TilePulseForTileMuonReceiver.h"
+#include "TileEvent/TileMutableDigitsContainer.h"
+#include "TileEvent/TileMutableRawChannelContainer.h"
#include "TileIdentifier/TileHWID.h"
#include "TileConditions/TileInfo.h"
#include "TileConditions/TileCablingService.h"
@@ -243,17 +245,18 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
// Get a container for the digits
//
- SG::WriteHandle<TileDigitsContainer> muRcvDigitsContainer(m_muRcvDigitsContainerKey);
- ATH_CHECK( muRcvDigitsContainer.record(std::make_unique<TileDigitsContainer>(true)) );
+ auto muRcvDigitsContainer = std::make_unique<TileMutableDigitsContainer>(true,
+ TileFragHash::Digitizer,
+ TileRawChannelUnit::ADCcounts);
+ ATH_CHECK( muRcvDigitsContainer->status() );
// Get a container for the raw channels
//
- SG::WriteHandle<TileRawChannelContainer> muRcvRawChannelContainer(m_muRcvRawChannelContainerKey);
- ATH_CHECK( muRcvRawChannelContainer.record(std::make_unique<TileRawChannelContainer>(true,
- TileFragHash::MF,
- TileRawChannelUnit::MegaElectronVolts,
- SG::VIEW_ELEMENTS)) );
-
+ auto muRcvRawChannelContainer = std::make_unique<TileMutableRawChannelContainer>(true,
+ TileFragHash::MF,
+ TileRawChannelUnit::MegaElectronVolts,
+ SG::VIEW_ELEMENTS);
+ ATH_CHECK( muRcvRawChannelContainer->status() );
// Vector of digits to set into the container
@@ -583,8 +586,8 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
std::unique_ptr<TileDigits> muonReceiverDigits = std::make_unique<TileDigits>(adc_id, digitsBuffer);
ATH_MSG_VERBOSE( "(D.05) Create a TileRawChannelObject object and set it into a container " );
TileRawChannel* muRcvRawChannel = m_MuRcvBuildTool->rawChannel(muonReceiverDigits.get());
- muRcvDigitsContainer->push_back(muonReceiverDigits.release());
- muRcvRawChannelContainer->push_back(muRcvRawChannel);
+ ATH_CHECK( muRcvDigitsContainer->push_back(std::move(muonReceiverDigits)) );
+ ATH_CHECK( muRcvRawChannelContainer->push_back(muRcvRawChannel) );
if (msgLvl(MSG::DEBUG)){
ATH_MSG_DEBUG( " Channel " << m_tileHWID->to_string(adc_id,-1)
<< " Digitized pulse [ADC] "<< digitsBuffer[0]
@@ -606,6 +609,13 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
//
ATH_MSG_VERBOSE ( "(A.05) Send to event store all collected objects " );
+
+ SG::WriteHandle<TileDigitsContainer> muRcvDigitsCnt(m_muRcvDigitsContainerKey);
+ ATH_CHECK( muRcvDigitsCnt.record(std::move(muRcvDigitsContainer)) );
+
+ SG::WriteHandle<TileRawChannelContainer> muRcvRawChannelCnt(m_muRcvRawChannelContainerKey);
+ ATH_CHECK( muRcvRawChannelCnt.record(std::move(muRcvRawChannelContainer)) );
+
ATH_MSG_VERBOSE( "TilePulseForTileMuonReceiver execution completed" );
return StatusCode::SUCCESS;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileTBHitToBeamElem.cxx b/TileCalorimeter/TileSimAlgs/src/TileTBHitToBeamElem.cxx
index 5f856b3275a8d7186e61776d8f1517b7fb070c14..a2ef303bba245bc0913511946a21d4c5e831b037 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileTBHitToBeamElem.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileTBHitToBeamElem.cxx
@@ -18,6 +18,7 @@
// Tile includes
#include "TileSimAlgs/TileTBHitToBeamElem.h"
+#include "TileEvent/TileMutableBeamElemContainer.h"
#include "TileConditions/TileInfo.h"
// Calo includes
@@ -75,8 +76,8 @@ StatusCode TileTBHitToBeamElem::execute() {
ATH_MSG_DEBUG( "Executing TileTBHitToBeamElem" );
// create new container
- SG::WriteHandle<TileBeamElemContainer> beamElemContainer(m_beamElemContainerKey);
- ATH_CHECK( beamElemContainer.record(std::make_unique<TileBeamElemContainer>(true)) );
+ auto beamElemContainer = std::make_unique<TileMutableBeamElemContainer>(true);
+ ATH_CHECK( beamElemContainer->status() );
//**
//* Get TileHits from TileHitVector
@@ -111,9 +112,12 @@ StatusCode TileTBHitToBeamElem::execute() {
<< " amp=" << amp_ch);
std::unique_ptr<TileBeamElem> beamElem = std::make_unique<TileBeamElem>(adc_id, amp_ch);
- beamElemContainer->push_back(beamElem.release());
+ ATH_CHECK( beamElemContainer->push_back(std::move(beamElem)) );
}
+ SG::WriteHandle<TileBeamElemContainer> beamElemCnt(m_beamElemContainerKey);
+ ATH_CHECK( beamElemCnt.record(std::move(beamElemContainer)) );
+
// Execution completed.
ATH_MSG_DEBUG( "TileTBHitToBeamElem execution completed." );
diff --git a/Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py b/Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
index 85068f6cb4683f9e7ba189a5903793c608e17fd9..a778e4b18411847fde41bd3903d9a15dbcd2b2ac 100644
--- a/Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
+++ b/Tracking/TrkExtrapolation/TrkExTools/python/AtlasExtrapolatorConfig.py
@@ -12,30 +12,26 @@ from TrkExTools.TrkExToolsConf import Trk__Extrapolator
class AtlasExtrapolatorCfg( Trk__Extrapolator ):
# constructor
def __init__(self,name = 'AtlasExtrapolator'):
-
+ result=ComponentAccumulator()
+
# get the correct TrackingGeometry setup
from TrkDetDescrSvc.AtlasTrackingGeometrySvc import AtlasTrackingGeometrySvc
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
AtlasTrackingGeometrySvc = svcMgr.AtlasTrackingGeometrySvc
- # import the ToolSvc
- from AthenaCommon.AppMgr import ToolSvc
- if 'ToolSvc' not in dir() :
- ToolSvc = ToolSvc()
-
# PROPAGATOR DEFAULTS --------------------------------------------------------------------------------------
self.AtlasPropagators = []
from TrkExRungeKuttaPropagator.TrkExRungeKuttaPropagatorConf import Trk__RungeKuttaPropagator as RkPropagator
AtlasRungeKuttaPropagator = RkPropagator(name = 'AtlasRungeKuttaPropagator')
- ToolSvc += AtlasRungeKuttaPropagator
+ result.addPublicTool(AtlasRungeKuttaPropagator) #TODO remove one day
self.AtlasPropagators += [AtlasRungeKuttaPropagator]
from TrkExSTEP_Propagator.TrkExSTEP_PropagatorConf import Trk__STEP_Propagator as STEP_Propagator
AtlasSTEP_Propagator = STEP_Propagator(name = 'AtlasSTEP_Propagator')
- ToolSvc += AtlasSTEP_Propagator
+ result.addPublicTool(AtlasSTEP_Propagator) #TODO remove one day
self.AtlasPropagators += [AtlasSTEP_Propagator]
@@ -45,13 +41,13 @@ class AtlasExtrapolatorCfg( Trk__Extrapolator ):
from TrkExTools.TrkExToolsConf import Trk__MaterialEffectsUpdator as MaterialEffectsUpdator
AtlasMaterialEffectsUpdator = MaterialEffectsUpdator(name = 'AtlasMaterialEffectsUpdator')
- ToolSvc += AtlasMaterialEffectsUpdator
+ result.addPublicTool(AtlasMaterialEffectsUpdator) #TODO remove one day
self.AtlasUpdators += [ AtlasMaterialEffectsUpdator ]
AtlasMaterialEffectsUpdatorLandau = MaterialEffectsUpdator(name = 'AtlasMaterialEffectsUpdatorLandau')
AtlasMaterialEffectsUpdatorLandau.LandauMode = True
- ToolSvc += AtlasMaterialEffectsUpdatorLandau
+ result.addPublicTool(AtlasMaterialEffectsUpdatorLandau) #TODO remove one day
self.AtlasUpdators += [ AtlasMaterialEffectsUpdatorLandau ]
@@ -59,7 +55,7 @@ class AtlasExtrapolatorCfg( Trk__Extrapolator ):
from TrkExTools.TrkExToolsConf import Trk__Navigator
AtlasNavigator = Trk__Navigator(name = 'AtlasNavigator')
AtlasNavigator.TrackingGeometrySvc = AtlasTrackingGeometrySvc
- ToolSvc += AtlasNavigator
+ result.addPublicTool(AtlasNavigator) #TODO remove one day
# CONFIGURE PROPAGATORS/UPDATORS ACCORDING TO GEOMETRY SIGNATURE
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7b5ed9505567bb739e176bfd27bc48fc15832635
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt
@@ -0,0 +1,30 @@
+################################################################################
+# Package: TrigPartialEventBuilding
+################################################################################
+
+# Declare the package name
+atlas_subdir( TrigPartialEventBuilding )
+
+# Declare the package's dependencies
+atlas_depends_on_subdirs( PUBLIC
+ Trigger/TrigSteer/DecisionHandling
+ Trigger/TrigEvent/TrigSteeringEvent
+ PRIVATE
+ Control/AthViews )
+
+# Component(s) in the package
+atlas_add_library( TrigPartialEventBuildingLib
+ src/*.cxx
+ PUBLIC_HEADERS TrigPartialEventBuilding
+ LINK_LIBRARIES DecisionHandlingLib TrigSteeringEvent
+ PRIVATE AthViews )
+
+atlas_add_component( TrigPartialEventBuilding
+ src/components/*.cxx
+ LINK_LIBRARIES TrigPartialEventBuildingLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+
+# Tests
+#atlas_add_test( )
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/TrigPartialEventBuilding/PEBInfoWriterToolBase.h b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/TrigPartialEventBuilding/PEBInfoWriterToolBase.h
new file mode 100644
index 0000000000000000000000000000000000000000..ed48186827df7e5fd5d7f36d70b9cc0e5fc75bef
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/TrigPartialEventBuilding/PEBInfoWriterToolBase.h
@@ -0,0 +1,72 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TrigPartialEventBuilding_PEBInfoWriterToolBase_h
+#define TrigPartialEventBuilding_PEBInfoWriterToolBase_h
+
+// Trigger includes
+#include "DecisionHandling/HLTIdentifier.h"
+#include "DecisionHandling/TrigCompositeUtils.h"
+#include "TrigSteeringEvent/TrigRoiDescriptor.h"
+
+// Athena includes
+#include "AthenaBaseComps/AthAlgTool.h"
+
+/** @class PEBInfoWriterToolBase
+ * @brief Base class for tools used by PEBInfoWriterAlg
+ *
+ * Derived classes have to implement \c createPEBInfo, which is used in \c decide
+ **/
+class PEBInfoWriterToolBase : public AthAlgTool {
+public:
+ // ------------------------- Public types ------------------------------------
+ /// Input to the tool's \c decide method
+ struct Input {
+ Input(TrigCompositeUtils::Decision* d,
+ const EventContext& ctx,
+ const TrigRoiDescriptor* r,
+ const TrigCompositeUtils::Decision* pd)
+ : decision(d),
+ eventContext(ctx),
+ roi(r),
+ previousDecisionIDs(TrigCompositeUtils::decisionIDs(pd).begin(), TrigCompositeUtils::decisionIDs(pd).end()) {}
+ TrigCompositeUtils::Decision* decision;
+ const EventContext& eventContext;
+ const TrigRoiDescriptor* roi;
+ const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
+ };
+ /// Structure holding the list of ROBs and SubDets
+ struct PEBInfo {
+ std::set<uint32_t> robs;
+ std::set<uint32_t> subdets; // uint8_t is sufficient to represent eformat::SubDetector, but uint32_t makes the
+ // implementation and bookkeeping easier
+ };
+
+ // ------------------------- Public methods ----------------------------------
+ /// Standard constructor
+ PEBInfoWriterToolBase(const std::string& type, const std::string& name, const IInterface* parent);
+ /// Standard destructor
+ virtual ~PEBInfoWriterToolBase();
+
+ /// Adds a pass-through decision with attached PEB information created by \c createPEBInfo for each input
+ StatusCode decide(std::vector<Input>& inputs) const;
+ /// Returns the decision id
+ HLT::Identifier id() const {return m_decisionId;}
+ /// Returns the key used to record/retrieve the ROB list
+ static std::string robListKey() {return "PEBROBList";}
+ /// Returns the key used to record/retrieve the SubDet list
+ static std::string subDetListKey() {return "PEBSubDetList";}
+
+protected:
+ /// Creates the PEBInfo which is attached to the decision in \c decide. Has to be implemented by the derived class.
+ virtual PEBInfo createPEBInfo(const Input& input) const = 0;
+
+private:
+ /// The decision id of the tool instance
+ HLT::Identifier m_decisionId;
+};
+
+std::ostream& operator<< (std::ostream& str, const PEBInfoWriterToolBase::PEBInfo& pebi);
+
+#endif // TrigPartialEventBuilding_PEBInfoWriterToolBase_h
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..42ea4e63556ab3fadf64fb2b6bc80b8ef8f4326f
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.cxx
@@ -0,0 +1,129 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// Trigger includes
+#include "PEBInfoWriterAlg.h"
+#include "DecisionHandling/TrigCompositeUtils.h"
+
+// Athena includes
+#include "AthViews/View.h"
+
+// TrigCompositeUtils types used here
+using TrigCompositeUtils::Decision;
+using TrigCompositeUtils::DecisionContainer;
+using TrigCompositeUtils::DecisionID;
+using TrigCompositeUtils::DecisionIDContainer;
+using TrigCompositeUtils::LinkInfo;
+
+// TrigCompositeUtils methods used here
+using TrigCompositeUtils::createAndStore;
+using TrigCompositeUtils::decisionIDs;
+using TrigCompositeUtils::linkToPrevious;
+using TrigCompositeUtils::newDecisionIn;
+
+// =============================================================================
+
+PEBInfoWriterAlg::PEBInfoWriterAlg(const std::string& name, ISvcLocator* pSvcLocator)
+: ::HypoBase(name, pSvcLocator) {}
+
+// =============================================================================
+
+PEBInfoWriterAlg::~PEBInfoWriterAlg() {}
+
+// =============================================================================
+
+StatusCode PEBInfoWriterAlg::initialize() {
+ ATH_MSG_DEBUG("Initialising " << name());
+ ATH_CHECK(m_hypoTools.retrieve());
+ return StatusCode::SUCCESS;
+}
+
+// =============================================================================
+
+StatusCode PEBInfoWriterAlg::finalize() {
+ ATH_MSG_DEBUG("Finalising " << name());
+ return StatusCode::SUCCESS;
+}
+
+// =============================================================================
+
+StatusCode PEBInfoWriterAlg::execute(const EventContext& eventContext) const {
+ ATH_MSG_DEBUG("Executing " << name());
+
+ // ---------------------------------------------------------------------------
+ // Common hypo start - retrieve previous decisions and record new container
+ // ---------------------------------------------------------------------------
+ // Retrieve previous decisions
+ SG::ReadHandle<DecisionContainer> previousDecisionsHandle = SG::makeHandle(decisionInput(), eventContext);
+ if (not previousDecisionsHandle.isValid()) { // Implicit
+ ATH_MSG_DEBUG("No implicit previous decisions with key " << decisionInput().key() << " - is this expected?");
+ return StatusCode::SUCCESS;
+ }
+ ATH_MSG_DEBUG("Running with " << previousDecisionsHandle->size() << " implicit previous decisions");
+
+ // New output decisions
+ SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), eventContext);
+ DecisionContainer* decisions = outputHandle.ptr();
+
+ // ---------------------------------------------------------------------------
+ // Prepare new decision and hypo tool inputs
+ // ---------------------------------------------------------------------------
+ std::vector<PEBInfoWriterToolBase::Input> toolInputs;
+ size_t counter = 0;
+ for (const Decision* previousDecision: *previousDecisionsHandle) {
+ // Get RoI
+ auto roiELInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>(previousDecision, "initialRoI");
+ auto roiEL = roiELInfo.link;
+ ATH_CHECK(roiEL.isValid());
+ const TrigRoiDescriptor* roi = *roiEL;
+
+ // Get View
+ auto viewELInfo = TrigCompositeUtils::findLink<ViewContainer>(previousDecision, "view");
+ ATH_CHECK(viewELInfo.isValid());
+ auto viewEL = viewELInfo.link;
+
+ // Create new decision
+ Decision* newd = newDecisionIn(decisions);
+
+ // Push_back to toolInput
+ toolInputs.emplace_back(newd, eventContext, roi, previousDecision);
+
+ // Link to new decision
+ newd->setObjectLink("roi", roiEL);
+ newd->setObjectLink("view", viewEL);
+ linkToPrevious(newd, decisionInput().key(), counter);
+
+ ATH_MSG_DEBUG("REGTEST: View = " << (*viewEL));
+ ATH_MSG_DEBUG("REGTEST: RoI = eta/phi = " << (*roiEL)->eta() << "/" << (*roiEL)->phi());
+ ATH_MSG_DEBUG("Added view, roi, previous decision to new decision " << counter
+ << " for view " << (*viewEL)->name());
+ ++counter;
+ }
+
+ // ---------------------------------------------------------------------------
+ // Call the hypo tools
+ // ---------------------------------------------------------------------------
+ for (const auto& tool: m_hypoTools) {
+ ATH_MSG_DEBUG("Calling " << tool);
+ ATH_CHECK(tool->decide(toolInputs));
+ }
+
+ // ---------------------------------------------------------------------------
+ // Print the passing decisions
+ // ---------------------------------------------------------------------------
+ ATH_CHECK(outputHandle.isValid());
+ ATH_MSG_DEBUG("Exit with " << outputHandle->size() << " decisions");
+ if (msgLvl(MSG::DEBUG)) {
+ DecisionIDContainer allPassingIDs;
+ for (const Decision* decisionObject : *outputHandle) {
+ decisionIDs(decisionObject, allPassingIDs);
+ }
+ for (DecisionID id : allPassingIDs) {
+ ATH_MSG_DEBUG(" +++ " << HLT::Identifier(id));
+ }
+ }
+
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.h b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..00c5be9617d73cc1d560666745ae52e87dad04d1
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterAlg.h
@@ -0,0 +1,30 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TrigPartialEventBuilding_PEBInfoWriterAlg_h
+#define TrigPartialEventBuilding_PEBInfoWriterAlg_h
+
+#include "DecisionHandling/HypoBase.h"
+#include "TrigPartialEventBuilding/PEBInfoWriterToolBase.h"
+
+/** @class PEBInfoWriterAlg
+ * @brief Pass-through hypo algorithm writing decisions with attached partial event building information
+ **/
+class PEBInfoWriterAlg : public HypoBase {
+public:
+ /// Standard constructor
+ PEBInfoWriterAlg(const std::string& name, ISvcLocator* svcLoc);
+ /// Standard destructor
+ virtual ~PEBInfoWriterAlg();
+
+ // ------------------------- AthReentrantAlgorithm methods -------------------
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
+ virtual StatusCode execute(const EventContext& eventContext) const override;
+
+private:
+ ToolHandleArray<PEBInfoWriterToolBase> m_hypoTools {this, "HypoTools", {}, "Tools to create the PEB Info"};
+};
+
+#endif // TrigPartialEventBuilding_PEBInfoWriterAlg_h
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterToolBase.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterToolBase.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..3c57fc6922de0eea271334b59d531b44ff4a78b8
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/PEBInfoWriterToolBase.cxx
@@ -0,0 +1,94 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "TrigPartialEventBuilding/PEBInfoWriterToolBase.h"
+
+// TrigCompositeUtils types used here
+using TrigCompositeUtils::Decision;
+using TrigCompositeUtils::DecisionContainer;
+using TrigCompositeUtils::DecisionID;
+using TrigCompositeUtils::DecisionIDContainer;
+
+// TrigCompositeUtils methods used here
+using TrigCompositeUtils::createAndStore;
+using TrigCompositeUtils::decisionIDs;
+using TrigCompositeUtils::newDecisionIn;
+
+// =============================================================================
+
+PEBInfoWriterToolBase::PEBInfoWriterToolBase(const std::string& type, const std::string& name, const IInterface* parent)
+: AthAlgTool(type,name,parent),
+ m_decisionId(HLT::Identifier::fromToolName(name)) {}
+
+// =============================================================================
+
+PEBInfoWriterToolBase::~PEBInfoWriterToolBase() {}
+
+// =============================================================================
+
+StatusCode PEBInfoWriterToolBase::decide(std::vector<Input>& inputs) const {
+ for (Input& input : inputs) {
+ // Skip if previous step for this chain didn't pass
+ if (not TrigCompositeUtils::passed(m_decisionId.numeric(), input.previousDecisionIDs)) {
+ ATH_MSG_DEBUG("Skipping chain because previous step didn't pass");
+ continue;
+ }
+
+ // Create new PEB Info for this input
+ PEBInfo pebInfo = createPEBInfo(input);
+
+ // Merge with previous ROBs
+ std::vector<uint32_t> previousRobs;
+ if (input.decision->getDetail(robListKey(), previousRobs)) {
+ pebInfo.robs.insert(previousRobs.begin(), previousRobs.end());
+ }
+
+ // Merge with previous SubDets
+ std::vector<uint32_t> previousSubDets;
+ if (input.decision->getDetail(subDetListKey(), previousSubDets)) {
+ pebInfo.subdets.insert(previousSubDets.begin(), previousSubDets.end());
+ }
+
+ // Attach the PEB Info to the decision
+ std::vector<uint32_t> robVec(pebInfo.robs.begin(), pebInfo.robs.end());
+ if (not input.decision->setDetail(robListKey(), robVec)) {
+ ATH_MSG_ERROR("Failed to attach the detail " << robListKey() << " to the decision");
+ return StatusCode::FAILURE;
+ }
+ std::vector<uint32_t> subDetVec(pebInfo.subdets.begin(), pebInfo.subdets.end());
+ if (not input.decision->setDetail(subDetListKey(), subDetVec)) {
+ ATH_MSG_ERROR("Failed to attach the detail " << subDetListKey() << " to the decision");
+ return StatusCode::FAILURE;
+ }
+
+ ATH_MSG_DEBUG("Attached PEB Info with " << robVec.size() << " ROBs and "
+ << subDetVec.size() << " SubDets to the decision object.");
+ ATH_MSG_DEBUG("PEBInfo: " << pebInfo);
+
+ // Make an accept decision
+ TrigCompositeUtils::addDecisionID(m_decisionId, input.decision);
+ }
+ return StatusCode::SUCCESS;
+}
+
+// =============================================================================
+
+std::ostream& operator<< (std::ostream& str, const PEBInfoWriterToolBase::PEBInfo& pebi) {
+ str << "ROBs = [";
+ size_t i=0;
+ for (const uint32_t robid : pebi.robs) {
+ str << "0x" << std::hex << robid << std::dec;
+ ++i;
+ if (i!=pebi.robs.size()) str << ", ";
+ }
+ str << "], SubDets = [";
+ i=0;
+ for (const uint32_t subdetid : pebi.subdets) {
+ str << "0x" << std::hex << subdetid << std::dec;
+ ++i;
+ if (i!=pebi.subdets.size()) str << ", ";
+ }
+ str << "]";
+ return str;
+}
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/StaticPEBInfoWriterTool.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/StaticPEBInfoWriterTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..80bd7a076e9d507fe7a2d502c981c63d523575ea
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/StaticPEBInfoWriterTool.cxx
@@ -0,0 +1,30 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "StaticPEBInfoWriterTool.h"
+
+// =============================================================================
+
+StaticPEBInfoWriterTool::StaticPEBInfoWriterTool(const std::string& type, const std::string& name, const IInterface* parent)
+: PEBInfoWriterToolBase(type,name,parent) {}
+
+// =============================================================================
+
+StaticPEBInfoWriterTool::~StaticPEBInfoWriterTool() {}
+
+// =============================================================================
+
+StatusCode StaticPEBInfoWriterTool::initialize() {
+ m_pebi.robs.insert(m_robList.begin(), m_robList.end());
+ m_pebi.subdets.insert(m_subDetList.begin(), m_subDetList.end());
+ ATH_MSG_DEBUG("Configured static PEBInfo: " << m_pebi);
+ return StatusCode::SUCCESS;
+}
+
+// =============================================================================
+
+PEBInfoWriterToolBase::PEBInfo StaticPEBInfoWriterTool::createPEBInfo(const PEBInfoWriterToolBase::Input& /*input*/) const {
+ ATH_MSG_DEBUG("Returning static PEBInfo configured in initialize()");
+ return m_pebi;
+}
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/StaticPEBInfoWriterTool.h b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/StaticPEBInfoWriterTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..3fa7aaecad9f79a84a4f947e1fe5981c585207fd
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/StaticPEBInfoWriterTool.h
@@ -0,0 +1,41 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TrigPartialEventBuilding_StaticPEBInfoWriterTool_h
+#define TrigPartialEventBuilding_StaticPEBInfoWriterTool_h
+
+#include "TrigPartialEventBuilding/PEBInfoWriterToolBase.h"
+
+/** @class StaticPEBInfoWriterTool
+ * @brief Tool writing a configurable constant list of ROBs and SubDetectors for use in PEBInfoWriterAlg
+ **/
+class StaticPEBInfoWriterTool : public PEBInfoWriterToolBase {
+public:
+ /// Standard constructor
+ StaticPEBInfoWriterTool(const std::string& type, const std::string& name, const IInterface* parent);
+ /// Standard destructor
+ virtual ~StaticPEBInfoWriterTool();
+ /// Implementation of AthAlgTool::initialize()
+ virtual StatusCode initialize() override;
+
+protected:
+ /// Implementation of PEBInfoWriterToolBase::createPEBInfo
+ virtual PEBInfoWriterToolBase::PEBInfo createPEBInfo(const PEBInfoWriterToolBase::Input& input) const override;
+
+private:
+ /// The list of ROBs added to the PEB Info
+ Gaudi::Property<std::vector<uint32_t> > m_robList {
+ this, "ROBList", {},
+ "The list of ROBs to add for partial event building in each event where the chain passes"
+ };
+ /// The list of SubDets added to the PEB Info
+ Gaudi::Property<std::vector<uint32_t> > m_subDetList {
+ this, "SubDetList", {},
+ "The list of SubDets to add for partial event building in each event where the chain passes"
+ };
+ /// Static PEB Info built at initialize and added in every event
+ PEBInfoWriterToolBase::PEBInfo m_pebi;
+};
+
+#endif // TrigPartialEventBuilding_StaticPEBInfoWriterTool_h
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/components/TrigPartialEventBuilding_entries.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/components/TrigPartialEventBuilding_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..815370e345b069e15b5dc89884a6d0314cc00b8a
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/components/TrigPartialEventBuilding_entries.cxx
@@ -0,0 +1,5 @@
+#include "../PEBInfoWriterAlg.h"
+#include "../StaticPEBInfoWriterTool.h"
+
+DECLARE_COMPONENT( PEBInfoWriterAlg )
+DECLARE_COMPONENT( StaticPEBInfoWriterTool )
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccess.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccess.h
index f041077695018a63bad7f5f5045bd29f27158113..e7f4160748592655f8ffc0713c31f7949d1515f2 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccess.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccess.h
@@ -54,13 +54,8 @@
#include "CaloGeoHelpers/CaloSampling.h"
#include "eformat/old/util.h"
-// Event Incident to get EventInfo
-#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/Incident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
#include "ZdcEvent/ZdcDigitsCollection.h"
// Roi information
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccessATLFAST.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccessATLFAST.h
index 5cde00ddf4c1431794653802a140071f5223a084..e9550cb476881f7677416649540adb15757a44e1 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccessATLFAST.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/TrigDataAccessATLFAST.h
@@ -47,13 +47,8 @@
#include "CaloGeoHelpers/CaloSampling.h"
#include "eformat/old/util.h"
-// Event Incident to get EventInfo
-#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/Incident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
index 5060db52e3e64e26375f65dbbba367f5e69d1b26..1440391cc297c41270dae09e3a4b2f713ea0a183 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
@@ -21,8 +21,6 @@
#include "CaloIdentifier/LArEM_ID.h"
#include "LArRecEvent/LArCell.h"
#include "LArRecEvent/LArFebEnergyCollection.h"
-// #include "Identifier/IdentifierHash.h"
-// #include "LArRawUtils/LArTT_Selector.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloEvent/CaloCluster.h"
@@ -47,6 +45,10 @@
#include "LArIdentifier/LArIdManager.h"
#include "LArIdentifier/LArOnlineID.h"
+// Event Incident to get Event Info
+#include "GaudiKernel/IIncidentSvc.h"
+#include "EventInfo/EventIncident.h"
+
// Initialize method for all tools
// Retrieval of all Tools to be used during run
StatusCode TrigDataAccess::initialize()
@@ -1351,11 +1353,10 @@ void TrigDataAccess::handle(const Incident & inc ) {
return;
}
else {
- const EventInfo* evt;
- evt = &eventInc->eventInfo();
- m_larcell->eventNumber(evt->event_ID()->event_number());
- if (m_applyOffsetCorrection) m_larcell->lumiBlock_BCID(evt->event_ID()->lumi_block(), evt->event_ID()->bunch_crossing_id());
- m_tilecell->eventNumber(evt->event_ID()->event_number());
+ EventContext context = inc.context();
+ m_larcell->eventNumber(context.eventID().event_number());
+ if (m_applyOffsetCorrection) m_larcell->lumiBlock_BCID(context.eventID().lumi_block(), context.eventID().bunch_crossing_id());
+ m_tilecell->eventNumber(context.eventID().event_number());
m_d0cells.clear();
//m_full_vrodid32.clear();
m_present_roi = 0;
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
index fb18cc08a5a09c52bbb947b448939eccaf7aae2c..6eac5aa4ed5113813ab9f7edd8e097e001fb520f 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
@@ -37,6 +37,12 @@
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
+// Event Incident to get EventInfo
+#include "GaudiKernel/IIncidentSvc.h"
+#include "EventInfo/EventInfo.h"
+#include "EventInfo/EventID.h"
+#include "EventInfo/EventIncident.h"
+
// Initialize method for all tools
// Retrieval of all Tools to be used during run
StatusCode TrigDataAccessATLFAST::initialize()
@@ -609,16 +615,14 @@ StatusCode TrigDataAccessATLFAST::LoadFullCollections (
// handle events (beginEvent only) to prepare containers
void TrigDataAccessATLFAST::handle(const Incident & inc ) {
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(!eventInc) {
- std::cout << " Unable to get EventInfo from either EventStore or BeginRun incident" << std::endl;
- return;
- }
- else {
- const EventInfo* evt;
- evt = &eventInc->eventInfo();
- m_larcell->eventNumber(evt->event_ID()->event_number());
- }
+ const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
+ if(!eventInc) {
+ ATH_MSG_ERROR(" Unable to get EventInfo from either EventStore or BeginRun incident");
+ return;
+ }
+ else {
+ m_larcell->eventNumber(inc.context().eventID().event_number());
+ }
}
template<class T>
diff --git a/Trigger/TrigFTK/FTK_DataProviderSvc/CMakeLists.txt b/Trigger/TrigFTK/FTK_DataProviderSvc/CMakeLists.txt
index d70894825a1f2bf74555457705b41b4015a300d5..7c9e6800cee25479db10132e7fc544f8709a3d39 100644
--- a/Trigger/TrigFTK/FTK_DataProviderSvc/CMakeLists.txt
+++ b/Trigger/TrigFTK/FTK_DataProviderSvc/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
Event/xAOD/xAODTracking
# Event/xAOD/xAODViews
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/PixelConditionsData
InnerDetector/InDetRecEvent/InDetPrepRawData
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
diff --git a/Trigger/TrigFTK/FTK_DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.h b/Trigger/TrigFTK/FTK_DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.h
index 67c6383f44cf13e275728cab17e69a943c59a6b9..370216fbdaa272057547b694703b07a2ec96e4eb 100644
--- a/Trigger/TrigFTK/FTK_DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.h
+++ b/Trigger/TrigFTK/FTK_DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.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 FTK_DATAPROVIDERSVC_H
@@ -31,7 +31,7 @@
#include "xAODTracking/TrackParticleContainer.h"
#include "FTK_DataProviderInterfaces/IFTK_UncertaintyTool.h"
#include "FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "PixelConditionsData/PixelOfflineCalibData.h"
#include <mutex>
diff --git a/Trigger/TrigFTK/FTK_RecTools/CMakeLists.txt b/Trigger/TrigFTK/FTK_RecTools/CMakeLists.txt
index ba5a2caca446deb1f4a41cc412e3f534048decb6..8e9aada1de79b0a9a57c241422632b3f8e6b5363 100644
--- a/Trigger/TrigFTK/FTK_RecTools/CMakeLists.txt
+++ b/Trigger/TrigFTK/FTK_RecTools/CMakeLists.txt
@@ -20,6 +20,7 @@ atlas_depends_on_subdirs( PUBLIC
Trigger/TrigFTK/FTK_RecToolInterfaces
Trigger/TrigFTK/TrigFTK_RawData
Trigger/TrigFTK/TrigFTKSim
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetDetDescr/SCT_ModuleDistortions
InnerDetector/InDetRecEvent/InDetPrepRawData
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
@@ -50,12 +51,12 @@ atlas_add_library( FTK_RecToolsLib
PUBLIC_HEADERS FTK_RecTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GeoPrimitives xAODTracking TrkTrack VxVertex FTK_DataProviderInterfaces TrigFTK_RawData TrkVxEdmCnvLib TrigFTKSimLib InDetPrepRawData InDetRIO_OnTrack TrkParameters TrkToolInterfaces TrkAmbiguityProcessorLib StoreGateLib SGtests EventPrimitives InDetIdentifier InDetReadoutGeometry SiClusterizationToolLib TrkSurfaces PixelConditionsData)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GeoPrimitives xAODTracking TrkTrack VxVertex FTK_DataProviderInterfaces TrigFTK_RawData TrkVxEdmCnvLib TrigFTKSimLib InDetCondTools InDetPrepRawData InDetRIO_OnTrack TrkParameters TrkToolInterfaces TrkAmbiguityProcessorLib StoreGateLib SGtests EventPrimitives InDetIdentifier InDetReadoutGeometry SiClusterizationToolLib TrkSurfaces PixelConditionsData)
atlas_add_component( FTK_RecTools
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GeoPrimitives xAODTracking TrkTrack VxVertex TrkVxEdmCnvLib FTK_DataProviderInterfaces TrigFTK_RawData TrigFTKSimLib TrkParameters FTK_RecToolsLib InDetPrepRawData InDetRIO_OnTrack TrkParameters TrkToolInterfaces TrkAmbiguityProcessorLib StoreGateLib SGtests EventPrimitives InDetIdentifier InDetReadoutGeometry SiClusterizationToolLib TrkSurfaces PixelConditionsData)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GeoPrimitives xAODTracking TrkTrack VxVertex TrkVxEdmCnvLib FTK_DataProviderInterfaces TrigFTK_RawData TrigFTKSimLib TrkParameters FTK_RecToolsLib InDetCondTools InDetPrepRawData InDetRIO_OnTrack TrkParameters TrkToolInterfaces TrkAmbiguityProcessorLib StoreGateLib SGtests EventPrimitives InDetIdentifier InDetReadoutGeometry SiClusterizationToolLib TrkSurfaces PixelConditionsData)
diff --git a/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h b/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h
index 8e00b5b73458164775afc5c783f82095a9991232..01458d55c53e6332401b59d8c3a067460a6aca71 100644
--- a/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h
+++ b/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_PixelClusterOnTrackTool.h
@@ -25,7 +25,7 @@
#include "SiClusterizationTool/NnClusterizationFactory.h"
#include "PixelConditionsData/PixelOfflineCalibData.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
class PixelID;
class IModuleDistortionsTool;
diff --git a/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_SCTClusterOnTrackTool.h b/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_SCTClusterOnTrackTool.h
index 8c04327df017b60df3c34915afdfa6ed85ede346..94a7bf895fab601efe447d3a34d91be13d138629 100644
--- a/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_SCTClusterOnTrackTool.h
+++ b/Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_SCTClusterOnTrackTool.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
*/
///////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
#include "TrkParameters/TrackParameters.h"
#include "InDetRIO_OnTrack/SCT_ClusterOnTrack.h"
#include "SCT_ModuleDistortions/ISCT_ModuleDistortionsTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
//namespace InDet {
diff --git a/Trigger/TrigFTK/FastTrackSimWrap/CMakeLists.txt b/Trigger/TrigFTK/FastTrackSimWrap/CMakeLists.txt
index adf6e26fc7670fe77be954e031c1ea0f524dcffe..2dcf38425f223399a5c7fa21306a565006a27e95 100644
--- a/Trigger/TrigFTK/FastTrackSimWrap/CMakeLists.txt
+++ b/Trigger/TrigFTK/FastTrackSimWrap/CMakeLists.txt
@@ -10,6 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Generators/GeneratorObjects
InnerDetector/InDetConditions/InDetConditionsSummaryService
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetRecEvent/InDetPrepRawData
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
@@ -54,13 +55,13 @@ atlas_add_library( FastTrackSimWrapLib
PUBLIC_HEADERS FastTrackSimWrap
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaBaseComps GeneratorObjects InDetIdentifier InDetPrepRawData TrkTrack TrkTruthData TrkToolInterfaces TrigCaloEvent TrigDecisionToolLib TrigFTKSimLib StoreGateLib SGtests SCT_CablingLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaBaseComps GeneratorObjects InDetCondTools InDetIdentifier InDetPrepRawData TrkTrack TrkTruthData TrkToolInterfaces TrigCaloEvent TrigDecisionToolLib TrigFTKSimLib StoreGateLib SGtests SCT_CablingLib
PRIVATE_LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${HEPMC_LIBRARIES} AtlasDetDescr IdDict IdDictDetDescr Identifier EventInfo EventPrimitives GaudiKernel InDetReadoutGeometry InDetRawData InDetSimData TileIdentifier TrkRIO_OnTrack TrkSpacePoint VxVertex TrkFitterInterfaces PixelCablingLib InDetRIO_OnTrack )
atlas_add_component( FastTrackSimWrap
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GeneratorObjects InDetIdentifier InDetPrepRawData TrkTrack TrkTruthData TrkToolInterfaces TrigDecisionToolLib TrigCaloEvent TrigFTKSimLib StoreGateLib SGtests AtlasDetDescr IdDict IdDictDetDescr Identifier EventInfo EventPrimitives GaudiKernel InDetReadoutGeometry SCT_CablingLib InDetRawData InDetSimData TileIdentifier TrkRIO_OnTrack TrkSpacePoint VxVertex FastTrackSimWrapLib TrkFitterInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GeneratorObjects InDetCondTools InDetIdentifier InDetPrepRawData TrkTrack TrkTruthData TrkToolInterfaces TrigDecisionToolLib TrigCaloEvent TrigFTKSimLib StoreGateLib SGtests AtlasDetDescr IdDict IdDictDetDescr Identifier EventInfo EventPrimitives GaudiKernel InDetReadoutGeometry SCT_CablingLib InDetRawData InDetSimData TileIdentifier TrkRIO_OnTrack TrkSpacePoint VxVertex FastTrackSimWrapLib TrkFitterInterfaces )
# Install files from the package:
atlas_install_joboptions( share/*jobOptions*.py )
diff --git a/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.h b/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.h
index 3c03d351d55e0362bd3729b5ad187b84f3577fac..8b68bbbd5d514860d075cda2ca40ae47ddd2bdae 100644
--- a/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.h
+++ b/Trigger/TrigFTK/FastTrackSimWrap/FastTrackSimWrap/DumpSp.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 FASTTRACKSIMWRAP_DUMPSP
@@ -51,7 +51,7 @@
#include "TrkToolInterfaces/ITrackHoleSearchTool.h"
#include "InDetPrepRawData/SiClusterContainer.h"
#include "BeamSpotConditionsData/BeamSpotData.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
class AtlasDetectorID;
class StoreGateSvc;
diff --git a/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.cxx b/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.cxx
index 6101514c1956f85e346430f55744fbcfc1cdfe38..e49b68ecb7bae74f53c4d98421165c0e6222972b 100644
--- a/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.cxx
+++ b/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.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
*/
@@ -92,7 +92,6 @@
#include "TrkToolInterfaces/ITruthToTrack.h"
#include "TrigCaloEvent/TrigT2MbtsBits.h"
#include "TileIdentifier/TileTBID.h"
-#include "InDetConditionsSummaryService/IInDetConditionsSvc.h"
#include "VxVertex/VxContainer.h"
//#include "TrkTruthToTrack/TruthToTrack.h"
#include "TrkToolInterfaces/ITruthToTrack.h"
diff --git a/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt b/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt
index b63a72c308234a8f20dbce3346c9a671ec6c4a37..cb773fe72e6f916227ddb523e7c1815a7f04e041 100644
--- a/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt
+++ b/Trigger/TrigFTK/TrigFTKSim/CMakeLists.txt
@@ -13,6 +13,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
InnerDetector/InDetConditions/BeamSpotConditionsData
InnerDetector/InDetConditions/InDetConditionsSummaryService
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecEvent/InDetPrepRawData
@@ -120,29 +121,29 @@ atlas_add_library( TrigFTKSimLib
PUBLIC_HEADERS TrigFTKSim
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool PileUpToolsLib StoreGateLib SGtests
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps GaudiKernel InDetCondTools InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool PileUpToolsLib StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${HEPMC_LIBRARIES} IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack )
atlas_add_component( TrigFTKSim
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetCondTools InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
atlas_add_executable( trigftk_partitionbalancing
standalone/partitionbalancing.cc
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetCondTools InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
atlas_add_executable( trigftk_efficiency
standalone/efficiency.cc
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetCondTools InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
atlas_add_executable( trigftk_dataflow
standalone/dataflow.cc
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${EIGEN_LIBRARIES} ${HEPMC_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps PileUpToolsLib StoreGateLib SGtests GaudiKernel InDetCondTools InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkParameters TrkParticleBase TrkTrack TrkTruthData TrkExInterfaces TrkToolInterfaces TrigInDetEvent TrigFTKPool IdDictDetDescr EventInfo NavFourMom GeneratorObjects InDetRawData InDetSimData TrkMeasurementBase TrkRIO_OnTrack TrigFTKSimLib )
# Install files from the package:
atlas_install_python_modules( python/__init__.py python/TrigFTKTruthAlgsConfig.py python/QueryFTKdb.py python/findInputs.py python/FTKSimOptions.py )
diff --git a/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTK_SGHitInput.h b/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTK_SGHitInput.h
index 27d79463d63109f3991ff2711ff917766faf52e2..a81d2078c76b24e3284e32206a64ddf5caac55cb 100644
--- a/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTK_SGHitInput.h
+++ b/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTK_SGHitInput.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 FTK_SGHITINPUT_H
@@ -32,7 +32,7 @@
#include "TrkToolInterfaces/ITrackHoleSearchTool.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkParameters/TrackParameters.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/DataHandle.h"
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataAlgs/CMakeLists.txt b/Trigger/TrigFTK/TrigFTK_RawDataAlgs/CMakeLists.txt
index fedb70caa5628345efdc79854454f260f1d8e89f..f110a1b152e82b6f538b9a4b53809ba11290f52e 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataAlgs/CMakeLists.txt
+++ b/Trigger/TrigFTK/TrigFTK_RawDataAlgs/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/PileUpTools
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
Tools/PyJobTransforms
Tracking/TrkEvent/TrkEventPrimitives
Trigger/TrigFTK/FTK_DataProviderInterfaces
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataAlgs/src/FTK_RDO_MonitorAlgo.h b/Trigger/TrigFTK/TrigFTK_RawDataAlgs/src/FTK_RDO_MonitorAlgo.h
index 1f92ae841d0673feca4a0b21081a6fe39cb299a7..283171d162621e2701958dfdbf07147c1db8f317 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataAlgs/src/FTK_RDO_MonitorAlgo.h
+++ b/Trigger/TrigFTK/TrigFTK_RawDataAlgs/src/FTK_RDO_MonitorAlgo.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 FTK_RDO_MonitorAlgo_h
@@ -13,7 +13,7 @@
#include "TrkTrack/TrackCollection.h" //
#include "InDetPrepRawData/SiClusterContainer.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "FTK_DataProviderInterfaces/IFTK_DataProviderSvc.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
index 0751673fe563b834bcbe2c377b1022b4d0ca6178..832779de72690a4d541d121aeb34f2de980bcff2 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
@@ -116,7 +116,7 @@ def _MultTool(name):
def TrigL2CaloHypoToolFromDict( d ):
""" Use menu decoded chain dictionary to configure the tool """
- cparts = d['chainParts'][0]
+ cparts = [i for i in d['chainParts'] if ((i['signature'] is 'Electron') or (i['signature'] is 'Photon'))]
def __mult(cpart):
return int( cpart['multiplicity'] )
@@ -131,15 +131,15 @@ def TrigL2CaloHypoToolFromDict( d ):
# do we need to configure high multiplicity selection, either NeX or ex_ey_ez etc...?
- if len(d['chainParts']) > 1 or __mult(d['chainParts'][0]) > 1:
+ if len(cparts) > 1 or __mult(cparts[0]) > 1:
tool = _MultTool(name)
- for cpart in d['chainParts']:
+ for cpart in cparts:
for cutNumber in range( __mult( cpart ) ):
tool.SubTools += [ _IncTool( cpart['chainPartName']+"_"+str(cutNumber), __th( cpart ), __sel( cpart) ) ]
return tool
else:
- return _IncTool( name, __th( d['chainParts'][0]), __sel( d['chainParts'][0] ) )
+ return _IncTool( name, __th( cparts[0]), __sel( cparts[0] ) )
def TrigL2CaloHypoToolFromName( name, conf ):
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py
index 91a1460d483cf3158af90793c11a1c6c5e785f8c..c5713d3fb6a0d7a319d4103098ad508f1b9ec09c 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py
@@ -2,8 +2,8 @@
def TrigL2ElectronHypoToolFromDict( chainDict ):
""" Use menu decoded chain dictionary to configure the tool """
-
- thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in chainDict['chainParts']], [])
+ cparts = [i for i in chainDict['chainParts'] if i['signature'] is 'Electron']
+ thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in cparts], [])
name = chainDict['chainName']
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py b/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
index f41f16c9f73c62912b329b624de67d6f5e8be2aa..3ae64032f6ba5673b90a3768cc0f5327adbd76e4 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
@@ -397,7 +397,8 @@ def addMonitoring(tool, monClass, name, thresholdHLT ):
def getThresholdsFromDict( chainDict ):
- return sum( [ [part['threshold']]*int(part['multiplicity']) for part in chainDict['chainParts']], [])
+ cparts = [i for i in chainDict['chainParts'] if i['signature'] is 'Muon']
+ return sum( [ [part['threshold']]*int(part['multiplicity']) for part in cparts ], [])
def TrigMufastHypoToolFromDict( chainDict ):
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
index ec05b8716163933da48f188a83012897ed684a85..0f494301ab177bd38385c5149e40c1205a418780 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
@@ -23,6 +23,7 @@ monitoring_bphys = [
'HLT_2mu6_bBmumux_BsmumuPhi_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
'HLT_mu6_bJpsi_Trkloose',
'HLT_mu4_mu4_idperf_bJpsimumu_noid',
+ 'HLT_2mu4_bBmumuxv2_Ftk',
]
@@ -36,6 +37,7 @@ primary_bphys = [
'HLT_mu11_mu6_bTau',
'HLT_2mu6_bDimu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
'HLT_mu11_mu6_bDimu_novtx_noos',
+ 'HLT_2mu4_bBmumuxv2_Ftk',
]
primary_bphys_pp = primary_bphys
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
index aed17ff8c18bc200db23c3266350e6ba5219fe27..62e730504e497ca4c878871abfbb743148c71be1 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
@@ -24,7 +24,8 @@ DetailedChains = {
"BMuMuX" : 'HLT_(2mu[0-9]+|mu[0-9]+_?mu[0-9]+)_bBmumuxv[23]',
"MultiMu": 'HLT_((mu[0-9]+_[2-9]mu[0-9]+)|(3mu[0-9]+))_(b.*)',
"MuTrack": 'HLT_(mu[0-9]+)_(b.*)_Trk(.*)',
- "Tau3mu" : 'HLT_([2-3]?mu[0-9]+).*_bTau.*'
+ "Tau3mu" : 'HLT_([2-3]?mu[0-9]+).*_bTau.*',
+ "FTK" : 'HLT_(2mu[0-9]+)_bBmumuxv2_Ftk'
}
DetailedL1TopoChains = {
"L1BPH-M-DR-low" : "HLT_2mu6_bJpsimumu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6",
diff --git a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt
index 8ed4dd5efb61d88271c10241385f37bc22efd5bc..739f95147a9c24e71ac86d198eeac8060d78cb7f 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt
@@ -24,8 +24,9 @@ atlas_depends_on_subdirs( PUBLIC
Trigger/TrigSteer/DecisionHandling
Control/AthenaMonitoring
Trigger/TrigMonitoring/TrigCostMonitorMT
+ Trigger/TrigAlgorithms/TrigPartialEventBuilding
)
-find_package( tdaq-common )
+find_package( tdaq-common COMPONENTS eformat )
find_package( Boost )
# Component(s) in the package:
@@ -34,7 +35,7 @@ atlas_add_library( TrigOutputHandlingLib
PUBLIC_HEADERS TrigOutputHandling
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthViews AthenaBaseComps TrigSteeringEvent TrigSerializeResultLib
- xAODTrigCalo xAODTrigEgamma xAODTrigger xAODTracking xAODTrigMuon xAODMuon DecisionHandlingLib AthenaMonitoringLib )
+ xAODTrigCalo xAODTrigEgamma xAODTrigger xAODTracking xAODTrigMuon xAODMuon DecisionHandlingLib AthenaMonitoringLib TrigPartialEventBuildingLib )
atlas_add_component( TrigOutputHandling
src/components/*.cxx
diff --git a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMakerTool.h b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMakerTool.h
index b6c498b48ceee24300bcbde5172fe5d049ff74b2..b98b34d85979fc6251695b27a348d358b532920d 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMakerTool.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMakerTool.h
@@ -8,15 +8,15 @@
#include "TrigSteeringEvent/HLTResultMT.h"
/**
* @class HLTResultMTMakerTool
- * @brief
+ * @brief Base class for AlgTools filling information in an HLTResultMT object
**/
class HLTResultMTMakerTool : virtual public IAlgTool {
public:
DeclareInterfaceID(HLTResultMTMakerTool, 1, 0);
- virtual StatusCode fill( HLT::HLTResultMT& resultToFill ) const = 0;
+ virtual StatusCode fill( HLT::HLTResultMT& resultToFill ) const = 0; //TODO: pass EventContext& explicitly as argument
virtual ~HLTResultMTMakerTool() override {}
};
-#endif // TRIGOUTPUTHANDLING_HLRESULTMTMAKERTOOL_H
+#endif // TRIGOUTPUTHANDLING_HLTRESULTMTMAKERTOOL_H
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx
index b4f4c09a9a5db7dcd4d86086294f202172c1b347..8392266ef7842063bc4e4d41a8ecd403722d6ee9 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx
@@ -51,6 +51,8 @@ StatusCode HLTResultMTMaker::makeResult(const EventContext& eventContext) const
}
time.stop();
+ ATH_MSG_DEBUG(*hltResult);
+
// Fill monitoring histograms
auto nstreams = Monitored::Scalar("nstreams", hltResult->getStreamTags().size());
auto bitWords = Monitored::Scalar("bitWords", hltResult->getHltBits().size());
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx
index bc271753d7c86095c768399b83a3464dbb680912..760bbce003027c2563526961121a8e1567867a8e 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx
@@ -1,37 +1,48 @@
/*
- 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 "DecisionHandling/HLTIdentifier.h"
#include "StreamTagMakerTool.h"
+#include "eformat/StreamTag.h"
+
+using namespace TrigCompositeUtils;
+
+// =============================================================================
StreamTagMakerTool::StreamTagMakerTool( const std::string& type, const std::string& name, const IInterface* parent ):
base_class( type, name, parent ) {}
+// =============================================================================
+
StreamTagMakerTool::~StreamTagMakerTool() {}
+// =============================================================================
+
StatusCode StreamTagMakerTool::initialize() {
+ renounceArray( m_pebDecisionKeys );
+ ATH_CHECK( m_pebDecisionKeys.initialize() );
ATH_CHECK( m_finalChainDecisions.initialize() );
- // decode mapping - temporary solution for testing
- for ( auto& chainAndStream: m_chainToStreamProperty ) {
- struct { std::string chain, stream; } conf { chainAndStream.first, chainAndStream.second };
- ATH_MSG_DEBUG( "Chain " << conf.chain << " accepts events to stream " << conf.stream );
- // find subdets
- std::set<eformat::SubDetector> dets;
- const auto itSubDetMap = m_streamSubDets.value().find(conf.stream);
- if (itSubDetMap != m_streamSubDets.value().cend()) {
- for (const uint32_t detid : itSubDetMap->second)
- dets.insert(static_cast<eformat::SubDetector>(detid & 0xFF)); // cast from uint32_t
- }
- // find robs
- std::set<uint32_t> robs;
- const auto itRobsMap = m_streamRobs.value().find(conf.stream);
- if (itRobsMap != m_streamRobs.value().cend()) {
- for (const uint32_t robid : itRobsMap->second)
- robs.insert(robid);
+ // Transform string->vector<string> map from the ChainToStream property into id->StreamTagInfo map
+#if __cplusplus >= 201500L // C++17 needed for structured binding
+ for (const auto& [chainName, streamTagInfoAsStringVec] : m_chainToStreamProperty) {
+#else // standard older than C++17 - remove when ATLAS moves to C++17 with gcc8
+ for (const auto& chainAndStream: m_chainToStreamProperty) {
+ const std::string& chainName = chainAndStream.first;
+ const std::vector<std::string>& streamTagInfoAsStringVec = chainAndStream.second;
+#endif
+ if (streamTagInfoAsStringVec.size()!=4) {
+ ATH_MSG_ERROR("Invalid StreamTagInfo object, expected 4 elements {name,type,obeysLumiBlock,forceFullEventBuilding}, but received"
+ << streamTagInfoAsStringVec.size() << " elements for chain " << chainName);
+ return StatusCode::FAILURE;
}
- // create the stream tag
- m_mapping[ HLT::Identifier( conf.chain ) ] = eformat::helper::StreamTag( conf.stream, "physics", true, robs, dets );
+ StreamTagInfo streamTagInfo = {
+ streamTagInfoAsStringVec[0],
+ streamTagInfoAsStringVec[1],
+ (streamTagInfoAsStringVec[2] == "True" || streamTagInfoAsStringVec[2] == "true"),
+ (streamTagInfoAsStringVec[3] == "True" || streamTagInfoAsStringVec[3] == "true")
+ };
+ ATH_MSG_DEBUG( "Chain " << chainName << " accepts events to stream " << std::get<1>(streamTagInfo) << "_" << std::get<0>(streamTagInfo) );
+ m_mapping[ HLT::Identifier( chainName ) ] = streamTagInfo;
}
return StatusCode::SUCCESS;
@@ -41,6 +52,7 @@ StatusCode StreamTagMakerTool::finalize() {
return StatusCode::SUCCESS;
}
+// =============================================================================
StatusCode StreamTagMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
// obtain chain decisions,
@@ -62,12 +74,15 @@ StatusCode StreamTagMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
return StatusCode::FAILURE;
}
+ std::unordered_map<unsigned int, PEBInfoWriterToolBase::PEBInfo> chainToPEBInfo;
+ ATH_CHECK(fillPEBInfoMap(chainToPEBInfo));
+
// for each accepted chain lookup the map of chainID -> ST
for ( DecisionID chain: decisionIDs( passRawChains ) ) {
// Note: The default is to NOT allow rerun chains to add a stream tag
if (!m_allowRerunChains) {
- const auto iterator = std::find(decisionIDs(rerunChains).begin(), decisionIDs(rerunChains).end(), chain);
+ const auto iterator = std::find(decisionIDs(rerunChains).begin(), decisionIDs(rerunChains).end(), chain);
if ( iterator != decisionIDs(rerunChains).end() ) {
// This chain has entries in both the passedRaw and rerun sets. As we are not allowing rerun chains, we skip this one.
continue;
@@ -80,9 +95,78 @@ StatusCode StreamTagMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
ATH_MSG_ERROR("Each chain has to have stream associated whereas the " << HLT::Identifier( chain ) << " does not" );
return StatusCode::FAILURE;
}
- resultToFill.addStreamTag( mappingIter->second ); // TODO assume multiple streams per chain
+
+ #if __cplusplus >= 201500L // C++17 needed for structured binding
+ auto [st_name, st_type, obeysLB, forceFullEvent] = mappingIter->second;
+ #else // standard older than C++17 - remove when ATLAS moves to C++17 with gcc8
+ std::string st_type;
+ std::string st_name;
+ bool obeysLB;
+ bool forceFullEvent;
+ std::tie(st_name, st_type, obeysLB, forceFullEvent) = mappingIter->second;
+ #endif
+
+ std::set<uint32_t> robs;
+ std::set<eformat::SubDetector> subdets;
+ if (!forceFullEvent) {
+ auto it = chainToPEBInfo.find(chain);
+ if (it != chainToPEBInfo.end()) {
+ ATH_MSG_DEBUG("Chain " << HLT::Identifier( chain ) << " adds PEBInfo " << it->second << " to stream " << st_type << "_" << st_name);
+ // Copy ROB IDs directly
+ robs = it->second.robs;
+ // Convert SubDet IDs from uint32_t to eformat::SubDetector aka uint8_t
+ for (const uint32_t subdetid : it->second.subdets) {
+ subdets.insert(static_cast<eformat::SubDetector>( subdetid & 0xFF ));
+ }
+ }
+ }
+
+ eformat::helper::StreamTag streamTag(st_name, st_type, obeysLB, robs, subdets);
+ resultToFill.addStreamTag(streamTag); // TODO assume multiple streams per chain?
}
ATH_MSG_DEBUG("Number of streams for event " << resultToFill.getStreamTags().size() );
return StatusCode::SUCCESS;
}
+
+// =============================================================================
+
+StatusCode StreamTagMakerTool::fillPEBInfoMap(std::unordered_map<DecisionID, PEBInfoWriterToolBase::PEBInfo>& map) const {
+ for (const auto& key: m_pebDecisionKeys) {
+ // Retrieve the decision container
+ auto handle = SG::makeHandle(key); //TODO: pass EventContext& explicitly here
+ if (not handle.isValid()) {
+ ATH_MSG_DEBUG("Missing input " << key.key() << " likely rejected");
+ continue;
+ }
+ ATH_MSG_DEBUG("Processing decision container " << key.key());
+ // Loop over decisions
+ for (const Decision* d : *handle) {
+ ATH_MSG_DEBUG("Processing decision " << *d);
+ std::vector<uint32_t> robs;
+ std::vector<uint32_t> subdets;
+ if (d->getDetail(PEBInfoWriterToolBase::robListKey(), robs)) {
+ ATH_MSG_DEBUG("Retrieved a list of " << robs.size() << " ROBs for this decision");
+ }
+ else {
+ ATH_MSG_DEBUG("Failed to retrieve " << PEBInfoWriterToolBase::robListKey() << " for this decision");
+ }
+ if (d->getDetail(PEBInfoWriterToolBase::subDetListKey(), subdets)) {
+ ATH_MSG_DEBUG("Retrieved a list of " << subdets.size() << " SubDets for this decision");
+ }
+ else {
+ ATH_MSG_DEBUG("Failed to retrieve " << PEBInfoWriterToolBase::subDetListKey() << " for this decision");
+ }
+ DecisionIDContainer ids;
+ decisionIDs(d,ids);
+ /// Assign PEBInfo to all passed chains for this decision
+ for (unsigned int id : ids) {
+ ATH_MSG_DEBUG("Mapping PEBInfo to passed chain " << HLT::Identifier(id).name());
+ PEBInfoWriterToolBase::PEBInfo& pebi = map[id];
+ pebi.robs.insert(robs.begin(),robs.end());
+ pebi.subdets.insert(subdets.begin(),subdets.end());
+ }
+ } // Loop over decisions
+ } // Loop over decision containers
+ return StatusCode::SUCCESS;
+}
\ No newline at end of file
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.h b/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.h
index b4be32d2a0aeb5788cb088aa1a6fcffff4ce2be3..05b33237821fdf965b260ce697d8550a75626ec0 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.h
@@ -1,20 +1,28 @@
/*
- 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 TRIGOUTPUTHANDLING_STREAMTAGMAKERTOOL_H
#define TRIGOUTPUTHANDLING_STREAMTAGMAKERTOOL_H
+// Trigger includes
+#include "DecisionHandling/TrigCompositeUtils.h"
+#include "TrigOutputHandling/HLTResultMTMakerTool.h"
+#include "TrigPartialEventBuilding/PEBInfoWriterToolBase.h" // Defines PEBInfo and keys to retrieve it
+
+// Athena includes
+#include "AthenaBaseComps/AthAlgTool.h"
+
+// Gaudi includes
+#include "Gaudi/Parsers/Factory.h" // Needed to declare less common Property types
+// System includes
#include <string>
#include <map>
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "TrigOutputHandling/HLTResultMTMakerTool.h"
-#include "DecisionHandling/TrigCompositeUtils.h"
-#include "Gaudi/Parsers/Factory.h" // needed to declare less common Property types
-#include "eformat/StreamTag.h"
+#include <unordered_map>
+#include <tuple>
/**
- * @class StreamTagMakerTool
+ * @class StreamTagMakerTool
* @brief makes stream tags out of chain decisions
**/
class StreamTagMakerTool : public extends<AthAlgTool, HLTResultMTMakerTool> {
@@ -27,24 +35,34 @@ public:
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
+ /// Type describing StreamTag information needed by the tool: {name, type, obeysLumiBlock, forceFullEventBuilding}
+ typedef std::tuple<std::string, std::string, bool, bool> StreamTagInfo;
+
private:
- SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalChainDecisions { this, "ChainDecisions", "HLTSummary",
- "Container with final chain decisions" };
+ SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalChainDecisions { this, "ChainDecisions", "HLTSummary",
+ "Container with final chain decisions" };
- Gaudi::Property<bool> m_allowRerunChains { this, "AllowRerunChains", false,
- "Normally false, but if set to true this will allow resurrected chains which ran in the second pass to also add stream tags"};
+ SG::ReadHandleKeyArray<TrigCompositeUtils::DecisionContainer> m_pebDecisionKeys{ this, "PEBDecisionKeys", {},
+ "Decisions including PEBInfo" };
- Gaudi::Property<std::map<std::string, std::string>> m_chainToStreamProperty { this, "ChainToStream", {},
- "Mapping from the chain name to string name (temporary solution, will be replaced)"};
+ Gaudi::Property<bool> m_allowRerunChains { this, "AllowRerunChains", false,
+ "Normally false, but if set to true this will allow resurrected chains which ran in the second pass to also add stream tags"};
- Gaudi::Property<std::map<std::string, std::vector<uint32_t>>> m_streamSubDets { this, "StreamSubDets", {},
- "Mapping from the stream name to subdetector IDs (temporary solution, will be replaced)"};
+ /// Gaudi does not support map<string,tuple<T>> as Property, so we use vector<string> to describe tuple<T>
+ Gaudi::Property<std::map<std::string, std::vector<std::string>>> m_chainToStreamProperty { this, "ChainToStream", {},
+ "Mapping from the chain name to StreamTagInfo"};
- Gaudi::Property<std::map<std::string, std::vector<uint32_t>>> m_streamRobs { this, "StreamRobs", {},
- "Mapping from the stream name to ROB IDs (temporary solution, will be replaced)"};
+ /// Chain ID to StreamTagInfo map filled from the ChainToStream property in initialize()
+ std::map<TrigCompositeUtils::DecisionID, StreamTagInfo> m_mapping;
- typedef std::map< TrigCompositeUtils::DecisionID, eformat::helper::StreamTag> ChainToStreamMap;
- ChainToStreamMap m_mapping;
+ /// Helper method to fill the chainID->PEBInfo map
+ StatusCode fillPEBInfoMap(std::unordered_map<TrigCompositeUtils::DecisionID, PEBInfoWriterToolBase::PEBInfo>& map) const;
};
+/// operator<< for StreamTagInfo
+std::ostream& operator<< (std::ostream& str, const StreamTagMakerTool::StreamTagInfo& info) {
+ str << "[" << std::get<0>(info) << ", " << std::get<1>(info) << ", " << std::get<2>(info) << ", " << std::get<3>(info) << "]";
+ return str;
+}
+
#endif // TRIGOUTPUTHANDLING_STREAMTAGMAKERTOOL_H
diff --git a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
index 0f21726b396124949f3ce51c8488cde6d03e9178..b255ce45165cba300676a9455eb9e1e17b22989b 100755
--- a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
@@ -110,16 +110,14 @@ StatusCode HLT::RandomScaler::initialize()
void HLT::RandomScaler::handle(const Incident& inc)
{
if (inc.type()==IncidentType::BeginEvent) {
- const EventInfo* event(0);
const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if (eventInc) event = &eventInc->eventInfo();
- else {
- msg() << MSG::ERROR << "Cannot retrieve EventInfo object from BeginEvent incident." << endmsg;
+ if (!eventInc) {
+ msg() << MSG::ERROR << "Cannot cast BeginEvent incident to EventIncident." << endmsg;
return;
}
-
- m_seedInput[SEED_SEC] = event->event_ID()->time_stamp();
- m_seedInput[SEED_NSEC] = event->event_ID()->time_stamp_ns_offset();
+ EventContext context = inc.context();
+ m_seedInput[SEED_SEC] = context.eventID().time_stamp();
+ m_seedInput[SEED_NSEC] = context.eventID().time_stamp_ns_offset();
/* Generate hash-based seed from event quantities.
* Ranlux64 only supports signed 32bit seeds ('long' on i686)
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
index 7579532c82415debaea1c7d0added8231b0eab12..c4db617c014e17438bcdd4f59e007f737282d1cd 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
@@ -216,17 +216,15 @@ StatusCode TrigT1CaloDataAccess::loadCollection(
}
void TrigT1CaloDataAccess::handle(const Incident & inc ) {
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(!eventInc) {
- std::cout << " Unable to get EventInfo from either EventStore or BeginRun incident" << std::endl;
- return;
- }
- else {
- const EventInfo* evt;
- evt = &eventInc->eventInfo();
- m_present_event = (evt->event_ID()->event_number());
- m_ppmBSConverter->eventNumber(m_present_event);
- }
+ const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
+ if(!eventInc) {
+ msg(MSG::ERROR) << " Unable to cast " << inc.type() << " to EventIncident" << endmsg;
+ return;
+ }
+ else {
+ m_present_event = inc.context().eventID().event_number();
+ m_ppmBSConverter->eventNumber(m_present_event);
+ }
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h
index c95f582d2ef40065b1b45925f559c639858d1f09..306b1c057f4db004c046221301987ee90126d9ed 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h
@@ -18,8 +18,6 @@
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/Incident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
#include "EventInfo/EventIncident.h"
class IInterface;
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
index 9298d606bfca8c3dc0363acd204777e028e1598a..976bc0ea5b7904412b275c542a7ec831fb56da05 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
@@ -25,9 +25,6 @@
#include "TileConditions/TileInfo.h"
#include "LumiBlockComps/ILumiBlockMuTool.h"
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventType.h"
#include "xAODEventInfo/EventInfo.h"
//For getting TriggerTowers from BS
@@ -268,11 +265,12 @@ namespace LVL1 {
ATH_MSG_DEBUG("Tile TTL1 pedestal value = " << m_TileTTL1Ped);
// try to determine wheter we run on data or on simulation
- auto ei = dynamic_cast<const EventIncident*>(&inc);
- if(!ei) {
+ const xAOD::EventInfo* evtinfo{nullptr};
+ if(evtStore()->retrieve(evtinfo)!=StatusCode::SUCCESS) {
ATH_MSG_WARNING("Could not determine if input file is data or simulation. Will assume simulation.");
- } else {
- bool isData = !(ei->eventInfo().event_type()->test(EventType::IS_SIMULATION));
+ }
+ else {
+ bool isData = !(evtinfo->eventTypeBitmask()&xAOD::EventInfo::IS_SIMULATION);
m_isDataReprocessing = isData;
if(m_isDataReprocessing) {
ATH_MSG_INFO("Detected data reprocessing. Will take pedestal correction values from input trigger towers.");
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
index 34ecf384196057d55c9206f46b4630d24e5f115a..8d85eec81fbc66b87d1d5580b78e4f7157a1f8c6 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
@@ -26,9 +26,6 @@
#include "TileConditions/TileInfo.h"
#include "LumiBlockComps/ILumiBlockMuTool.h"
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventType.h"
#include "xAODEventInfo/EventInfo.h"
//For getting TriggerTowers from BS
@@ -280,29 +277,17 @@ namespace LVL1 {
ATH_MSG_DEBUG("Tile TTL1 pedestal value = " << m_TileTTL1Ped);
// try to determine wheter we run on data or on simulation
- auto ei = dynamic_cast<const EventIncident*>(&inc);
- if(!ei) {
+ const xAOD::EventInfo* evtinfo{nullptr};
+ if(evtStore()->retrieve(evtinfo)!=StatusCode::SUCCESS) {
ATH_MSG_WARNING("Could not determine if input file is data or simulation. Will assume simulation.");
- } else {
- const EventType *eventType = ei->eventInfo().event_type();
-
- if (eventType == nullptr){
- SG::ReadHandle<EventInfo> eventInfo(m_evtKey);
- if (eventInfo.isValid()) {
- eventType = eventInfo->event_type();
- }
- }
-
- if (eventType == nullptr) {
- ATH_MSG_WARNING("Could not determine if input file is data or simulation. Will assume simulation.");
+ }
+ else {
+ bool isData = !(evtinfo->eventTypeBitmask()&xAOD::EventInfo::IS_SIMULATION);
+ m_isDataReprocessing = isData;
+ if(m_isDataReprocessing) {
+ ATH_MSG_INFO("Detected data reprocessing. Will take pedestal correction values from input trigger towers.");
} else {
- bool isData = !eventType->test(EventType::IS_SIMULATION);
- m_isDataReprocessing = isData;
- if(m_isDataReprocessing) {
- ATH_MSG_INFO("Detected data reprocessing. Will take pedestal correction values from input trigger towers.");
- } else {
- ATH_MSG_VERBOSE("No data reprocessing - running normal simulation.");
- }
+ ATH_MSG_VERBOSE("No data reprocessing - running normal simulation.");
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index 16cf890421a8070addbee79e6b9419db0574071c..1aa2b23b44e4b0bc3700335706a218dc65106749 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -13,7 +13,6 @@
#include "CaloIdentifier/CaloLVL1_ID.h"
#include "CaloTriggerTool/CaloTriggerTowerService.h"
-#include "EventInfo/EventIncident.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "EventInfo/EventType.h"
diff --git a/Trigger/TrigTools/TrigFTKTrackConverter/CMakeLists.txt b/Trigger/TrigTools/TrigFTKTrackConverter/CMakeLists.txt
index 5088367e987ec13fd2e355d98a0d2d3279a475e3..e4fb38aefde7559deb506b72685c2afd1b5482e3 100644
--- a/Trigger/TrigTools/TrigFTKTrackConverter/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigFTKTrackConverter/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( TrigFTKTrackConverter )
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
GaudiKernel
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/PixelConditionsData
InnerDetector/InDetConditions/PixelConditionsServices
Tracking/TrkFitter/TrkFitterInterfaces
diff --git a/Trigger/TrigTools/TrigFTKTrackConverter/TrigFTKTrackConverter/TrigFTKClusterConverterTool.h b/Trigger/TrigTools/TrigFTKTrackConverter/TrigFTKTrackConverter/TrigFTKClusterConverterTool.h
index 90ca00657d758e4fe1741ee8dd63c0eb19f02183..a4e505f3f6228caafa08aa4f62478fcf28808352 100644
--- a/Trigger/TrigTools/TrigFTKTrackConverter/TrigFTKTrackConverter/TrigFTKClusterConverterTool.h
+++ b/Trigger/TrigTools/TrigFTKTrackConverter/TrigFTKTrackConverter/TrigFTKClusterConverterTool.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
*/
//implementation
@@ -10,7 +10,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigFTKToolInterfaces/ITrigFTKClusterConverterTool.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "PixelConditionsData/PixelOfflineCalibData.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt b/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
index ff714d3ed6fac49a1a90404782213c639c5ddb40..75fa45c42541429e048d958d54c382fc295b3217 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/Identifier
Event/ByteStreamData
InnerDetector/InDetConditions/InDetByteStreamErrors
- InnerDetector/InDetConditions/InDetCondServices
+ InnerDetector/InDetConditions/InDetCondTools
InnerDetector/InDetConditions/PixelConditionsServices
InnerDetector/InDetConditions/SCT_ConditionsTools
InnerDetector/InDetDetDescr/InDetIdentifier
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastPixelClusterization.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastPixelClusterization.h
index 45cb01897fdd9e8f4b0d86875831d161dae25ba5..c0ca78f28be1ce944953b773b6ab94f57a093029 100755
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastPixelClusterization.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastPixelClusterization.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 PIXELCLUSTERIZATION_H
@@ -10,7 +10,7 @@
#include "InDetPrepRawData/PixelClusterCollection.h"
#include "InDetReadoutGeometry/PixelDetectorManager.h"
#include "Identifier/Identifier.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include <vector>
#include <list>
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_Clusterization.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_Clusterization.h
index 6aebc8a6824558d2676664f7aa547510545b767f..8a7285f7bd14e1d7519033f6aa2dae522eb9059d 100755
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_Clusterization.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_Clusterization.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 SCT_CLUSTERIZATION_H
@@ -8,7 +8,7 @@
#include "InDetIdentifier/SCT_ID.h"
#include "TrkPrepRawData/PrepRawDataCLASS_DEF.h"
#include "Identifier/Identifier.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "InDetPrepRawData/SCT_ClusterCollection.h"
#include <vector>
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_RodDecoder.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_RodDecoder.h
index 4ff24a5d304acf3e9618c07f4af24b2c0f5efd6b..a4142b1ff1838b7d35f83b91ad00c33200efc504 100755
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_RodDecoder.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/FastSCT_RodDecoder.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
*/
@@ -30,7 +30,7 @@
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "StoreGate/ReadCondHandleKey.h"
#include <deque>
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/PixelClusterCacheTool.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/PixelClusterCacheTool.h
index 577cee585408bab24887dcee85bf1d1073680a00..33f030dc473c27747e2ae1d0e9dc0f4bbf464e19 100755
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/PixelClusterCacheTool.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/TrigOnlineSpacePointTool/PixelClusterCacheTool.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 TRIGONLINESPACEPOINTTOOL_PIXELCLUSTERCACHETOOL_H
@@ -18,7 +18,7 @@
#include "PixelConditionsServices/IPixelByteStreamErrorsSvc.h"
#include "SiClusterizationTool/IPixelClusteringTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "InDetCondServices/ISiLorentzAngleTool.h"
+#include "InDetCondTools/ISiLorentzAngleTool.h"
#include <vector>
#include <string>
diff --git a/Trigger/TrigValidation/TrigP1Test/python/BeamSpotUpdate.py b/Trigger/TrigValidation/TrigP1Test/python/BeamSpotUpdate.py
old mode 100644
new mode 100755
index 7ace7c336339ce5fcdfd142deee5072ee102ffec..8837b940f7308d5eaaee3bebc96cb599507423e1
--- a/Trigger/TrigValidation/TrigP1Test/python/BeamSpotUpdate.py
+++ b/Trigger/TrigValidation/TrigP1Test/python/BeamSpotUpdate.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#!/usr/bin/env python
+#
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
"""
athenaMT event modifier to test beamspot update.
@@ -32,13 +34,13 @@ folderList = [] # list of COOL folder updates
def setBeamSpot(run,lb,x,y,z,
status=7,
- dbname='sqlite://;schema=beampos.db;dbname=COMP200',
+ dbname='sqlite://;schema=beampos.db;dbname=CONDBR2',
tag='IndetBeamposOnl-HLT-UPD1-001-00'):
- print '============================= Creating new beamspot in COOL ==================================='
+ print('============================= Creating new beamspot in COOL ===================================')
sys.stdout.flush()
os.system("beamSpotOnl_set.py --rs=%d --ls=%d '%s' '%s' %d %f %f %f" % (run,lb,dbname,tag,status,x,y,z))
- print '==============================================================================================='
+ print('===============================================================================================')
sys.stdout.flush()
@@ -93,3 +95,26 @@ def modify(event):
# Create an open-ended IOV with a default beamspot
# This happens at the very beginning when athenaMT/PT imports this module
setBeamSpot(1,0,0.06,1.06,-4.6,4)
+
+# For standalone running and writing a new output file
+if __name__ == '__main__':
+ import argparse
+ from eformat import EventStorage
+
+ parser = argparse.ArgumentParser(description=__doc__)
+
+ parser.add_argument('file', metavar='FILE', nargs=1, help='input file')
+ args = parser.parse_args()
+ dr = EventStorage.pickDataReader(args.file[0])
+ output = eformat.ostream(core_name = 'test',
+ run_number = dr.runNumber(),
+ trigger_type = dr.triggerType(),
+ detector_mask = dr.detectorMask(),
+ beam_type = dr.beamType(),
+ beam_energy = dr.beamEnergy(),
+ meta_data_strings=dr.freeMetaDataStrings(),
+ compression=dr.compression())
+
+ for event in eformat.istream(args.file[0]):
+ newevt = modify(event)
+ output.write(newevt)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 9acc904b0538731ad38f029633f1e437c7b60d80..96a984e54de5234b53ceede39a402e2849cac4ea 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -180,6 +180,14 @@ atlas_add_test( NewJO
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_NewJO
)
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_pebTest )
+atlas_add_test( pebTest
+ SCRIPT test/test_peb.sh
+ PROPERTIES TIMEOUT 1000
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_pebTest
+ EXTRA_PATTERNS "-s , robs=\[|adds PEBInfo|TriggerSummary.*HLT_"
+ )
+
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_l1sim )
atlas_add_test( l1sim
SCRIPT test/test_l1sim.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
index 692959fdf3e55c3d27b9691cc1c9768b3ed21a2f..3311aff346edc5ea826d0866cbd566d0ec12bdb1 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
@@ -441,17 +441,11 @@ def indetInViewRecoCfg( flags, viewMakerName ):
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
reco = InViewReco( viewMakerName )
algAcc = TrigInDetConfig( flags, roisKey=reco.inputMaker().InViewRoIs )
- # TODO fixeme using getEventAlgs CA method
- # this awkward line will be removed one CA gets appopriate method to get all algorithms
- reco.addRecoAlg( algAcc._sequence.getChildren() )
from AthenaCommon.Constants import DEBUG
for a in algAcc._sequence.getChildren():
a.OutputLevel=DEBUG
-
- from AthenaCommon.AlgSequence import AthSequencer
- algAcc._sequence = AthSequencer('AthAlgSeq') # empty the sequence, we need a better API for that
- reco.merge( algAcc )
-
+
+ reco.mergeReco( algAcc )
return reco
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index a202531b23b2463368f0ab681db256364e95f721..7f5b3e11065df48bdc697591e7203b8286318546 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -355,11 +355,14 @@ serialiser.CollectionsToSerialize = [ "xAOD::TrigCompositeContainer_v1#remap_Ega
"xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.pt.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.e232.wstot" ]
#"xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux." ]
+streamPhysicsMain = ['Main', 'physics', "True", "True"]
+streamPhotonPerf = ['PhotonPerf', 'calibration', "True", "True"] # just made up the name
+
stmaker = StreamTagMakerTool()
stmaker.OutputLevel = DEBUG
stmaker.ChainDecisions = "HLTSummary"
-stmaker.ChainToStream = dict( [(c, "Main") for c in testChains ] )
-stmaker.ChainToStream["HLT_e5_etcut"] = "PhotonPerf" # just made up the name
+stmaker.ChainToStream = dict( [(c, streamPhysicsMain) for c in testChains ] )
+stmaker.ChainToStream["HLT_e5_etcut"] = streamPhotonPerf
bitsmaker = TriggerBitsMakerTool()
bitsmaker.ChainDecisions = "HLTSummary"
bitsmaker.ChainToBit = dict( [ (chain, 10*num) for num,chain in enumerate(testChains) ] )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb1d9680c061eedf0266004511dd756ad6c82944
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
@@ -0,0 +1,179 @@
+#
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+# This file is based on fullMenu.py
+
+# Import flags
+include("TrigUpgradeTest/testHLT_MT.py")
+doElectron = True
+doPhoton = False
+doMuon = True
+doJet = False
+doCombo = False
+
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, MenuSequence
+testChains = []
+
+##################################################################
+# PEB Info Writer step
+##################################################################
+from AthenaCommon.CFElements import seqAND, seqOR
+emptySequence = seqAND("emptySequence")
+
+from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+def pebInputMaker(name):
+ _pebInputMaker = InputMakerForRoI("pebInputMaker_"+name, mergeOutputs=False)
+ _pebInputMaker.RoIs="pebInputRoI_"+name
+ return _pebInputMaker
+
+def pebSequence(inputMaker):
+ return seqAND("pebSequence_"+inputMaker.name(), [inputMaker])
+
+
+from TrigPartialEventBuilding.TrigPartialEventBuildingConf import PEBInfoWriterAlg,StaticPEBInfoWriterTool
+
+def pebInfoWriterToolFromName(name, conf):
+ if "pebtestone" in name:
+ tool = StaticPEBInfoWriterTool(name)
+ tool.ROBList = [0x42002e, 0x420060, 0x420064] # a few example LAr ROBs
+ return tool
+ if "pebtesttwo" in name:
+ tool = StaticPEBInfoWriterTool(name)
+ tool.SubDetList = [0x65, 0x66] # example: RPC side A and C
+ return tool
+ else:
+ return None
+
+def pebInfoWriterSequence(name):
+ """Creates a MenuSequence for PEBInfo writer. The algorithm and tools are given unique names derived from
+ the name parameter. This is required to avoid execution stall from having the same algorithm instance configured
+ in different steps awaiting different inputs."""
+ inputMaker = pebInputMaker(name)
+ return MenuSequence(Sequence = pebSequence(inputMaker),
+ Maker = inputMaker,
+ Hypo = PEBInfoWriterAlg("PEBInfoWriterAlg_"+name),
+ HypoToolGen = pebInfoWriterToolFromName)
+
+##################################################################
+# egamma chains
+##################################################################
+if (doElectron):
+ from TrigUpgradeTest.electronMenuDefs import fastCaloSequence, electronSequence
+ fastCaloStep=fastCaloSequence()
+ electronStep=electronSequence()
+
+ step1=ChainStep("Step1_etcut", [fastCaloStep])
+ step2=ChainStep("Step2_etcut", [electronStep])
+ step3=ChainStep("Step3_pebtestone", [pebInfoWriterSequence("pebtestone")])
+
+ egammaChains = [
+ Chain(name='HLT_e3_etcut_pebtestone', Seed="L1_EM3", ChainSteps=[step1, step2, step3] ),
+ Chain(name='HLT_e5_etcut_pebtestone', Seed="L1_EM3", ChainSteps=[step1, step2, step3] ),
+ Chain(name='HLT_e7_etcut', Seed="L1_EM3", ChainSteps=[step1, step2] )
+ ]
+ testChains += egammaChains
+
+##################################################################
+# muon chains
+##################################################################
+if (doMuon):
+ from TrigUpgradeTest.muMenuDefs import muFastStep
+ muFastStep1 = muFastStep()
+
+ step1mufast=ChainStep("Step1_mufast", [ muFastStep1 ])
+ step2peb=ChainStep("Step2_pebtesttwo", [pebInfoWriterSequence("pebtesttwo")])
+
+ muonChains = [
+ Chain(name='HLT_mu6_pebtesttwo', Seed="L1_MU6", ChainSteps=[step1mufast, step2peb] ),
+ Chain(name='HLT_2mu6', Seed="L1_MU6", ChainSteps=[step1mufast] )
+ ]
+ testChains += muonChains
+
+#################################
+# Configure L1Decoder
+#################################
+
+# this is a temporary hack to include new test chains
+EnabledChainNamesToCTP = dict([ (c.name, c.seed) for c in testChains])
+topSequence.L1DecoderTest.ChainToCTPMapping = EnabledChainNamesToCTP
+
+
+##########################################
+# CF construction
+##########################################
+
+##### Make all HLT #######
+from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import makeHLTTree
+makeHLTTree(testChains)
+
+##########################################
+# Map decisions producing PEBInfo from DecisionSummaryMakerAlg.FinalStepDecisions to StreamTagMakerTool.PEBDecisionKeys
+##########################################
+import AthenaCommon.AlgSequence as acas
+summaryMakerAlg = [s for s in acas.iter_algseq(topSequence) if s.getName() == "DecisionSummaryMakerAlg"][0]
+chainToDecisionKeyDict = summaryMakerAlg.getProperties()['FinalStepDecisions']
+
+pebDecisionKeys = []
+for chain, decisionKey in chainToDecisionKeyDict.iteritems():
+ if 'PEBInfoWriterAlg' in decisionKey:
+ print "Chain ", chain, " produces decision ", decisionKey, " with PEBInfo"
+ pebDecisionKeys.append(decisionKey)
+
+##########################################
+# HLT Result maker
+##########################################
+from TrigOutputHandling.TrigOutputHandlingConf import HLTResultMTMakerAlg, HLTResultMTMaker, StreamTagMakerTool, TriggerBitsMakerTool, TriggerEDMSerialiserTool
+
+serialiser = TriggerEDMSerialiserTool(name="Serialiser", OutputLevel=VERBOSE)
+serialiser.CollectionsToSerialize = [ "xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions",
+ "xAOD::TrigCompositeAuxContainer_v1#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",
+ "xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.pt.eta.phi.rawEnergy.rawEt.rawEta.nCells.energy.et.e237.e277.fracs1.weta2.ehad1.e232.wstot" ]
+
+streamPhysicsMain = ['Main', 'physics', "True", "True"]
+streamCalibPebtestone = ['pebtestone', 'calibration', "True", "False"]
+streamCalibPebtesttwo = ['pebtesttwo', 'calibration', "True", "False"]
+
+stmaker = StreamTagMakerTool()
+stmaker.OutputLevel = DEBUG
+stmaker.ChainDecisions = "HLTSummary"
+stmaker.PEBDecisionKeys = pebDecisionKeys
+stmaker.ChainToStream = dict( [(c.name, streamPhysicsMain) for c in testChains ] )
+stmaker.ChainToStream["HLT_e3_etcut_pebtestone"] = streamCalibPebtestone
+stmaker.ChainToStream["HLT_e5_etcut_pebtestone"] = streamCalibPebtestone
+stmaker.ChainToStream["HLT_mu6_pebtesttwo"] = streamCalibPebtesttwo
+
+bitsmaker = TriggerBitsMakerTool()
+bitsmaker.ChainDecisions = "HLTSummary"
+bitsmaker.ChainToBit = dict( [ (chain.name, 10*num) for num,chain in enumerate(testChains) ] )
+bitsmaker.OutputLevel = DEBUG
+
+hltResultMakerTool = HLTResultMTMaker("MKTool")
+hltResultMakerTool.MakerTools = [ stmaker, bitsmaker, serialiser ]
+hltResultMakerTool.OutputLevel = DEBUG
+
+hltResultMakerAlg = HLTResultMTMakerAlg("HLTRMakerAlg")
+
+from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
+hltResultMakerTool.MonTool = GenericMonitoringTool("MonOfHLTResultMTtest")
+hltResultMakerTool.MonTool.HistPath = "OutputMonitoring"
+hltResultMakerTool.MonTool.Histograms = [ defineHistogram( 'TIME_build', path='EXPERT', type='TH1F', title='Time of result construction in;[micro seccond]',
+ xbins=100, xmin=0, xmax=1000 ),
+ defineHistogram( 'nstreams', path='EXPERT', type='TH1F', title='number of streams',
+ xbins=60, xmin=0, xmax=60 ),
+ defineHistogram( 'nfrags', path='EXPERT', type='TH1F', title='number of HLT results',
+ xbins=10, xmin=0, xmax=10 ),
+ defineHistogram( 'sizeMain', path='EXPERT', type='TH1F', title='Main (physics) HLT Result size;4B words',
+ xbins=100, xmin=-1, xmax=999 ) ] # 1000 k span
+
+hltResultMakerAlg.ResultMaker = hltResultMakerTool
+topSequence.hltTop += hltResultMakerAlg
+
+##########################################
+# Some debug
+##########################################
+from AthenaCommon.AlgSequence import dumpSequence
+dumpSequence(topSequence)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.ref
new file mode 100644
index 0000000000000000000000000000000000000000..8e3df12ae4919d725cf7388e7d487e4fe7f92e9d
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.ref
@@ -0,0 +1,256 @@
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 0 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 0 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 0 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 0 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 0 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 0 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 1 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 1 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 1 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 1 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 2 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 2 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 2 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 2 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 3 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 3 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 3 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 3 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 3 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 3 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 4 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 4 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 4 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 4 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 4 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 4 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 4 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 4 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 4 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 4 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 4 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 4 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 4 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryStep2 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 5 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 5 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 5 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 5 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 5 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryFinal 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 5 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 5 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 5 0 DEBUG Chain HLT_mu6_pebtesttwo ID#1084648233 adds PEBInfo ROBs = [], SubDets = [0x65, 0x66] to stream calibration_pebtesttwo
+HLTRMakerAlg.MKTool.StreamTagMakerTool 5 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 5 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {pebtesttwo, calibration, obeysLB=1, robs=[], dets = [0x65 0x66 ]}
+ {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 6 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 6 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 6 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryFinal 6 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 6 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 6 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 6 0 DEBUG Chain HLT_mu6_pebtesttwo ID#1084648233 adds PEBInfo ROBs = [], SubDets = [0x65, 0x66] to stream calibration_pebtesttwo
+HLTRMakerAlg.MKTool.StreamTagMakerTool 6 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 6 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {pebtesttwo, calibration, obeysLB=1, robs=[], dets = [0x65 0x66 ]}
+ {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 7 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 7 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 7 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 7 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 7 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 7 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 7 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 7 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 7 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 8 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 8 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 8 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 8 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 8 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 8 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 8 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 8 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 8 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 8 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 10 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 10 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 10 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 10 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 10 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 10 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 11 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 11 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 11 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 11 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 11 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 11 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 11 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 11 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 11 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 12 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 12 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 12 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 12 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 12 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 12 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 13 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 13 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 13 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 13 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 13 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 13 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 13 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 13 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 13 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 13 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 13 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 13 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 13 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 14 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 14 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 14 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 14 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 14 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 14 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 14 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 14 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+TriggerSummaryFinal 15 0 DEBUG +++ HLT_mu6_pebtesttwo ID#1084648233
+HLTRMakerAlg.MKTool.StreamTagMakerTool 15 0 DEBUG Chain HLT_mu6_pebtesttwo ID#1084648233 adds PEBInfo ROBs = [], SubDets = [0x65, 0x66] to stream calibration_pebtesttwo
+--> Stream tags = {pebtesttwo, calibration, obeysLB=1, robs=[], dets = [0x65 0x66 ]}
+TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 16 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 16 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 16 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 16 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 17 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 17 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 17 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 17 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 17 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 17 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 17 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 17 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 17 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 17 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
+TriggerSummaryStep1 18 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 18 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+TriggerSummaryFinal 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
+TriggerSummaryFinal 19 0 DEBUG +++ HLT_e5_etcut_pebtestone ID#2665696149
+TriggerSummaryFinal 19 0 DEBUG +++ HLT_e3_etcut_pebtestone ID#3649724623
+HLTRMakerAlg.MKTool.StreamTagMakerTool 19 0 DEBUG Chain HLT_e5_etcut_pebtestone ID#2665696149 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+HLTRMakerAlg.MKTool.StreamTagMakerTool 19 0 DEBUG Chain HLT_e3_etcut_pebtestone ID#3649724623 adds PEBInfo ROBs = [0x42002e, 0x420060, 0x420064], SubDets = [] to stream calibration_pebtestone
+--> Stream tags = {Main, physics, obeysLB=1, robs=[], dets = []}
+ {pebtestone, calibration, obeysLB=1, robs=[0x0042002e 0x00420060 0x00420064 ], dets = []}
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_peb.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_peb.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8ec597cce5d22875385070145862145068e14b41
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_peb.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# art-type: build
+# art-include: master/Athena
+
+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/pebTest.py
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 39d58c7199c76ac048608b6cb571e6a56fae698a..5c6f65fcc605dcd00317141516ce783d05ff4719 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -528,8 +528,13 @@ class InViewReco( ComponentAccumulator ):
self.viewMakerAlg.InputMakerInputDecisions += [ inKey ]
self.viewMakerAlg.InputMakerOutputDecisions += [ outKey ]
+ def mergeReco( self, ca ):
+ """ Merged CA movnig reconstruction algorithms into the right sequence """
+ return self.merge( ca, sequenceName=self.viewsSeq.getName() )
+
def addRecoAlg( self, alg ):
"""Reconstruction alg to be run per view"""
+ log.warning( "InViewReco.addRecoAlgo: consider using mergeReco that takes care of the CA accumulation and moving algorithms" )
self.addEventAlgo( alg, self.viewsSeq.name() )
def sequence( self ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index d2c78e3b8a7b20fb7a2b564f43a14beff9d4b233..3844368668819471e2f13cc5e7a075faa7c867d5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -674,6 +674,8 @@ AllowedCalibChainIdentifiers = ['csccalib',
'l1satmon',
'zdcpeb',
'calibAFP',
+ 'pebtestone',
+ 'pebtesttwo',
]
# ---- Calib Chain Dictinary of all allowed Values ----
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.cxx b/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.cxx
index 036a18f8a15179ad8b3b9f49bf2c50116182e10a..26705951d3675f303a4671239ace216912213fcb 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.cxx
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.cxx
@@ -33,7 +33,7 @@
#include "GaudiKernel/ThreadLocalContext.h"
#include "GaudiKernel/Algorithm.h"
-
+#include "GaudiKernel/ThreadLocalContext.h"
#include "MergingEventLoopMgr.h"
@@ -526,7 +526,7 @@ namespace TrigSim {
m_currentRun = pPrimEvt->event_ID()->run_number();
m_firstRun = false;
- m_incidentSvc->fireIncident(EventIncident(*pPrimEvt, name(),"BeginRun"));
+ m_incidentSvc->fireIncident(EventIncident(name(),"BeginRun",Gaudi::Hive::currentContext()));
sc = beginRunAlgorithms();
if(sc.isFailure()) {
@@ -545,7 +545,7 @@ namespace TrigSim {
* Fire suitable incident
*/
- m_incidentSvc->fireIncident(EventIncident(*pPrimEvt, name(),"BeginEvent"));
+ m_incidentSvc->fireIncident(EventIncident(name(),"BeginEvent",Gaudi::Hive::currentContext()));
@@ -849,7 +849,7 @@ namespace TrigSim {
/*
* Fire suitable incident
*/
- m_incidentSvc->fireIncident(EventIncident(*pPrimEvt, name(),"EndEvent"));
+ m_incidentSvc->fireIncident(EventIncident(name(),"EndEvent",Gaudi::Hive::currentContext()));