DataModel -> AthContainers. (JetTagD3PDMaker-00-02-07)

	* Tagging JetTagD3PDMaker-00-02-07.
	* DataModel -> AthContainers.

2016-09-29  scott snyder  <snyder@bnl.gov>

	* Tagging JetTagD3PDMaker-00-02-06.
	* endreq -> ATH_MSG_.


Former-commit-id: 524a1ecc

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/CMakeLists.txt

@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaBaseComps
                           Control/AthenaKernel
                           Control/CLIDSvc
-                          Control/DataModel
+                          Control/AthContainers
                           Control/SGTools
                           Event/EventKernel
                           Event/EventPrimitives
@@ -43,7 +43,7 @@ atlas_add_component( JetTagD3PDMaker
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel DataModel SGTools EventKernel EventPrimitives GaudiKernel GeneratorObjects InDetIdentifier InDetReadoutGeometry D3PDMakerUtils JetTagEvent JetTagInfo MuonIDEvent McParticleEvent JetEvent muonEvent Particle egammaEvent TrkParticleBase VxJetVertex VxSecVertex VxVertex TrkVertexFitterInterfaces )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers SGTools EventKernel EventPrimitives GaudiKernel GeneratorObjects InDetIdentifier InDetReadoutGeometry D3PDMakerUtils JetTagEvent JetTagInfo MuonIDEvent McParticleEvent JetEvent muonEvent Particle egammaEvent TrkParticleBase VxJetVertex VxSecVertex VxVertex TrkVertexFitterInterfaces )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/cmt/requirements

@@ -13,7 +13,7 @@ use AtlasBoost			AtlasBoost-*			External
 use AtlasHepMC             	AtlasHepMC-*            	External
 
 use AthenaKernel               	AthenaKernel-*          	Control
-use DataModel                   DataModel-*             	Control
+use AthContainers               AthContainers-*             	Control
 use AthenaBaseComps 		AthenaBaseComps-* 		Control
 use CLIDSvc			CLIDSvc-*			Control
 #use StoreGate                   StoreGate-*             	Control

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagJetFilterAlg.cxx

@@ -8,7 +8,7 @@
 #include "AthenaKernel/errorcheck.h"
 #include "EventKernel/ISignalState.h"
 #include "EventKernel/SignalStateHelper.h"
-#include "DataModel/ConstDataVector.h"
+#include "AthContainers/ConstDataVector.h"
 
 
 namespace D3PD {

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModCondFillerTool.cxx

@@ -34,26 +34,16 @@ JetTagPixelModCondFillerTool::JetTagPixelModCondFillerTool
  */
 StatusCode JetTagPixelModCondFillerTool::initialize()
 {
+  ATH_CHECK( detStore()->retrieve( m_pixId,"PixelID") );
 
- if( StatusCode::SUCCESS != detStore()->retrieve( m_pixId,"PixelID") || m_pixId==0  ){
-    ATH_MSG_FATAL( "Unable to retrieve pixel ID helper" );
+  if( m_pixelCondSummarySvc.empty() ){
+    ATH_MSG_FATAL( "PixelConditionsSummarySvc not configured "  );
+    ATH_MSG_FATAL( "you need to configure PixelConditionsSummarySvc to be able to dump pixel condition "  );
     return StatusCode::FAILURE;
   }
 
- if( m_pixelCondSummarySvc.empty() ){
-   msg(MSG::FATAL) << "PixelConditionsSummarySvc not configured " << endreq; 
-   msg(MSG::FATAL) << "you need to configure PixelConditionsSummarySvc to be able to dump pixel condition " << endreq; 
-   return StatusCode::FAILURE;
- }
- 
-
- if ( m_pixelCondSummarySvc.retrieve().isFailure() ) {
-   msg(MSG::FATAL) << "Failed to retrieve service " << m_pixelCondSummarySvc << endreq; 
-   return StatusCode::FAILURE;
- } else {
-   msg(MSG::INFO) << "Retrieved service " << m_pixelCondSummarySvc << endreq; 
- }
-
+  ATH_CHECK( m_pixelCondSummarySvc.retrieve() );
+  ATH_MSG_INFO( "Retrieved service " << m_pixelCondSummarySvc  );
   return StatusCode::SUCCESS;
 }
 

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagPixelModuleGetterTool.cxx

@@ -22,18 +22,10 @@ JetTagPixelModuleGetterTool::JetTagPixelModuleGetterTool
 
 StatusCode JetTagPixelModuleGetterTool::initialize()
 {
-  
-CHECK( Base::initialize() );
-
- if(StatusCode::SUCCESS !=detStore()->retrieve(m_pixMan, "Pixel") || m_pixMan==0){
-    msg(MSG::FATAL) << "Could not find Pixel manager "<<endreq; 
-    return StatusCode::FAILURE; 
-  }
-  msg(MSG::INFO)  << "Pixel manager  retrieved" << endreq;
-
- 
+  ATH_CHECK( Base::initialize() );
+  ATH_CHECK( detStore()->retrieve(m_pixMan, "Pixel") );
+  ATH_MSG_INFO( "Pixel manager  retrieved"  );
   return StatusCode::SUCCESS;
-
 }
 
 

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagTwoTrackVertexCandidateHolder.h

@@ -13,7 +13,7 @@
 #define JetTagD3PDMaker_JetTagTwoTrackVertexCandidateHolder_H
 
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "CLIDSvc/CLASS_DEF.h"
 
 namespace Trk{

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/JetTagVxOnJetAxisCandidateHolder.h

@@ -2,6 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
+
 /**
  * @file JetTagD3PDMaker/src/JetTagVxOnJetAxisCandidateHolder.h
  * @author Georges Aad
@@ -13,7 +14,7 @@
 #define JetTagD3PDMaker_JetTagVxOnJetAxisCandidateHolder_H
 
 
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "CLIDSvc/CLASS_DEF.h"
 
 namespace Trk{