Commit 2eedb4c5 authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

'endreq -> endmsg.' (GeneratorObjectsTPCnv-00-06-13)

	* Tagging GeneratorObjectsTPCnv-00-06-13.
	* endreq -> endmsg.

2016-10-26  scott snyder  <snyder@bnl.gov>

	* Tagging GeneratorObjectsTPCnv-00-06-12.
	* Use std::unordered_map rather than depending on SGTools.
parent 221caaf5
......@@ -7,7 +7,6 @@ atlas_subdir( GeneratorObjectsTPCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/SGTools
Database/AthenaPOOL/AthenaPoolCnvSvc
GaudiKernel
Generators/GeneratorObjects
......@@ -26,17 +25,17 @@ atlas_add_tpcnv_library( GeneratorObjectsTPCnv
PUBLIC_HEADERS GeneratorObjectsTPCnv
INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} SGTools AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel )
atlas_add_dictionary( GeneratorObjectsTPCnvDict
GeneratorObjectsTPCnv/GeneratorObjectsTPCnvDict.h
GeneratorObjectsTPCnv/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} SGTools AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel GeneratorObjectsTPCnv )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel GeneratorObjectsTPCnv )
atlas_add_dictionary( OLD_GeneratorObjectsTPCnvDict
GeneratorObjectsTPCnv/GeneratorObjectsTPCnvDict.h
GeneratorObjectsTPCnv/OLD_selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} SGTools AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel GeneratorObjectsTPCnv )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel GeneratorObjectsTPCnv )
......@@ -12,9 +12,7 @@
#define GENERATOROBJECTSTPCNV_GENEVENTCNV_P1_H
// STL includes
// SGTools includes
#include "SGTools/unordered_map.h" // move to STL once available
#include <unordered_map>
// AthenaPoolCnvSvc includes
#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
......@@ -81,7 +79,7 @@ class GenEventCnv_p1 : public T_AthenaPoolTPCnvBase<HepMC::GenEvent,
///////////////////////////////////////////////////////////////////
protected:
typedef SG::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
typedef std::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
/** @brief Create a transient @c GenVertex from a persistent one (version 1)
* It returns the new @c GenVertex.
......
......@@ -12,9 +12,7 @@
#define GENERATOROBJECTSTPCNV_MCEVENTCOLLECTIONCNV_P2_H
// STL includes
// SGTools includes
#include "SGTools/unordered_map.h" // move to STL once available
#include <unordered_map>
// HepMC / CLHEP includes
#define private public
......@@ -89,7 +87,7 @@ class McEventCollectionCnv_p2 : public T_AthenaPoolTPCnvBase<
///////////////////////////////////////////////////////////////////
protected:
typedef SG::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
typedef std::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
/** @brief Create a transient @c GenVertex from a persistent one (version 1)
* It returns the new @c GenVertex.
......
......@@ -12,9 +12,7 @@
#define GENERATOROBJECTSTPCNV_MCEVENTCOLLECTIONCNV_P3_H
// STL includes
// SGTools includes
#include "SGTools/unordered_map.h" // move to STL once available
#include <unordered_map>
// HepMC / CLHEP includes
#define private public
......@@ -89,7 +87,7 @@ class McEventCollectionCnv_p3 : public T_AthenaPoolTPCnvBase<
///////////////////////////////////////////////////////////////////
protected:
typedef SG::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
typedef std::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
/** @brief Create a transient @c GenVertex from a persistent one (version 1)
* It returns the new @c GenVertex.
......
......@@ -12,9 +12,7 @@
#define GENERATOROBJECTSTPCNV_MCEVENTCOLLECTIONCNV_P4_H
// STL includes
// SGTools includes
#include "SGTools/unordered_map.h" // move to STL once available
#include <unordered_map>
// HepMC / CLHEP includes
#define private public
......@@ -94,7 +92,7 @@ class McEventCollectionCnv_p4 : public T_AthenaPoolTPCnvBase<
///////////////////////////////////////////////////////////////////
protected:
typedef SG::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
typedef std::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
/** @brief Create a transient @c GenVertex from a persistent one (version 1)
* It returns the new @c GenVertex.
......
......@@ -12,9 +12,7 @@
#define GENERATOROBJECTSTPCNV_MCEVENTCOLLECTIONCNV_P5_H
// STL includes
// SGTools includes
#include "SGTools/unordered_map.h" // move to STL once available
#include <unordered_map>
// HepMC / CLHEP includes
#define private public
......@@ -95,7 +93,7 @@ class McEventCollectionCnv_p5 : public T_AthenaPoolTPCnvBase<
///////////////////////////////////////////////////////////////////
protected:
typedef SG::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
typedef std::unordered_map<HepMC::GenParticle*,int> ParticlesMap_t;
/** @brief Create a transient @c GenVertex from a persistent one (version 1)
* It returns the new @c GenVertex.
......
......@@ -6,7 +6,6 @@ use AtlasPolicy AtlasPolicy-*
use GaudiInterface GaudiInterface-* External
use SGTools SGTools-* Control
use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
use AtlasHepMC AtlasHepMC-* External
......
......@@ -46,15 +46,15 @@ void GenEventCnv_p1::persToTrans( const GenEvent_p1* persObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Loading HepMC::GenEvent from persistent state..."
<< endreq;
<< endmsg;
if ( 0 == m_pool ) {
msg << MSG::ERROR
<< "This instance of GenEventCnv_p1 has a null pointer to "
<< "HepMC::DataPool !" << endreq
<< "HepMC::DataPool !" << endmsg
<< "This probably means the T/P converter (McEventCollectionCnv_pX) "
<< "is misconfigured !!"
<< endreq;
<< endmsg;
throw std::runtime_error("Null pointer to HepMC::DataPool !!");
}
......@@ -112,12 +112,12 @@ void GenEventCnv_p1::persToTrans( const GenEvent_p1* persObj,
} else {
msg << MSG::ERROR
<< "GenParticle points to null end vertex !!"
<< endreq;
<< endmsg;
}
}
msg << MSG::DEBUG << "Loaded HepMC::GenEvent from persistent state [OK]"
<< endreq;
<< endmsg;
return;
}
......@@ -126,13 +126,13 @@ void GenEventCnv_p1::transToPers( const HepMC::GenEvent*,
MsgStream& msg )
{
msg << MSG::DEBUG << "Creating persistent state of HepMC::GenEvent..."
<< endreq;
<< endmsg;
msg << MSG::ERROR
<< "This transient-to-persistent converter method has been RETIRED !!"
<< endreq
<< endmsg
<< "You are not supposed to end-up here ! Go away !"
<< endreq;
<< endmsg;
throw std::runtime_error( "Retired GenEventCnv_p1::transToPers() !!" );
return;
......
......@@ -31,7 +31,7 @@ void HepMcParticleLinkCnv_p1::persToTrans( const HepMcParticleLink_p1* persObj,
MsgStream &/*msg*/ )
{
// msg << MSG::DEBUG << "Loading HepMcParticleLink from persistent state..."
// << endreq;
// << endmsg;
if (transObj->m_ptrs.m_dict == nullptr)
transObj->init_dict();
transObj->m_extBarcode =
......@@ -40,7 +40,7 @@ void HepMcParticleLinkCnv_p1::persToTrans( const HepMcParticleLink_p1* persObj,
// msg << MSG::DEBUG << "Loaded HepMcParticleLink from persistent state [OK]"
// << endreq;
// << endmsg;
return;
}
......@@ -49,12 +49,12 @@ void HepMcParticleLinkCnv_p1::transToPers( const HepMcParticleLink* transObj,
MsgStream &/*msg*/ )
{
// msg << MSG::DEBUG << "Creating persistent state of HepMcParticleLink..."
// << endreq;
// << endmsg;
persObj->m_mcEvtIndex = transObj->eventIndex();
persObj->m_barcode = transObj->m_extBarcode.barcode();
// msg << MSG::DEBUG << "Created persistent state of HepMcGenParticleLink [OK]"
// << endreq;
// << endmsg;
return;
}
......
......@@ -57,7 +57,7 @@ void McEventCollectionCnv_p1::persToTrans( const McEventCollection_p1* persObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Loading McEventCollection from persistent state..."
<< endreq;
<< endmsg;
// elements are managed by DataPool
transObj->clear(SG::VIEW_ELEMENTS);
......@@ -89,7 +89,7 @@ void McEventCollectionCnv_p1::persToTrans( const McEventCollection_p1* persObj,
} //> end loop over genEvents
msg << MSG::DEBUG << "Loaded McEventCollection from persistent state [OK]"
<< endreq;
<< endmsg;
return;
}
......@@ -99,13 +99,13 @@ void McEventCollectionCnv_p1::transToPers( const McEventCollection*,
MsgStream& msg )
{
msg << MSG::DEBUG << "Creating persistent state of McEventCollection..."
<< endreq;
<< endmsg;
msg << MSG::ERROR
<< "This transient-to-persistent converter method has been RETIRED !!"
<< endreq
<< endmsg
<< "You are not supposed to end-up here ! Go away !"
<< endreq;
<< endmsg;
throw std::runtime_error( "Retired McEventCollectionCnv_p1::transToPers() !!" );
return;
......
......@@ -77,7 +77,7 @@ void McEventCollectionCnv_p2::persToTrans( const McEventCollection_p2* persObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Loading McEventCollection from persistent state..."
<< endreq;
<< endmsg;
// elements are managed by DataPool
transObj->clear(SG::VIEW_ELEMENTS);
......@@ -150,13 +150,13 @@ void McEventCollectionCnv_p2::persToTrans( const McEventCollection_p2* persObj,
} else {
msg << MSG::ERROR
<< "GenParticle points to null end vertex !!"
<< endreq;
<< endmsg;
}
}
} //> end loop over m_genEvents
msg << MSG::DEBUG << "Loaded McEventCollection from persistent state [OK]"
<< endreq;
<< endmsg;
return;
}
......@@ -166,13 +166,13 @@ void McEventCollectionCnv_p2::transToPers( const McEventCollection*,
MsgStream& msg )
{
msg << MSG::DEBUG << "Creating persistent state of McEventCollection..."
<< endreq;
<< endmsg;
msg << MSG::ERROR
<< "This transient-to-persistent converter method has been RETIRED !!"
<< endreq
<< endmsg
<< "You are not supposed to end-up here ! Go away !"
<< endreq;
<< endmsg;
throw std::runtime_error( "Retired McEventCollectionCnv_p2::transToPers() !!" );
return;
......
......@@ -79,7 +79,7 @@ void McEventCollectionCnv_p3::persToTrans( const McEventCollection_p3* persObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Loading McEventCollection from persistent state..."
<< endreq;
<< endmsg;
// elements are managed by DataPool
transObj->clear(SG::VIEW_ELEMENTS);
......@@ -155,13 +155,13 @@ void McEventCollectionCnv_p3::persToTrans( const McEventCollection_p3* persObj,
} else {
msg << MSG::ERROR
<< "GenParticle points to null end vertex !!"
<< endreq;
<< endmsg;
}
}
} //> end loop over m_genEvents
msg << MSG::DEBUG << "Loaded McEventCollection from persistent state [OK]"
<< endreq;
<< endmsg;
return;
}
......@@ -172,9 +172,9 @@ void McEventCollectionCnv_p3::transToPers( const McEventCollection* /*transObj*/
{
msg << MSG::ERROR
<< "This transient-to-persistent converter method has been RETIRED !!"
<< endreq
<< endmsg
<< "You are not supposed to end-up here ! Go away !"
<< endreq;
<< endmsg;
throw std::runtime_error( "Retired McEventCollectionCnv_p3::transToPers() !!" );
return;
......
......@@ -87,7 +87,7 @@ void McEventCollectionCnv_p4::persToTrans( const McEventCollection_p4* persObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Loading McEventCollection from persistent state..."
<< endreq;
<< endmsg;
// elements are managed by DataPool
if (!m_isPileup)
......@@ -199,13 +199,13 @@ void McEventCollectionCnv_p4::persToTrans( const McEventCollection_p4* persObj,
{
msg << MSG::ERROR
<< "GenParticle points to null end vertex !!"
<< endreq;
<< endmsg;
}
}
} //> end loop over m_genEvents
msg << MSG::DEBUG << "Loaded McEventCollection from persistent state [OK]"
<< endreq;
<< endmsg;
return;
}
......@@ -215,7 +215,7 @@ void McEventCollectionCnv_p4::transToPers( const McEventCollection* transObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Creating persistent state of McEventCollection..."
<< endreq;
<< endmsg;
persObj->m_genEvents.reserve( transObj->size() );
const std::pair<unsigned int,unsigned int> stats = nbrParticlesAndVertices( transObj );
......@@ -276,7 +276,7 @@ void McEventCollectionCnv_p4::transToPers( const McEventCollection* transObj,
} //> end loop over GenEvents
msg << MSG::DEBUG << "Created persistent state of HepMC::GenEvent [OK]"
<< endreq;
<< endmsg;
return;
}
......
......@@ -82,7 +82,7 @@ void McEventCollectionCnv_p5::persToTrans( const McEventCollection_p5* persObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Loading McEventCollection from persistent state..."
<< endreq;
<< endmsg;
// elements are managed by DataPool
if (!m_isPileup) {
......@@ -228,7 +228,7 @@ void McEventCollectionCnv_p5::persToTrans( const McEventCollection_p5* persObj,
} else {
msg << MSG::ERROR
<< "GenParticle points to null end vertex !!"
<< endreq;
<< endmsg;
}
}
......@@ -245,7 +245,7 @@ void McEventCollectionCnv_p5::persToTrans( const McEventCollection_p5* persObj,
} //> end loop over m_genEvents
msg << MSG::DEBUG << "Loaded McEventCollection from persistent state [OK]"
<< endreq;
<< endmsg;
return;
}
......@@ -255,7 +255,7 @@ void McEventCollectionCnv_p5::transToPers( const McEventCollection* transObj,
MsgStream& msg )
{
msg << MSG::DEBUG << "Creating persistent state of McEventCollection..."
<< endreq;
<< endmsg;
persObj->m_genEvents.reserve( transObj->size() );
const std::pair<unsigned int,unsigned int> stats = nbrParticlesAndVertices( transObj );
......@@ -361,7 +361,7 @@ void McEventCollectionCnv_p5::transToPers( const McEventCollection* transObj,
} //> end loop over GenEvents
msg << MSG::DEBUG << "Created persistent state of HepMC::GenEvent [OK]"
<< endreq;
<< endmsg;
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment