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 )

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

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
 

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
 
 #--------------------------------------------------------------

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

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;
 

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

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

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;

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;
 

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();

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

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;

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;
 

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;

Build/AtlasBuildScripts/checkout_atlasexternals.sh

@@ -23,8 +23,8 @@ usage() {
     echo "  AtlasExternals_URL and AtlasExternals_REF to override"
     echo "  other values (even those on the command line)."
     echo "  If AtlasExternals_URL is set to 'current' then"
-	echo "  no clone or checkout is done and the working copy"
-	echo "  in the source directory is left untouched."
+    echo "  no clone or checkout is done and the working copy"
+    echo "  in the source directory is left untouched."
 }
 
 _max_retry_=5
@@ -46,7 +46,7 @@ _retry_ () {
 # Parse the command line arguments:
 TAGBRANCH=""
 SOURCEDIR=""
-EXTERNALSURL="https://:@gitlab.cern.ch:8443/atlas/atlasexternals.git"
+EXTERNALSURL="https://gitlab.cern.ch/atlas/atlasexternals.git"
 while getopts ":t:o:s:e:h" opt; do
     case $opt in
         t)

Calorimeter/CaloCnv/CaloJiveXML/CaloJiveXML/CaloMBTSRetriever.h

 /*
-  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_CALOMBTSRETRIEVER_H
@@ -13,6 +13,7 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "TileEvent/TileCellContainer.h"
 #include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCondToolTiming.h"
 
 #include "JiveXML/IDataRetriever.h"
 #include "AthenaBaseComps/AthAlgTool.h"
@@ -61,6 +62,12 @@ namespace JiveXML{
       ///The data type that is generated by this retriever
       const std::string m_typeName;
 
+      ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+          "TileCondToolTiming", "TileCondToolTiming", "Tile timing tool"};
+
+      ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+          "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
       const TileTBID*    m_tileTBID;
 
       ///properties:

Calorimeter/CaloCnv/CaloJiveXML/CaloJiveXML/CaloTileRetriever.h

 /*
-  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_CALOTILERETRIEVER_H
@@ -10,6 +10,10 @@
 #include <cstddef>
 #include <map>
 
+#include "TileConditions/TileCondToolTiming.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/ITileBadChanTool.h"
+
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "LArCabling/LArCablingService.h"
 
@@ -65,6 +69,15 @@ namespace JiveXML{
       ///The data type that is generated by this retriever
       const std::string m_typeName;
 
+      ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+          "TileCondToolTiming", "TileCondToolTiming", "Tile timing tool"};
+
+      ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+          "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+      ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+          "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+
       void calcTILELayerSub(Identifier&);
       const CaloIdManager* m_calo_id_man;
       const CaloCell_ID*   m_calocell_id;

Calorimeter/CaloCnv/CaloJiveXML/src/CaloMBTSRetriever.cxx

 /*
-  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 "CaloJiveXML/CaloMBTSRetriever.h"
@@ -21,8 +21,6 @@
 #include "TileIdentifier/TileTBID.h"
 #include "TileConditions/TileInfo.h"
 #include "TileConditions/TileCablingService.h"
-#include "TileConditions/ITileBadChanTool.h"
-#include "TileConditions/TileCondToolEmscale.h"
 #include "TileCalibBlobObjs/TileCalibUtils.h"
 
 namespace JiveXML {
@@ -56,7 +54,15 @@ namespace JiveXML {
 
   StatusCode CaloMBTSRetriever::initialize() {
 
-    if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Initialising Tool" << endmsg;
+    ATH_MSG_DEBUG( "Initialising Tool" );
+
+
+    //=== get TileCondToolTiming
+    ATH_CHECK( m_tileToolTiming.retrieve() );
+
+    //=== get TileCondToolEmscale
+    ATH_CHECK( m_tileToolEmscale.retrieve() );
+
 
     return StatusCode::SUCCESS;
   }
@@ -121,7 +127,6 @@ namespace JiveXML {
     const TileHWID* tileHWID;
     const TileInfo* tileInfo;
     const TileCablingService* cabling=nullptr;
-    ToolHandle<TileCondToolEmscale> tileToolEmscale("TileCondToolEmscale"); //!< main Tile Calibration tool
     TileRawChannelUnit::UNIT RChUnit = TileRawChannelUnit::ADCcounts;  //!< Unit for TileRawChannels (ADC, pCb, etc.)
     cabling = TileCablingService::getInstance();
     bool offlineRch = false;
@@ -136,9 +141,6 @@ namespace JiveXML {
     if ( detStore()->retrieve(tileInfo, "TileInfo").isFailure() )
       if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getMBTSData(), Could not retrieve TileInfo"<< endmsg;
 
-    //=== get TileCondToolEmscale
-    if ( tileToolEmscale.retrieve().isFailure())
-      if (msgLvl(MSG::ERROR)) msg(MSG::ERROR)<< "in getMBTSData(), Could not retrieve " << tileToolEmscale << endmsg;
 
     std::string RchName[7] = {"TileRawChannelOpt2","TileRawChannelOpt","TileRawChannelFixed",
                               "TileRawChannelFitCool","TileRawChannelFit",
@@ -219,9 +221,9 @@ namespace JiveXML {
             amplitude = (*chItr)->amplitude();
             //Change amplitude units to ADC counts
             if (TileRawChannelUnit::ADCcounts < RChUnit && RChUnit < TileRawChannelUnit::OnlineADCcounts) {
-              amplitude /= tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
+              amplitude /= m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
             } else if (RChUnit > TileRawChannelUnit::OnlineADCcounts) {
-              amplitude = tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
+              amplitude = m_tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
             }
 
             theMbtspedestal.insert(std::make_pair( cellid, (*chItr)->pedestal() ) );
@@ -344,14 +346,17 @@ namespace JiveXML {
           int drawer    = tileHWID->drawer(hwid);
           int ros       = tileHWID->ros(hwid);
           int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-          float scale = tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
+          float scale = m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
+                                                        TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
           float amp;
 
           if (  cell->energy() >= m_mbtsThreshold ) amp = cell->energy()/scale;
           else amp = 0.0;
           float time = cell->time();
 
-          if ((qual != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) time -= tileInfo->TimeCalib(hwid,0.0);
+          if ((qual != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) {
+            time += m_tileToolTiming->getSignalPhase(drawerIdx, channel, adc);
+          }
 
           cellRawAmplitude.push_back(DataType(amp));
           cellRawTime.push_back(DataType(time));

Calorimeter/CaloCnv/CaloJiveXML/src/CaloTileRetriever.cxx

 /*
-  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 "CaloJiveXML/CaloTileRetriever.h"
@@ -22,8 +22,6 @@
 #include "TileIdentifier/TileTBID.h"
 #include "TileConditions/TileInfo.h"
 #include "TileConditions/TileCablingService.h"
-#include "TileConditions/ITileBadChanTool.h"
-#include "TileConditions/TileCondToolEmscale.h"
 #include "TileCalibBlobObjs/TileCalibUtils.h"
 
 using Athena::Units::GeV;
@@ -63,7 +61,16 @@ namespace JiveXML {
 
   StatusCode CaloTileRetriever::initialize() {
 
-    if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Initialising Tool" << endmsg;
+    ATH_MSG_DEBUG( "Initialising Tool" );
+
+    //=== get TileCondToolTiming
+    ATH_CHECK( m_tileToolTiming.retrieve() );
+
+    //=== get TileCondToolEmscale
+    ATH_CHECK( m_tileToolEmscale.retrieve() );
+
+    //=== get TileBadChanTool
+    ATH_CHECK( m_tileBadChanTool.retrieve() );
 
     return StatusCode::SUCCESS;
   }
@@ -147,8 +154,6 @@ namespace JiveXML {
     const TileHWID* tileHWID;
     const TileInfo* tileInfo;
     const TileCablingService* cabling=nullptr;
-    ToolHandle<ITileBadChanTool> tileBadChanTool("TileBadChanTool"); //!< Tile Bad Channel tool
-    ToolHandle<TileCondToolEmscale> tileToolEmscale("TileCondToolEmscale"); //!< main Tile Calibration tool
     const TileDigitsContainer *tileDigits = nullptr;
     const TileRawChannelContainer* RawChannelCnt;
     TileRawChannelUnit::UNIT RChUnit = TileRawChannelUnit::ADCcounts;  //!< Unit for TileRawChannels (ADC, pCb, etc.)
@@ -186,16 +191,6 @@ namespace JiveXML {
     if (sc.isFailure())
         if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getCaloTileData(), Could not retrieve TileInfo"<< endmsg;
 
-    //=== get TileBadChanTool
-    sc = tileBadChanTool.retrieve();
-    if ( sc.isFailure() )
-        if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getCaloTileData(), Could not retrieve " << tileBadChanTool << endmsg;
-
-    //=== get TileCondToolEmscale
-    sc = tileToolEmscale.retrieve();
-    if (sc.isFailure())
-      if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getCaloTileData(), Could not retrieve " << tileToolEmscale << endmsg;
-
 
     if (m_doTileDigit) {
 
@@ -264,15 +259,15 @@ namespace JiveXML {
           int ros       = tileHWID->ros(hwid);
           int PMT = abs( cabling->channel2hole(ros,channel) );
           int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-          uint32_t tileAdcStatus = tileBadChanTool->encodeStatus(tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
+          uint32_t tileAdcStatus = m_tileBadChanTool->encodeStatus(m_tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
 
           amplitude = (*chItr)->amplitude();
           //Change amplitude units to ADC counts
           if (TileRawChannelUnit::ADCcounts < RChUnit && RChUnit < TileRawChannelUnit::OnlineADCcounts) {
-            amplitude /= tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
+            amplitude /= m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
           } else if (RChUnit > TileRawChannelUnit::OnlineADCcounts) {
             // Should never get here due to offlineRch test above.
-            //amplitude = tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
+            //amplitude = m_tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
             std::abort();
           }
 
@@ -463,15 +458,17 @@ namespace JiveXML {
             int ros       = tileHWID->ros(hwid);
             int PMT = abs( cabling->channel2hole(ros,channel) );
             int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-            float scale = tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
+            float scale = m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
                                                           TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
             float amp = theTileCell->ene1() / scale;
             float time = theTileCell->time1();
 
             int qbit = (theTileCell->qbit1() & TileCell::MASK_TIME);
-            if ((qual1 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) time -= tileInfo->TimeCalib(hwid,0.0);
+            if ((qual1 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) {
+              time += m_tileToolTiming->getSignalPhase(drawerIdx, channel, adc);
+            }
 
-            uint32_t tileAdcStatus = tileBadChanTool->encodeStatus(tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
+            uint32_t tileAdcStatus = m_tileBadChanTool->encodeStatus(m_tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
             if (badch1) tileAdcStatus += 10;
 
             pmt1RawAmplitude.push_back(DataType(amp));
@@ -496,15 +493,17 @@ namespace JiveXML {
             int ros       = tileHWID->ros(hwid);
             int PMT = abs( cabling->channel2hole(ros,channel) );
             int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-            float scale = tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
-                                                            TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
+            float scale = m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
+                                                          TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
             float amp = theTileCell->ene2() / scale;
             float time = theTileCell->time2();
 
             int qbit = (theTileCell->qbit2() & TileCell::MASK_TIME);
-            if ((qual2 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) time -= tileInfo->TimeCalib(hwid,0.0);
+            if ((qual2 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) {
+              time += m_tileToolTiming->getSignalPhase(drawerIdx, channel, adc);
+            }
 
-            uint32_t tileAdcStatus = tileBadChanTool->encodeStatus(tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
+            uint32_t tileAdcStatus = m_tileBadChanTool->encodeStatus(m_tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
             if (badch2) tileAdcStatus += 10;
 
             pmt2RawAmplitude.push_back(DataType(amp));