diff --git a/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/GAuxContainer_v1.h b/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/GAuxContainer_v1.h index 26941720ba2c3e30029585150f9c247ece980618..a0a98564e85dff60deca67208851f20c9a1ab23d 100644 --- a/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/GAuxContainer_v1.h +++ b/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/GAuxContainer_v1.h @@ -1,10 +1,7 @@ // 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 + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ - -// $Id$ /** * @file DataModelTestDataWrite/versions/GAuxContainer_v1.h * @author scott snyder <snyder@bnl.gov> @@ -33,6 +30,8 @@ public: private: std::vector<int> anInt; + std::vector<double> gFloat; + std::vector<std::vector<double> > gvFloat; }; diff --git a/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/G_v1.h b/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/G_v1.h index 6fd73b9e7ac7282c208068437ebcba5646ec9cc3..beb4fc9b810806d80368ac86594a29ab616c969d 100644 --- a/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/G_v1.h +++ b/Control/DataModelTest/DataModelTestDataWrite/DataModelTestDataWrite/versions/G_v1.h @@ -1,10 +1,8 @@ // 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 + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ - -// $Id$ /** * @file DataModelTestDataWrite/versions/G_v1.h * @file G_v1.h @@ -31,6 +29,10 @@ class G_v1 public: int anInt() const; void setAnInt (int i); + double gFloat() const; + void setgFloat (double d); + const std::vector<double>& gvFloat() const; + void setgvFloat (const std::vector<double>& v); }; diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/GAuxContainer_v1.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/GAuxContainer_v1.cxx index ff16c57cfe207d3c2a253e11516bc962f4a90c9f..527a5e32c97e383adbb37968d8030f0f83da7307 100644 --- a/Control/DataModelTest/DataModelTestDataWrite/src/GAuxContainer_v1.cxx +++ b/Control/DataModelTest/DataModelTestDataWrite/src/GAuxContainer_v1.cxx @@ -1,8 +1,6 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ - -// $Id$ /** * @file DataModelTestDataWrite/src/GAuxContainer_v1.cxx * @author scott snyder <snyder@bnl.gov> @@ -23,6 +21,8 @@ GAuxContainer_v1::GAuxContainer_v1() : xAOD::AuxContainerBase() { AUX_VARIABLE (anInt); + AUX_VARIABLE (gFloat); + AUX_VARIABLE (gvFloat); } diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/G_v1.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/G_v1.cxx index 99d4896b0ac1455a1bb7192bb91c5dbea2768730..ba8927711cc995eaed9f1c2771d246b73fe508d4 100644 --- a/Control/DataModelTest/DataModelTestDataWrite/src/G_v1.cxx +++ b/Control/DataModelTest/DataModelTestDataWrite/src/G_v1.cxx @@ -1,8 +1,6 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ - -// $Id$ /** * @file DataModelTestDataWrite/src/G_v1.cxx * @author scott snyder <snyder@bnl.gov> @@ -18,7 +16,9 @@ namespace DMTest { -AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (G_v1, int, anInt, setAnInt) +AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (G_v1, int, anInt, setAnInt) +AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (G_v1, double, gFloat, setgFloat) +AUXSTORE_OBJECT_SETTER_AND_GETTER (G_v1, std::vector<double>, gvFloat, setgvFloat) } // namespace DMTest diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx index b2a29cb13c9e78624f56244107378fdd9df6e964..41d4ab6aff22a89eedda4d1e67f22e1251fb72bc 100644 --- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx +++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ // $Id$ @@ -112,6 +112,12 @@ StatusCode xAODTestWrite::execute (const EventContext& ctx) const gcont->push_back (new DMTest::G); G& g = *gcont->back(); g.setAnInt (count * 700 + i+1); + g.setgFloat (count * 700 + 100 + i+0.5); + std::vector<double> v; + for (int j=0; j<i; j++) { + v.push_back (count * 700 + 100*j + i+0.5); + } + g.setgvFloat (v); } SG::WriteHandle<DMTest::GVec> gvec (m_gvecKey, ctx);