'CMakeLists.txt' (DataModelTestDataRead-01-03-24)

	* Tagging DataModelTestDataRead-01-03-24.
	* src/xAODTestTypelessRead.cxx: Uninitialized variable.

2016-02-03  scott snyder  <snyder@bnl.gov>

	* Tagging DataModelTestDataRead-01-03-23.
	* DataModelTestDataRead/HView.h: Use VIEWVECTOR_CLASS_DEF.

2016-01-21  scott snyder  <snyder@bnl.gov>

	* Tagging DataModelTestDataRead-01-03-22.
	* Fix forgotten commit.
	* Tagging DataModelTestDataRead-01-03-21.
	* Tests for ViewVector and xAOD schema evolution.

2015-10-20  scott snyder  <snyder@bnl.gov>

	* Tagging DataModelTestDataRead-01-03-20.
	* Test a container with data members.
...
(Long ChangeLog diff - truncated)

Control/DataModelTest/DataModelTestDataRead/CMakeLists.txt

+################################################################################
+# Package: DataModelTestDataRead
+################################################################################
+
+# Declare the package name:
+atlas_subdir( DataModelTestDataRead )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthContainers
+                          Control/AthLinks
+                          Control/CLIDSvc
+                          Control/DataModelAthenaPool
+                          Control/DataModelTest/DataModelTestDataCommon
+                          Control/SGTools
+                          GaudiKernel
+                          PRIVATE
+                          Control/AthContainersInterfaces
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/CxxUtils
+                          Control/StoreGate
+                          Event/xAOD/xAODCore )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( DataModelTestDataReadLib
+                   src/*.cxx
+                   PUBLIC_HEADERS DataModelTestDataRead
+                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                   LINK_LIBRARIES AthContainers AthLinks DataModelTestDataCommon SGTools GaudiKernel DataModelAthenaPoolLib StoreGateLib SGtests
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils xAODCore )
+
+atlas_add_component( DataModelTestDataRead
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib DataModelTestDataCommon SGTools GaudiKernel AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests xAODCore DataModelTestDataReadLib )
+
+atlas_add_dictionary( DataModelTestDataReadDict
+                      DataModelTestDataRead/DataModelTestDataReadDict.h
+                      DataModelTestDataRead/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib DataModelTestDataCommon SGTools GaudiKernel AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests xAODCore DataModelTestDataReadLib
+                      NO_ROOTMAP_MERGE
+                      EXTRA_FILES src/dict/*.cxx
+                      ELEMENT_LINKS DataVector<DMTest::B> )
+

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/DataModelTestDataReadDict.h

@@ -24,6 +24,14 @@
 #include "DataModelTestDataRead/G.h"
 #include "DataModelTestDataRead/GVec.h"
 #include "DataModelTestDataRead/GAuxContainer.h"
+#include "DataModelTestDataRead/H.h"
+#include "DataModelTestDataRead/HVec.h"
+#include "DataModelTestDataRead/HView.h"
+#include "DataModelTestDataRead/HAuxContainer.h"
+#include "DataModelTestDataRead/versions/H_v1.h"
+#include "DataModelTestDataRead/versions/HVec_v1.h"
+#include "DataModelTestDataRead/versions/HView_v1.h"
+#include "DataModelTestDataRead/versions/HAuxContainer_v1.h"
 
 struct GCCXML_DUMMY_INSTANTIATION_DATAMODELTESTDATAREAD {
   ElementLink<DMTest::BVec> m_dum1;

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/G.h

@@ -29,5 +29,8 @@ typedef G_v1 G;
 } // namespace DMTest
 
 
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (DMTest::G, 9744, 1)
+
 
 #endif // not DATAMODELTESTDATAREAD_G_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/GAuxContainer.h

@@ -29,4 +29,8 @@ typedef GAuxContainer_v1 GAuxContainer;
 } // namespace DMTest
 
 
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (DMTest::GAuxContainer, 9742, 1)
+
+
 #endif // not DATAMODELTESTDATAREAD_GAUXCONTAINER_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/GVec.h

@@ -17,7 +17,6 @@
 #define DATAMODELTESTDATAREAD_GVEC_H
 
 
-
 #include "DataModelTestDataRead/versions/GVec_v1.h"
 
 
@@ -30,4 +29,8 @@ typedef GVec_v1 GVec;
 } // namespace DMTest
 
 
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (DMTest::GVec, 9741, 1)
+
+
 #endif // not DATAMODELTESTDATAREAD_GVEC_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/H.h

+// 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 DataModelTestDataRead/H.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_H_H
+#define DATAMODELTESTDATAREAD_H_H
+
+
+#include "DataModelTestDataRead/versions/H_v2.h"
+
+
+namespace DMTest {
+
+
+typedef H_v2 H;
+
+
+} // namespace DMTest
+
+
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (DMTest::H, 9784, 1)
+
+
+#endif // not DATAMODELTESTDATAREAD_H_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/HAuxContainer.h

+// 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 DataModelTestDataRead/HAuxContainer.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HAUXCONTAINER_H
+#define DATAMODELTESTDATAREAD_HAUXCONTAINER_H
+
+
+#include "DataModelTestDataRead/versions/HAuxContainer_v2.h"
+
+
+namespace DMTest {
+
+
+typedef HAuxContainer_v2 HAuxContainer;
+
+
+} // namespace DMTest
+
+
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (DMTest::HAuxContainer, 9782, 1)
+
+
+#endif // not DATAMODELTESTDATAREAD_HAUXCONTAINER_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/HVec.h

+// 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 DataModelTestDataRead/versions/HVec.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HVEC_H
+#define DATAMODELTESTDATAREAD_HVEC_H
+
+
+#include "DataModelTestDataRead/versions/HVec_v2.h"
+
+
+namespace DMTest {
+
+
+typedef HVec_v2 HVec;
+
+
+} // namespace DMTest
+
+
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (DMTest::HVec, 9781, 1)
+
+
+#endif // not DATAMODELTESTDATAREAD_HVEC_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/HView.h

+// 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 DataModelTestDataRead/versions/HView.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HVIEW_H
+#define DATAMODELTESTDATAREAD_HVIEW_H
+
+
+#include "DataModelTestDataRead/versions/HView_v2.h"
+
+
+namespace DMTest {
+
+
+typedef HView_v2 HView;
+
+
+} // namespace DMTest
+
+
+VIEWVECTOR_CLASS_DEF (DMTest::HView, 9787)
+
+
+#endif // not DATAMODELTESTDATAREAD_HVIEW_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/selection.xml

@@ -27,4 +27,16 @@
   <class name="DMTest::G_v1" id="0EA73CDC-FBD0-4241-9041-14D276B604CC"/>
   <class name="DMTest::GVec_v1" id="C532D340-6D58-444F-9C34-54C7A3D645AD"/>
   <class name="DMTest::GAuxContainer_v1" id="E70544A9-9D77-475E-AAD8-C5F967A44B66"/>
+
+  <class name="DMTest::H_v1" id="04CFD853-8DC0-4BAB-8886-BF16C79AAF76"/>
+  <class name="DMTest::HVec_v1" id="EAD7484F-1F40-4344-A667-BB9C47536BE6"/>
+  <class name="DMTest::HAuxContainer_v1" id="AFB5909C-1DF3-44AC-ABB5-9818204C2736"/>
+  <class name="DMTest::HView_v1" id="740C4020-F0A3-40B3-88E1-B15A8055DB64"/>
+  <class name="DMTest::HView_v1::Pers_t" id="55E513AA-EDF9-4860-945A-5B4E8C05C27A"/>
+
+  <class name="DMTest::H_v2" id="6DE535B9-1040-48F5-80D7-72BBD9C42BF3"/>
+  <class name="DMTest::HVec_v2" id="CD6C3074-425B-4C08-AF1C-43D7E8C84288"/>
+  <class name="DMTest::HAuxContainer_v2" id="2BDBFB04-C1C2-4B14-A977-3A61B8054700"/>
+  <class name="DMTest::HView_v2" id="17849966-6667-4732-A1C7-096FBC778CF3"/>
+  <class name="DMTest::HView_v2::Pers_t" id="802ED4CE-124D-4E5D-9C1E-47CE6297B453"/>
 </lcgdict>

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/GAuxContainer_v1.h

@@ -19,7 +19,6 @@
 
 #include "xAODCore/AuxContainerBase.h"
 #include "AthContainers/PackedContainer.h"
-#include "SGTools/CLASS_DEF.h"
 #include "SGTools/BaseInfo.h"
 #include <vector>
 
@@ -41,7 +40,6 @@ private:
 } // namespace DMTest
 
 
-CLASS_DEF (DMTest::GAuxContainer_v1, 9742, 1)
 SG_BASE (DMTest::GAuxContainer_v1, xAOD::AuxContainerBase);
 
 

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/GVec_v1.h

@@ -19,7 +19,6 @@
 
 #include "DataModelTestDataRead/versions/G_v1.h"
 #include "AthContainers/DataVector.h"
-#include "SGTools/CLASS_DEF.h"
 
 
 namespace DMTest {
@@ -31,8 +30,4 @@ typedef DataVector<G_v1> GVec_v1;
 } // namespace DMTest
 
 
-
-CLASS_DEF (DMTest::GVec_v1, 9741, 1)
-
-
 #endif // not DATAMODELTESTDATAREAD_GVEC_V1_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/G_v1.h

@@ -19,7 +19,6 @@
 
 
 #include "AthContainers/AuxElement.h"
-#include "SGTools/CLASS_DEF.h"
 #include "SGTools/BaseInfo.h"
 
 
@@ -38,7 +37,6 @@ public:
 } // namespace DMTest
 
 
-CLASS_DEF (DMTest::G_v1, 9744, 1)
 SG_BASE (DMTest::G_v1, SG::AuxElement);
 
 

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HAuxContainer_v1.h

+// 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 DataModelTestDataRead/versions/HAuxContainer_v1.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HAUXCONTAINER_V1_H
+#define DATAMODELTESTDATAREAD_HAUXCONTAINER_V1_H
+
+
+#include "xAODCore/AuxContainerBase.h"
+#include "SGTools/BaseInfo.h"
+#include <vector>
+
+
+namespace DMTest {
+
+
+class HAuxContainer_v1
+  : public xAOD::AuxContainerBase
+{
+public:
+  HAuxContainer_v1();
+
+private:
+  std::vector<int> anInt;
+};
+
+
+} // namespace DMTest
+
+
+SG_BASE (DMTest::HAuxContainer_v1, xAOD::AuxContainerBase);
+
+
+#endif // not DATAMODELTESTDATAREAD_HAUXCONTAINER_V1_H
+

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HAuxContainer_v2.h

+// 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 DataModelTestDataRead/versions/HAuxContainer_v2.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HAUXCONTAINER_V2_H
+#define DATAMODELTESTDATAREAD_HAUXCONTAINER_V2_H
+
+
+#include "xAODCore/AuxContainerBase.h"
+#include "AthContainers/PackedContainer.h"
+#include "SGTools/BaseInfo.h"
+#include <vector>
+
+
+namespace DMTest {
+
+
+class HAuxContainer_v2
+  : public xAOD::AuxContainerBase
+{
+public:
+  HAuxContainer_v2();
+
+private:
+  std::vector<float> aFloat;
+};
+
+
+} // namespace DMTest
+
+
+SG_BASE (DMTest::HAuxContainer_v2, xAOD::AuxContainerBase);
+
+
+#endif // not DATAMODELTESTDATAREAD_HAUXCONTAINER_V2_H
+

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HVec_v1.h

+// 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 DataModelTestDataRead/versions/HVec_v1.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HVEC_V1_H
+#define DATAMODELTESTDATAREAD_HVEC_V1_H
+
+
+#include "DataModelTestDataRead/versions/H_v1.h"
+#include "AthContainers/DataVector.h"
+
+
+namespace DMTest {
+
+
+typedef DataVector<H_v1> HVec_v1;
+
+
+} // namespace DMTest
+
+
+#endif // not DATAMODELTESTDATAREAD_HVEC_V1_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HVec_v2.h

+// 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 DataModelTestDataRead/versions/HVec_v2.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HVEC_V2_H
+#define DATAMODELTESTDATAREAD_HVEC_V2_H
+
+
+#include "DataModelTestDataRead/versions/H_v2.h"
+#include "AthContainers/DataVector.h"
+
+
+namespace DMTest {
+
+
+typedef DataVector<H_v2> HVec_v2;
+
+
+} // namespace DMTest
+
+
+#endif // not DATAMODELTESTDATAREAD_HVEC_V2_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HView_v1.h

+// 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 DataModelTestDataRead/versions/HView_v1.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HVIEW_V1_H
+#define DATAMODELTESTDATAREAD_HVIEW_V1_H
+
+
+#include "DataModelTestDataRead/versions/HVec_v1.h"
+#include "AthContainers/ViewVector.h"
+
+
+namespace DMTest {
+
+
+typedef ViewVector<HVec_v1> HView_v1;
+
+
+} // namespace DMTest
+
+
+#endif // not DATAMODELTESTDATAREAD_HVIEW_V1_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HView_v2.h

+// 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 DataModelTestDataRead/versions/HView_v2.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_HVIEW_V2_H
+#define DATAMODELTESTDATAREAD_HVIEW_V2_H
+
+
+#include "DataModelTestDataRead/versions/HVec_v2.h"
+#include "AthContainers/ViewVector.h"
+
+
+namespace DMTest {
+
+
+typedef ViewVector<HVec_v2> HView_v2;
+
+
+} // namespace DMTest
+
+
+#endif // not DATAMODELTESTDATAREAD_HVIEW_V2_H

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/H_v1.h

+// 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 DataModelTestDataRead/versions/H_v1.h
+ * @file H_v1.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2016
+ * @brief Test for xAOD schema evolution.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_H_V1_H
+#define DATAMODELTESTDATAREAD_H_V1_H
+
+
+#include "AthContainers/AuxElement.h"
+#include "SGTools/BaseInfo.h"
+
+
+namespace DMTest {
+
+
+class H_v1
+  : public SG::AuxElement
+{
+public:
+  int anInt() const;
+  void setAnInt (int i);
+};
+
+
+} // namespace DMTest
+
+
+SG_BASE (DMTest::H_v1, SG::AuxElement);
+
+
+#endif // not DATAMODELTESTDATAREAD_H_V1_H