From a867c44a30eaf6fbbcbc1be90ee9f775bc707045 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 17 May 2017 17:46:51 +0200
Subject: [PATCH] AthenaROOTAccess: Use RootAuxVectorFactory from
AthContainersRoot.
---
.../AthenaROOTAccess/CMakeLists.txt | 11 +-
.../AthenaROOTAccess/src/AuxStoreARA.cxx | 4 +-
.../src/RootAuxVectorFactory.cxx | 417 ------------------
.../src/RootAuxVectorFactory.h | 343 --------------
4 files changed, 8 insertions(+), 767 deletions(-)
delete mode 100644 PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.cxx
delete mode 100644 PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.h
diff --git a/PhysicsAnalysis/AthenaROOTAccess/CMakeLists.txt b/PhysicsAnalysis/AthenaROOTAccess/CMakeLists.txt
index 6ccaae6fd1d1..b4b70ade8691 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/CMakeLists.txt
+++ b/PhysicsAnalysis/AthenaROOTAccess/CMakeLists.txt
@@ -8,6 +8,7 @@ atlas_subdir( AthenaROOTAccess )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthContainersInterfaces
+ Control/AthContainersRoot
Control/AthenaKernel
Control/CxxUtils
Control/SGTools
@@ -33,33 +34,33 @@ atlas_add_library( AthenaROOTAccess
src/*.cxx
PUBLIC_HEADERS AthenaROOTAccess
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaKernel CxxUtils SGTools GaudiKernel RootUtilsPyROOT AthenaPoolCnvSvcLib
+ LINK_LIBRARIES AthContainersRoot AthenaKernel CxxUtils SGTools GaudiKernel RootUtilsPyROOT AthenaPoolCnvSvcLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools AthAllocators AthContainers AthLinks RootUtils PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking )
atlas_add_dictionary( AthenaROOTAccessDict
AthenaROOTAccess/AthenaROOTAccessDict.h
AthenaROOTAccess/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainersRoot AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess )
atlas_add_dictionary( AthenaROOTAccessTestDict
AthenaROOTAccess/AthenaROOTAccessTestDict.h
AthenaROOTAccess/test_selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainersRoot AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess )
atlas_add_test( DVCollectionProxy_test
SOURCES
test/DVCollectionProxy_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainersRoot AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess
EXTRA_PATTERNS "is already in" )
atlas_add_test( DataBucketVoid_test
SOURCES
test/DataBucketVoid_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainersRoot AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthAllocators AthContainers AthLinks RootUtils RootUtilsPyROOT AthenaPoolCnvSvcLib PersistentDataModel PersistentDataModelTPCnv xAODHIEvent xAODMuon xAODTracking AthenaROOTAccess
EXTRA_PATTERNS "is already in" )
# Install files from the package:
diff --git a/PhysicsAnalysis/AthenaROOTAccess/src/AuxStoreARA.cxx b/PhysicsAnalysis/AthenaROOTAccess/src/AuxStoreARA.cxx
index c5857ca82959..459dd1f1a3bd 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/src/AuxStoreARA.cxx
+++ b/PhysicsAnalysis/AthenaROOTAccess/src/AuxStoreARA.cxx
@@ -16,7 +16,7 @@
#include "AuxStoreARA.h"
-#include "RootAuxVectorFactory.h"
+#include "AthContainersRoot/RootAuxVectorFactory.h"
#include "AthenaROOTAccess/branchSeek.h"
#include "AthContainers/tools/error.h"
@@ -183,7 +183,7 @@ AuxStoreARA::AuxStoreARA(IAuxBranches &container, long long entry, bool standalo
TClass* vec_class = TClass::GetClass (branch_type_name.c_str());
if (vec_class) {
- SG::IAuxTypeVectorFactory* fac = new RootAuxVectorFactory (vec_class);
+ SG::IAuxTypeVectorFactory* fac = new SG::RootAuxVectorFactory (vec_class);
r.addFactory (*ti, fac);
auxid = r.getAuxID(*ti, attr);
}
diff --git a/PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.cxx b/PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.cxx
deleted file mode 100644
index eddaaf772d51..000000000000
--- a/PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.cxx
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id$
-/**
- * @file AthenaROOTAccess/src/RootAuxVectorFactory.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date May, 2014
- * @brief Dynamic implementation of @c IAuxVectorFactory,
- * relying on root vector proxy.
- */
-
-
-#include "RootAuxVectorFactory.h"
-#include "AthContainers/tools/error.h"
-#include "TClass.h"
-#include "TVirtualCollectionProxy.h"
-#include "TROOT.h"
-#include <iostream>
-#include <stdexcept>
-
-
-namespace AthenaROOTAccess {
-
-
-/**
- * @brief Find the vector type associated with @c CL by looking
- * up the @c vector_type typedef.
- * @param cl The class for which to find the associated vector type.
- *
- * Given type CL, looks for a typedef CL::vector_type and returns the TClass
- * for that if found. Works for, eg, SG::PackedContainer.
- */
-TClass* lookupVectorType (TClass *cl)
-{
- std::string tname = cl->GetName();
- tname += "::vector_type";
- TDataType* typ = gROOT->GetType (tname.c_str());
- if (typ)
- return TClass::GetClass (typ->GetFullTypeName());
- return nullptr;
-}
-
-
-/**
- * @brief Constructor. Makes a new vector.
- * @param factory The factory object for this type.
- * @param size Initial size of the new vector.
- * @param capacity Initial capacity of the new vector.
- */
-RootAuxVector::RootAuxVector (const RootAuxVectorFactory* factory,
- size_t size, size_t /*capacity*/)
- : m_factory (factory)
-{
- TClass* vecClass = factory->vecClass();
- m_proxy = vecClass->GetCollectionProxy();
- m_obj = factory->objClass()->New ();
- m_vec = reinterpret_cast<char*> (m_obj) + factory->offset();
- this->resize (size);
-}
-
-
-/**
- * @brief Copy constructor.
- * @param other The vector to copy.
- */
-RootAuxVector::RootAuxVector (const RootAuxVector& other)
- : m_factory (other.m_factory),
- m_proxy (other.m_proxy)
-{
- m_obj = m_factory->objClass()->New ();
- m_vec = reinterpret_cast<char*> (m_obj) + m_factory->offset();
- size_t sz = other.size();
- this->resize (sz);
-
- if (sz > 0) {
- const RootUtils::Type& rootType = m_factory->rootType();
-
- const void* otherPtr = 0;
- {
- TVirtualCollectionProxy::TPushPop bind (m_proxy, other.m_vec);
- otherPtr = m_proxy->At(0);
- }
-
- rootType.copyRange (this->toPtr(), otherPtr, sz);
- }
-}
-
-
-/**
- * @brief Destructor.
- *
- * This will free the vector data.
- */
-RootAuxVector::~RootAuxVector()
-{
- m_factory->objClass()->Destructor (m_obj);
-}
-
-
-/**
- * @brief Make a copy of this vector.
- */
-SG::IAuxTypeVector* RootAuxVector::clone() const
-{
- return new RootAuxVector (*this);
-}
-
-
-/**
- * @brief Return a pointer to the start of the vector's data.
- */
-void* RootAuxVector::toPtr ()
-{
- TVirtualCollectionProxy::TPushPop bind (m_proxy, m_vec);
- if (m_proxy->Size() == 0)
- return 0;
- return m_proxy->At(0);
-}
-
-
-/**
- * @brief Return a pointer to the overall object.
- */
-void* RootAuxVector::toVector ()
-{
- return m_obj;
-}
-
-
-/**
- * @brief Return the size of the vector.
- */
-size_t RootAuxVector::size() const
-{
- TVirtualCollectionProxy::TPushPop bind (m_proxy, m_vec);
- return m_proxy->Size();
-}
-
-
-/**
- * @brief Change the size of the vector.
- * @param sz The new vector size.
- * Returns true if it is known that iterators have not been invalidated;
- * false otherwise.
- */
-bool RootAuxVector::resize (size_t sz)
-{
- TVirtualCollectionProxy::TPushPop bind (m_proxy, m_vec);
- const void* orig = this->toPtr();
- m_proxy->Allocate(sz, false);
- return this->toPtr() == orig;
-}
-
-
-/**
- * @brief Change the capacity of the vector.
- * @param sz The new vector capacity.
- */
-void RootAuxVector::reserve (size_t /*sz*/)
-{
-}
-
-
-/**
- * @brief Shift the elements of the vector.
- * @param pos The starting index for the shift.
- * @param offs The (signed) amount of the shift.
- *
- * This operation shifts the elements in the vectors for all
- * aux data items, to implement an insertion or deletion.
- * @c offs may be either positive or negative.
- *
- * If @c offs is positive, then the container is growing.
- * The container size should be increased by @c offs,
- * the element at @c pos moved to @c pos + @c offs,
- * and similarly for following elements.
- * The elements between @c pos and @c pos + @c offs should
- * be default-initialized.
- *
- * If @c offs is negative, then the container is shrinking.
- * The element at @c pos should be moved to @c pos + @c offs,
- * and similarly for following elements.
- * The container should then be shrunk by @c -offs elements
- * (running destructors as appropriate).
- */
-void RootAuxVector::shift (size_t pos, ptrdiff_t offs)
-{
- TVirtualCollectionProxy::TPushPop bind (m_proxy, m_vec);
- size_t eltsz = m_proxy->GetIncrement();
-
- const RootUtils::Type& rootType = m_factory->rootType();
-
- if (offs < 0) {
- if (-offs > static_cast<ptrdiff_t>(pos)) offs = -pos;
- char* beg = reinterpret_cast<char*>(m_proxy->At(0));
- rootType.copyRange (beg + eltsz*(pos+offs),
- beg + eltsz*pos,
- m_proxy->Size() - pos);
- m_proxy->Allocate (m_proxy->Size() + offs, false);
- }
- else if (offs > 0) {
- size_t oldsz = m_proxy->Size();
- m_proxy->Allocate (oldsz + offs, false);
- char* beg = reinterpret_cast<char*>(m_proxy->At(0));
- rootType.copyRange (beg + eltsz*(pos+offs),
- beg + eltsz*pos,
- m_proxy->Size() - pos - offs);
- rootType.clearRange (beg + eltsz*pos, offs);
- }
-}
-
-
-/**
- * @brief Insert elements into the vector via move semantics.
- * @param pos The starting index of the insertion.
- * @param beg Start of the range of elements to insert.
- * @param end End of the range of elements to insert.
- *
- * @c beg and @c end define a range of container elements, with length
- * @c len defined by the difference of the pointers divided by the
- * element size.
- *
- * The size of the container will be increased by @c len, with the elements
- * starting at @c pos copied to @c pos+len.
- *
- * The contents of the @c beg:end range will then be moved to our vector
- * starting at @c pos. This will be done via move semantics if possible;
- * otherwise, it will be done with a copy.
- *
- * Returns true if it is known that the vector's memory did not move,
- * false otherwise.
- */
-bool RootAuxVector::insertMove (size_t pos, void* beg, void* end)
-{
- TVirtualCollectionProxy::TPushPop bind (m_proxy, m_vec);
- size_t eltsz = m_proxy->GetIncrement();
- const void* orig = this->toPtr();
- const RootUtils::Type& rootType = m_factory->rootType();
-
- char* begp = reinterpret_cast<char*> (beg);
- char* endp = reinterpret_cast<char*> (end);
- size_t nelt = (endp-begp) / eltsz;
-
- shift (pos, nelt);
- // FIXME: want move, not copy.
- // But i don't seem to be able to call move operations through cling,
- // so just use copy for now.
- rootType.copyRange (reinterpret_cast<char*>(this->toPtr()) + pos*eltsz,
- beg, nelt);
- return this->toPtr() == orig;
-}
-
-
-/**
- * @brief Return the type of the complete object to be saved.
- *
- * For example, if the object is a @c std::vector, then we return
- * the @c type_info of the vector. But if we're holding
- * a @c PackedContainer, then we return the @c type_info of the
- * @c PackedContainer.
- *
- * Can return null if the operation is not supported. In that case,
- * I/O will use the type found from the variable registry.
- */
-const std::type_info* RootAuxVector::objType() const
-{
- return m_factory->objClass()->GetTypeInfo();
-}
-
-
-//==================================================================
-
-
-/**
- * @brief Constructor.
- * @param vecClass The @c TClass for the vector object.
- */
-RootAuxVectorFactory::RootAuxVectorFactory (TClass* objClass)
- : m_objClass (objClass),
- m_vecClass (objClass),
- m_offset (0)
-{
- TVirtualCollectionProxy* proxy = m_vecClass->GetCollectionProxy();
-
- if (!proxy) {
- TClass* vecClass = lookupVectorType (objClass);
- if (vecClass) {
- m_vecClass = vecClass;
- Int_t offs = objClass->GetBaseClassOffset (vecClass);
- if (offs >= 0) {
- m_offset = offs;
- proxy = vecClass->GetCollectionProxy();
- }
- else {
- ATHCONTAINERS_ERROR("RootAuxVectorFactory::RootAuxVectorFactory",
- std::string("Can't find vector base class in ") +
- objClass->GetName());
- }
- }
- }
-
- if (!proxy) {
- std::string err = "Can't find collection proxy for ";
- err += m_vecClass->GetName();
- throw std::runtime_error (err.c_str());
- }
-
- if (m_vecClass->GetTypeInfo() == 0) {
- ATHCONTAINERS_ERROR("RootAuxVectorFactory::RootAuxVectorFactory",
- std::string("No type_info available for class ") +
- m_vecClass->GetName() +
- std::string(". There is probably a missing dictionary. We will likely crash further on."));
- }
-
- TClass* eltClass = proxy->GetValueClass();
- if (eltClass)
- m_type.init (eltClass);
- else
- m_type.init (proxy->GetType());
-}
-
-
-/**
- * @brief Destructor.
- */
-RootAuxVectorFactory::~RootAuxVectorFactory()
-{
-}
-
-
-/**
- * @brief Create a vector object of this type.
- * @param size Initial size of the new vector.
- * @param capacity Initial capacity of the new vector.
- */
-SG::IAuxTypeVector*
-RootAuxVectorFactory::create (size_t size, size_t capacity) const
-{
- return new RootAuxVector (this, size, capacity);
-}
-
-
-/**
- * @brief Copy an element between vectors.
- * @param dst Pointer to the start of the destination vector's data.
- * @param dst_index Index of destination element in the vector.
- * @param src Pointer to the start of the source vector's data.
- * @param src_index Index of source element in the vector.
- *
- * @c dst and @ src can be either the same or different.
- */
-void RootAuxVectorFactory::copy (void* dst, size_t dst_index,
- const void* src, size_t src_index) const
-{
- m_type.assign (dst, dst_index, src, src_index);
-}
-
-
-/**
- * @brief Swap an element between vectors.
- * @param a Pointer to the start of the first vector's data.
- * @param aindex Index of the element in the first vector.
- * @param b Pointer to the start of the second vector's data.
- * @param bindex Index of the element in the second vector.
- *
- * @c a and @ b can be either the same or different.
- */
-void RootAuxVectorFactory::swap (void* a, size_t aindex,
- void* b, size_t bindex) const
-{
- m_type.swap (a, aindex, b, bindex);
-}
-
-
-/**
- * @brief Clear an element within a vector (static method).
- * @param dst Pointer to the start of the vector's data.
- * @param dst_index Index of the element in the vector.
- */
-void RootAuxVectorFactory::clear (void* dst, size_t dst_index) const
-{
- m_type.clear (dst, dst_index);
-}
-
-
-/**
- * @brief Return the size of an element of this vector type.
- */
-size_t RootAuxVectorFactory::getEltSize() const
-{
- return m_type.getSize();
-}
-
-
-/**
- * @brief Return the @c type_info of the overall object.
- */
-const std::type_info* RootAuxVectorFactory::tiVec() const
-{
- return m_objClass->GetTypeInfo();
-}
-
-
-/**
- * @brief True if the vectors created by this factory work by dynamic
- * emulation (via @c TVirtualCollectionProxy or similar); false
- * if the std::vector code is used directly.
- */
-bool RootAuxVectorFactory::isDynamic() const
-{
- return true;
-}
-
-
-} // namespace AthenaROOTAccess
diff --git a/PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.h b/PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.h
deleted file mode 100644
index 272bb9e8bac5..000000000000
--- a/PhysicsAnalysis/AthenaROOTAccess/src/RootAuxVectorFactory.h
+++ /dev/null
@@ -1,343 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id$
-/**
- * @file RootAuxVectorFactory.h
- * @author scott snyder <snyder@bnl.gov>
- * @date May, 2014
- * @brief Dynamic implementation of @c IAuxVectorFactory,
- * relying on root's vector proxy.
- *
- * This is basically the same as the corresponding class in RootStorageSvc.
- * Duplicated here due to the lack of any suitable common packages
- * with the correct dependencies.
- */
-
-
-#ifndef ATHENAROOTACCESS_ROOTAUXVECTORFACTORY_H
-#define ATHENAROOTACCESS_ROOTAUXVECTORFACTORY_H
-
-
-#include "AthContainersInterfaces/IAuxTypeVectorFactory.h"
-#include "AthContainersInterfaces/IAuxTypeVector.h"
-#include "RootUtils/Type.h"
-
-
-class TClass;
-class TVirtualCollectionProxy;
-
-
-namespace AthenaROOTAccess {
-
-
-class RootAuxVectorFactory;
-
-
-/**
- * @brief Dynamic implementation of @c IAuxTypeVector,
- * relying on root vector proxy.
- *
- * This is used for the case when we need to manipulate an aux data vector
- * present in an input data file but we have neither a proper template
- * instantiation for the factory (because the variable was never explicitly
- * referenced), nor can we find a dictionary entry for the factory.j
- *
- * This implementation works by relying entirely on the root
- * dictionary information.
- */
-class RootAuxVector
- : public SG::IAuxTypeVector
-{
-public:
- /**
- * @brief Constructor. Makes a new vector.
- * @param factory The factory object for this type.
- * @param size Initial size of the new vector.
- * @param capacity Initial capacity of the new vector.
- */
- RootAuxVector (const RootAuxVectorFactory* factory,
- size_t size,
- size_t capacity);
-
-
- /**
- * @brief Copy constructor.
- * @param other The vector to copy.
- */
- RootAuxVector (const RootAuxVector& other);
-
-
- // Disallow assignment.
- RootAuxVector& operator= (const RootAuxVector&) = delete;
-
-
- /**
- * @brief Destructor.
- *
- * This will free the vector data.
- */
- virtual ~RootAuxVector() override;
-
-
- /**
- * @brief Make a copy of this vector.
- */
- virtual SG::IAuxTypeVector* clone() const override;
-
-
- /**
- * @brief Return a pointer to the start of the vector's data.
- */
- virtual void* toPtr() override;
-
-
- /**
- * @brief Return a pointer to the overall object.
- */
- virtual void* toVector() override;
-
-
-
- /**
- * @brief Return the size of the vector.
- */
- virtual size_t size() const override;
-
-
- /**
- * @brief Change the size of the vector.
- * @param sz The new vector size.
- * Returns true if it is known that iterators have not been invalidated;
- * false otherwise.
- */
- virtual bool resize (size_t sz) override;
-
-
- /**
- * @brief Change the capacity of the vector.
- * @param sz The new vector capacity.
- */
- virtual void reserve (size_t sz) override;
-
-
- /**
- * @brief Shift the elements of the vector.
- * @param pos The starting index for the shift.
- * @param offs The (signed) amount of the shift.
- *
- * This operation shifts the elements in the vectors for all
- * aux data items, to implement an insertion or deletion.
- * @c offs may be either positive or negative.
- *
- * If @c offs is positive, then the container is growing.
- * The container size should be increased by @c offs,
- * the element at @c pos moved to @c pos + @c offs,
- * and similarly for following elements.
- * The elements between @c pos and @c pos + @c offs should
- * be default-initialized.
- *
- * If @c offs is negative, then the container is shrinking.
- * The element at @c pos should be moved to @c pos + @c offs,
- * and similarly for following elements.
- * The container should then be shrunk by @c -offs elements
- * (running destructors as appropriate).
- */
- virtual void shift (size_t pos, ptrdiff_t offs) override;
-
-
- /**
- * @brief Insert elements into the vector via move semantics.
- * @param pos The starting index of the insertion.
- * @param beg Start of the range of elements to insert.
- * @param end End of the range of elements to insert.
- *
- * @c beg and @c end define a range of container elements, with length
- * @c len defined by the difference of the pointers divided by the
- * element size.
- *
- * The size of the container will be increased by @c len, with the elements
- * starting at @c pos copied to @c pos+len.
- *
- * The contents of the @c beg:end range will then be moved to our vector
- * starting at @c pos. This will be done via move semantics if possible;
- * otherwise, it will be done with a copy.
- *
- * Returns true if it is known that the vector's memory did not move,
- * false otherwise.
- */
- virtual bool insertMove (size_t pos, void* beg, void* end) override;
-
-
- /**
- * @brief Return the type of the complete object to be saved.
- *
- * For example, if the object is a @c std::vector, then we return
- * the @c type_info of the vector. But if we're holding
- * a @c PackedContainer, then we return the @c type_info of the
- * @c PackedContainer.
- *
- * Can return null if the operation is not supported. In that case,
- * I/O will use the type found from the variable registry.
- */
- virtual const std::type_info* objType() const override;
-
-
-private:
- /// Pointer back to the factory class for this type.
- const RootAuxVectorFactory* m_factory;
-
- /// The collection proxy for the vector.
- TVirtualCollectionProxy* m_proxy;
-
- /// Pointer to the overall object itself.
- void* m_obj;
-
- /// Pointer to the vector object itself.
- void* m_vec;
-};
-
-
-/**
- * @brief Dynamic implementation of @c IAuxVectorFactory,
- * relying on root's vector proxy.
- *
- * This is used for the case when we need to manipulate an aux data vector
- * present in an input data file but we have neither a proper template
- * instantiation for the factory (because the variable was never explicitly
- * referenced), nor can we find a dictionary entry for the factory.j
- *
- * This implementation works by relying entirely on the root
- * dictionary information.
- *
- * We may either be dealing directly with an STL vector class, or with
- * embedded in another class (as for PackedContainer). Here, @a vecClass
- * is the class of the STL vector and @a objClass is the overall object
- * class. In the case of a direct STL vector, these are identical.
- */
-class RootAuxVectorFactory
- : public SG::IAuxTypeVectorFactory
-{
-public:
- /**
- * @brief Constructor.
- * @param vecClass The @c TClass for the vector object.
- */
- RootAuxVectorFactory (TClass* objClass);
-
-
- /**
- * @brief Destructor.
- */
- virtual ~RootAuxVectorFactory() override;
-
-
- /**
- * @brief Return the ROOT type wrapper.
- */
- const RootUtils::Type& rootType() const { return m_type; }
-
-
- /**
- * @brief Return the @c TClass for the overall object.
- */
- TClass* objClass() const { return m_objClass; }
-
-
- /**
- * @brief Return the @c TClass for the @c std::vector.
- */
- TClass* vecClass() const { return m_vecClass; }
-
-
- /**
- * @brief Return the offset of the vector within the object.
- */
- size_t offset() const { return m_offset; }
-
-
- /**
- * @brief Create a vector object of this type.
- * @param size Initial size of the new vector.
- * @param capacity Initial capacity of the new vector.
- */
- virtual SG::IAuxTypeVector* create (size_t size, size_t capacity) const
- override;
-
-
- /**
- * @brief Copy an element between vectors.
- * @param dst Pointer to the start of the destination vector's data.
- * @param dst_index Index of destination element in the vector.
- * @param src Pointer to the start of the source vector's data.
- * @param src_index Index of source element in the vector.
- *
- * @c dst and @ src can be either the same or different.
- */
- virtual void copy (void* dst, size_t dst_index,
- const void* src, size_t src_index) const override;
-
-
- /**
- * @brief Swap an element between vectors.
- * @param a Pointer to the start of the first vector's data.
- * @param aindex Index of the element in the first vector.
- * @param b Pointer to the start of the second vector's data.
- * @param bindex Index of the element in the second vector.
- *
- * @c a and @ b can be either the same or different.
- */
- virtual void swap (void* a, size_t aindex,
- void* b, size_t bindex) const override;
-
-
- /**
- * @brief Clear an element within a vector (static method).
- * @param dst Pointer to the start of the vector's data.
- * @param dst_index Index of the element in the vector.
- */
- virtual void clear (void* dst, size_t dst_index) const override;
-
-
- /**
- * @brief Return the size of an element of this vector type.
- */
- virtual size_t getEltSize() const override;
-
-
- /**
- * @brief Return the @c type_info of the overall object.
- */
- virtual const std::type_info* tiVec() const override;
-
-
- /**
- * @brief True if the vectors created by this factory work by dynamic
- * emulation (via @c TVirtualCollectionProxy or similar); false
- * if the std::vector code is used directly.
- */
- virtual bool isDynamic() const override;
-
-
-private:
- /// The @c TClass for the overall object.
- TClass* m_objClass;
-
- /// The @c TClass for the std::vector.
- TClass* m_vecClass;
-
- /// Offset of the STL vector within the overall object.
- size_t m_offset;
-
- /// Wrapper for the ROOT type of the element.
- RootUtils::Type m_type;
-};
-
-
-} // namespace AthenaROOTAccess
-
-
-#endif // not ATHENAROOTACCESS_ROOTAUXVECTORFACTORY_H
--
GitLab