diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
index 844583dbde575e1fc59cdb3cdc136eb028675c71..c21506510ae2f71a982a8b530ee57a61117deaac 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/AmdcAth/AmdcsimrecAthenaSvc.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 AmdcsimrecAthenaSvc_H
-#define AmdcsimrecAthenaSvc_H
+#ifndef AMDCATH_AMDCSIMRECATHENASVC_H
+#define AMDCATH_AMDCSIMRECATHENASVC_H
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ToolHandle.h"
class StoreGateSvc;
-class ITagInfoMgr;
class IGeoModelSvc;
namespace MuonGM {
@@ -90,11 +89,6 @@ public:
const AmdcIlineStore*& pAmdcIlineStore
);
- /**Set and Get TagInfoXML */
- StatusCode SetTagInfoXML(IOVSVC_CALLBACK_ARGS);
- int GetTagInfoXMLStamp();
- std::vector< std::pair<std::string,std::string> > GetTagInfoXML();
-
/**Get AGDD2GeoSwitches data*/
int GetAGDD2GeoSwitchesStamp();
std::vector<std::string> GetAGDD2GeoSwitches();
@@ -232,11 +226,6 @@ private:
int m_XtomoCheck ; //!< Optional Check of Xtomo stuff
void TestXtomoStuff();
-//Tag Info
- ITagInfoMgr* p_ITagInfoMgr ; //!< Pointer On ITagInfoMgr
- int m_TagInfoXMLStamp ; //!< Volatility Status
- std::vector< std::pair<std::string,std::string> > m_TagInfoXML ; //!< Store infos from TagInfo
-
//AGDD2GeoSwitches Data
int m_AGDD2GeoSwitchesStamp ; //!< Volatility Status
std::vector<std::string> m_AGDD2GeoSwitches ; //!< Store infos from AGDD2GeoSwitches
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/CMakeLists.txt b/MuonSpectrometer/Amdcsimrec/AmdcAth/CMakeLists.txt
index 85bc55dbe2e074c7e106bc7fae068b198ad68062..6a88d8d09f7296407261de6e3af925b49e27e6c6 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/CMakeLists.txt
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/CMakeLists.txt
@@ -17,8 +17,6 @@ atlas_depends_on_subdirs( PUBLIC
Database/RDBAccessSvc
DetectorDescription/AtlasDetDescr
DetectorDescription/GeoModel/GeoModelInterfaces
- Event/EventInfo
- Event/EventInfoMgt
MuonSpectrometer/Amdcsimrec/AmdcStand
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
Tools/PathResolver )
@@ -33,12 +31,12 @@ atlas_add_library( AmdcAthLib
PUBLIC_HEADERS AmdcAth
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel AmdcCore MuonAlignmentData StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AtlasDetDescr EventInfo AmdcStand MuonReadoutGeometry PathResolver )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AtlasDetDescr AmdcStand MuonReadoutGeometry PathResolver )
atlas_add_component( AmdcAth
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel AmdcCore MuonAlignmentData StoreGateLib SGtests AtlasDetDescr EventInfo AmdcStand MuonReadoutGeometry PathResolver AmdcAthLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel AmdcCore MuonAlignmentData StoreGateLib SGtests AtlasDetDescr AmdcStand MuonReadoutGeometry PathResolver AmdcAthLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
index d3938cc2c6af213251791e3c0e12903a09ea68f3..7ebf9e6057d807c8e74aaadff1fee7c1cd019698 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/AmdcsimrecAthenaSvc.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 "StoreGate/StoreGateSvc.h"
@@ -11,10 +11,8 @@
#include "RDBAccessSvc/IRDBAccessSvc.h"
#include "RDBAccessSvc/IRDBRecord.h"
#include "RDBAccessSvc/IRDBRecordset.h"
-#include "EventInfo/TagInfo.h"
//----------------------------------------------------------------//
-#include "EventInfoMgt/ITagInfoMgr.h"
#include "GeoModelInterfaces/IGeoModelSvc.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
@@ -43,8 +41,7 @@ AmdcsimrecAthenaSvc::AmdcsimrecAthenaSvc(const std::string& name,ISvcLocator* sv
AthService(name,svc),
p_IGeoModelSvc(0),
p_detStore(0),
-p_MuonDetectorManager(0),
-p_ITagInfoMgr(0)
+p_MuonDetectorManager(0)
{
//*Set Default values
@@ -69,9 +66,6 @@ p_ITagInfoMgr(0)
m_AmdcABlinesStamp = 1;
- m_TagInfoXMLStamp = -1 ;
- m_TagInfoXML.clear();
-
m_AGDD2GeoSwitchesStamp = -1 ;
m_AGDD2GeoSwitches.clear();
@@ -208,25 +202,6 @@ StatusCode AmdcsimrecAthenaSvc::initialize() {
}
-//TagInfo
- const DataHandle<TagInfo> tagInfoH;
- std::string tagInfoKey = "";
-
- sc = service("TagInfoMgr", p_ITagInfoMgr);
- if ( sc.isFailure() ) {
- ATH_MSG_WARNING( " Unable to locate TagInfoMgr service" ) ;
- }else{
- tagInfoKey = p_ITagInfoMgr->tagInfoKey();
- }
-
- sc = p_detStore->regFcn(&AmdcsimrecAthenaSvc::SetTagInfoXML,this, tagInfoH, tagInfoKey) ;
- if ( sc.isFailure() ) {
- ATH_MSG_WARNING( "Cannot register AmdcsimrecAthenaSvc::SetTagInfoXML function for key " << tagInfoKey ) ;
- }else{
- ATH_MSG_DEBUG( "Registered AmdcsimrecAthenaSvc::SetTagInfoXML callback for key: " << tagInfoKey ) ;
- }
-
-
//Check geometry related proprieties
if ( m_NameOfTheSource!="ASCII"
&& m_NameOfTheSource!="GEOMODEL"
@@ -1993,54 +1968,11 @@ void AmdcsimrecAthenaSvc::TestXtomoStuff(){ p_Amdcsimrec->TestXtomoStuff(); }
-int AmdcsimrecAthenaSvc::GetTagInfoXMLStamp() { return m_TagInfoXMLStamp ;}
-
-std::vector< std::pair<std::string,std::string> > AmdcsimrecAthenaSvc::GetTagInfoXML() { return m_TagInfoXML;}
-
int AmdcsimrecAthenaSvc::GetAGDD2GeoSwitchesStamp() { return m_AGDD2GeoSwitchesStamp ;}
std::vector<std::string> AmdcsimrecAthenaSvc::GetAGDD2GeoSwitches() {return m_AGDD2GeoSwitches;}
-StatusCode AmdcsimrecAthenaSvc::SetTagInfoXML(IOVSVC_CALLBACK_ARGS)
-{
-
- ATH_MSG_DEBUG( "----> SetTagInfoXML is called " ) ;
-
- const TagInfo* pTagInfo = 0;
- StatusCode sc = p_detStore->retrieve(pTagInfo);
- if (sc.isFailure()){
- ATH_MSG_DEBUG( " Retrieve pTagInfo failed " ) ;
- }else{
- TagInfo::NameTagPairVec aNameTagPairVec;
- pTagInfo->getInputTags(aNameTagPairVec);
- m_TagInfoXMLStamp = m_TagInfoXMLStamp + 1;
- m_TagInfoXML.clear();
- for (unsigned int Item = 0; Item < aNameTagPairVec.size(); Item++) {
- std::string aNameTagPairVecFirst = aNameTagPairVec[Item].first;
- std::string aNameTagPairVecSecond = aNameTagPairVec[Item].second;
- std::pair<std::string,std::string> aPair(aNameTagPairVecFirst,aNameTagPairVecSecond);
- m_TagInfoXML.push_back(aPair);
- }
- ATH_MSG_DEBUG( " "
- << " One gets "
- << m_TagInfoXML.size()
- << " items from TagInfo "
- ) ;
- for (unsigned int Item = 0; Item < m_TagInfoXML.size(); Item++) {
- std::string aNameTagPairVecFirst = m_TagInfoXML[Item].first;
- std::string aNameTagPairVecSecond = m_TagInfoXML[Item].second;
- ATH_MSG_DEBUG( " "
- << " " << aNameTagPairVecFirst
- << " " << aNameTagPairVecSecond
- ) ;
- }
- }
-
- return StatusCode::SUCCESS;
-
-}
-
StatusCode AmdcsimrecAthenaSvc::SetLocation(std::string NameFile, std::string& FileLocation)
{