Merge branch 'cinfoRead.DataModelTestDataRead-20171007' into 'master'

DataModelTest: Refactor reading algorithm.

See merge request !5253

Former-commit-id: 1ded8d4d

Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py

@@ -63,15 +63,19 @@ theApp.EvtMax = 20
 
 from DataModelTestDataRead.DataModelTestDataReadConf import \
      DMTest__xAODTestReadCVec, \
+     DMTest__xAODTestReadCInfo, \
      DMTest__xAODTestReadCView, \
      DMTest__xAODTestReadHVec, \
      DMTest__xAODTestRead
 topSequence += DMTest__xAODTestReadCVec ("xAODTestReadCVec")
+topSequence += DMTest__xAODTestReadCInfo ("xAODTestCInfo")
 topSequence += DMTest__xAODTestRead ("xAODTestRead")
 topSequence += DMTest__xAODTestReadCView ('xAODTestReadCView')
 topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec")
 topSequence += DMTest__xAODTestReadCVec ("xAODTestReadCVec_copy",
                                          CVecKey = "copy_cvec")
+topSequence += DMTest__xAODTestReadCInfo ("xAODTestReadCInfo_copy",
+                                          CInfoKey = "copy_cinfo")
 topSequence += DMTest__xAODTestRead ("xAODTestRead_copy",
                                      ReadPrefix = "copy_")
 topSequence += DMTest__xAODTestReadCView ("xAODTestReadCView_copy",
@@ -81,6 +85,8 @@ topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec_copy",
                                          HViewKey = "copy_hview")
 topSequence += DMTest__xAODTestReadCVec ("xAODTestReadCVec_scopy",
                                          CVecKey = "scopy_cvec")
+topSequence += DMTest__xAODTestReadCInfo ("xAODTestReadCInfo_scopy",
+                                          CInfoKey = "scopy_cinfo")
 topSequence += DMTest__xAODTestRead ("xAODTestRead_scopy",
                                      ReadPrefix = "scopy_")
 topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec_scopy",

Control/DataModelTest/DataModelRunTests/share/xAODTestRead2b_jo.py

@@ -43,16 +43,20 @@ theApp.EvtMax = 20
 
 from DataModelTestDataRead.DataModelTestDataReadConf import \
      DMTest__xAODTestReadCVec, \
+     DMTest__xAODTestReadCInfo, \
      DMTest__xAODTestReadCView, \
      DMTest__xAODTestReadHVec, \
      DMTest__xAODTestRead
 
 topSequence += DMTest__xAODTestReadCVec ("xAODTestReadCVec")
+topSequence += DMTest__xAODTestReadCInfo ("xAODTestReadCInfo")
 topSequence += DMTest__xAODTestRead ("xAODTestRead")
 topSequence += DMTest__xAODTestReadCView ('xAODTestReadCView')
 topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec")
 topSequence += DMTest__xAODTestReadCVec ("xAODTestReadCVec_scopy",
                                          CVecKey = 'scopy_cvec')
+topSequence += DMTest__xAODTestReadCInfo ("xAODTestReadCInfo_scopy",
+                                          CInfoKey = 'scopy_cinfo')
 topSequence += DMTest__xAODTestRead ("xAODTestRead_scopy",
                                      ReadPrefix = 'scopy_')
 topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec_scopy",

Control/DataModelTest/DataModelRunTests/share/xAODTestRead3_jo.py

@@ -43,15 +43,19 @@ theApp.EvtMax = 20
 
 from DataModelTestDataRead.DataModelTestDataReadConf import \
      DMTest__xAODTestReadCVec, \
+     DMTest__xAODTestReadCInfo, \
      DMTest__xAODTestReadCView, \
      DMTest__xAODTestReadHVec, \
      DMTest__xAODTestRead
 topSequence += DMTest__xAODTestReadCVec ("xAODTestReadCVec")
+topSequence += DMTest__xAODTestReadCInfo ("xAODTestReadCInfo")
 topSequence += DMTest__xAODTestRead ("xAODTestRead")
 topSequence += DMTest__xAODTestReadCView ('xAODTestReadCView')
 topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec")
 topSequence += DMTest__xAODTestReadCVec ("xAODTestReadCVec_copy",
                                      CVecKey = "copy_cvec")
+topSequence += DMTest__xAODTestReadCInfo ("xAODTestReadCInfo_copy",
+                                          CInfoKey = "copy_cinfo")
 topSequence += DMTest__xAODTestRead ("xAODTestRead_copy",
                                      ReadPrefix = "copy_")
 topSequence += DMTest__xAODTestReadCView ("xAODTestReadCView_copy",

Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py

@@ -105,6 +105,7 @@ from DataModelTestDataCommon.DataModelTestDataCommonConf import \
      DMTest__xAODTestDecor
 from DataModelTestDataRead.DataModelTestDataReadConf import \
      DMTest__xAODTestReadCVec, \
+     DMTest__xAODTestReadCInfo, \
      DMTest__xAODTestRead, \
      DMTest__xAODTestReadCView, \
      DMTest__xAODTestReadHVec, \
@@ -114,7 +115,8 @@ from DataModelTestDataRead.DataModelTestDataReadConf import \
 
 topSequence += DMTest__xAODTestReadCVec ('xAODTestReadCVec',
                                          WriteKey = 'copy_cvec')
-
+topSequence += DMTest__xAODTestReadCInfo ('xAODTestReadCInfo',
+                                          WriteKey = 'copy_cinfo')
 topSequence += DMTest__xAODTestRead ('xAODTestRead',
                                      WritePrefix = 'copy_')
 topSequence += DMTest__xAODTestReadCView ('xAODTestReadCView',

Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_entries.cxx

@@ -14,6 +14,7 @@
 #include "../AuxDataTestTypelessRead.h"
 #include "../xAODTestRead.h"
 #include "../xAODTestReadCVec.h"
+#include "../xAODTestReadCInfo.h"
 #include "../xAODTestReadCView.h"
 #include "../xAODTestReadHVec.h"
 #include "../xAODTestFilterCVec.h"
@@ -29,6 +30,7 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, AuxDataTestClearDecor)
 DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, AuxDataTestTypelessRead)
 DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, xAODTestRead)
 DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, xAODTestReadCVec)
+DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, xAODTestReadCInfo)
 DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, xAODTestReadCView)
 DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, xAODTestReadHVec)
 DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, xAODTestFilterCVec)

Control/DataModelTest/DataModelTestDataRead/src/xAODTestRead.cxx

@@ -13,24 +13,15 @@
 
 #include "xAODTestRead.h"
 #include "DataModelTestDataCommon/CVec.h"
-//#include "DataModelTestDataCommon/CView.h"
 #include "DataModelTestDataCommon/CVecWithData.h"
 #include "DataModelTestDataCommon/C.h"
 #include "DataModelTestDataCommon/CAuxContainer.h"
 #include "DataModelTestDataCommon/CTrigAuxContainer.h"
-#include "DataModelTestDataCommon/CInfoAuxContainer.h"
-//#include "DataModelTestDataRead/HVec.h"
-//#include "DataModelTestDataRead/H.h"
-//#include "DataModelTestDataRead/HAuxContainer.h"
-//#include "DataModelTestDataRead/HView.h"
 #include "DataModelTestDataRead/GVec.h"
 #include "DataModelTestDataRead/G.h"
 #include "DataModelTestDataRead/GAuxContainer.h"
 #include "AthContainers/AuxTypeRegistry.h"
-#include "AthLinks/ElementLink.h"
 #include "AthenaKernel/errorcheck.h"
-#include "CxxUtils/StrFormat.h"
-#include "CxxUtils/make_unique.h"
 #include <memory>
 
 
@@ -69,52 +60,17 @@ StatusCode xAODTestRead::execute()
   ++m_count;
   std::cout << m_count << "\n";
 
-  static C::Accessor<int> anInt2 ("anInt2");
-  static C::Accessor<int> anInt10 ("anInt10");
-  static C::Accessor<int> dInt1 ("dInt1");
-  static C::Accessor<unsigned int> dpInt1 ("dpInt1");
-  static C::Accessor<std::vector<float> > dpvFloat ("dpvFloat");
-  static C::Accessor<int> dInt100 ("dInt100");
-  static C::Accessor<int> dInt150 ("dInt150");
-  static C::Accessor<int> dInt200 ("dInt200");
-  static C::Accessor<int> dInt250 ("dInt250");
-  static C::Accessor<ElementLink<DMTest::CVec> > cEL ("cEL");
+  static const C::Accessor<int> anInt2 ("anInt2");
+  static const C::Accessor<int> anInt10 ("anInt10");
+  static const C::Accessor<int> dInt1 ("dInt1");
+  static const C::Accessor<int> dInt100 ("dInt100");
+  static const C::Accessor<int> dInt150 ("dInt150");
+  static const C::Accessor<int> dInt200 ("dInt200");
 
   // Ordering of auxid is not reliable.  Sort by name.
   const SG::AuxTypeRegistry& r = SG::AuxTypeRegistry::instance();
   std::vector<std::string> names;
 
-  const C* cinfo = 0;
-  CHECK( evtStore()->retrieve (cinfo, m_readPrefix + "cinfo") );
-
-  names.clear();
-  for (SG::auxid_t auxid : cinfo->getAuxIDs())
-    names.push_back (r.getName(auxid));
-  std::sort (names.begin(), names.end());
-  std::cout << "cinfo aux items: ";
-  for (const std::string& n : names)
-    std::cout << n << " ";
-  std::cout << "\n";
-
-  std::cout << "cinfo "
-            << " anInt1 " << cinfo->anInt()
-            << " aFloat: " << cinfo->aFloat()
-            << " anInt2: " << anInt2(*cinfo)
-            << " dInt1: " << dInt1(*cinfo)
-            << " cEL: " << cEL(*cinfo).dataID()
-            << "[" << cEL(*cinfo).index() << "]";
-  if (dInt100.isAvailable(*cinfo))
-    std::cout << " dInt100: " << dInt100(*cinfo);
-  if (dInt150.isAvailable(*cinfo))
-    std::cout << " dInt150: " << dInt150(*cinfo);
-  if (dInt200.isAvailable(*cinfo))
-    std::cout << " dInt200: " << dInt200(*cinfo);
-  if (dInt250.isAvailable(*cinfo))
-    std::cout << " dInt250: " << dInt250(*cinfo);
-  if (anInt10.isAvailable(*cinfo))
-    std::cout << " anInt10: " << anInt10(*cinfo);
-  std::cout << "\n";
-
   const CVec* ctrig = 0;
   CHECK( evtStore()->retrieve (ctrig, m_readPrefix + "ctrig") );
 
@@ -164,16 +120,8 @@ StatusCode xAODTestRead::execute()
   if (!m_writePrefix.empty()) {
     // Passing this as the third arg of record will make the object const.
     bool LOCKED = false;
-    auto cnew = CxxUtils::make_unique<C>();
-    auto info_store = CxxUtils::make_unique<CInfoAuxContainer>();
-    cnew->setStore (info_store.get());
-    *cnew = *cinfo;
-
-    CHECK (evtStore()->record (std::move(cnew), m_writePrefix + "cinfo", LOCKED));
-    CHECK (evtStore()->record (std::move(info_store), m_writePrefix + "cinfoAux.", LOCKED));
-
-    auto ctrignew = CxxUtils::make_unique<CVec>();
-    auto trig_store = CxxUtils::make_unique<CTrigAuxContainer>();
+    auto ctrignew = std::make_unique<CVec>();
+    auto trig_store = std::make_unique<CTrigAuxContainer>();
     ctrignew->setStore (trig_store.get());
     for (size_t i = 0; i < ctrig->size(); i++) {
       ctrignew->push_back (new C);
@@ -183,8 +131,8 @@ StatusCode xAODTestRead::execute()
     CHECK (evtStore()->record (std::move(trig_store), m_writePrefix + "ctrigAux.", LOCKED));
 
     if (gvec) {
-      auto gvecnew = CxxUtils::make_unique<GVec>();
-      auto gstore = CxxUtils::make_unique<GAuxContainer>();
+      auto gvecnew = std::make_unique<GVec>();
+      auto gstore = std::make_unique<GAuxContainer>();
       gvecnew->setStore (gstore.get());
       for (size_t i = 0; i < gvec->size(); i++) {
         gvecnew->push_back (new G);
@@ -223,8 +171,8 @@ StatusCode xAODTestRead::read_cvec_with_data() const
     // Passing this as the third arg of record will make the object const.
     bool LOCKED = false;
 
-    auto vecnew = CxxUtils::make_unique<CVecWithData>();
-    auto store = CxxUtils::make_unique<CAuxContainer>();
+    auto vecnew = std::make_unique<CVecWithData>();
+    auto store = std::make_unique<CAuxContainer>();
     vecnew->setStore (store.get());
     for (size_t i = 0; i < vec->size(); i++) {
       vecnew->push_back (new C);
@@ -262,7 +210,7 @@ StatusCode xAODTestRead::read_cview() const
 
   if (!m_writePrefix.empty()) {
     bool LOCKED = false;
-    CHECK (evtStore()->record (CxxUtils::make_unique<CView> (*cview),
+    CHECK (evtStore()->record (std::make_unique<CView> (*cview),
                                m_writePrefix + "cview", LOCKED));
   }
 

Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx

+/*
+ *  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration.
+ */
+// $Id$
+/**
+ * @file DataModelTestDataRead/src/xAODTestReadCInfo.h
+ * @author snyder@bnl.gov
+ * @date Sep, 2017
+ * @brief Algorithm to test reading xAOD cinfo data.
+ */
+
+
+#include "xAODTestReadCInfo.h"
+#include "DataModelTestDataCommon/C.h"
+#include "DataModelTestDataCommon/CVec.h"
+#include "DataModelTestDataCommon/CInfoAuxContainer.h"
+#include "AthContainers/AuxTypeRegistry.h"
+#include "AthLinks/ElementLink.h"
+#include "AthenaKernel/errorcheck.h"
+
+
+namespace DMTest {
+
+
+/**
+ * @brief Constructor.
+ * @param name The algorithm name.
+ * @param svc The service locator.
+ */
+xAODTestReadCInfo::xAODTestReadCInfo (const std::string &name,
+                                      ISvcLocator *pSvcLocator)
+  : AthReentrantAlgorithm (name, pSvcLocator)
+{
+  declareProperty ("CInfoKey", m_cinfoKey = "cinfo");
+  declareProperty ("WriteKey", m_writeKey);
+}
+  
+
+/**
+ * @brief Algorithm initialization; called at the beginning of the job.
+ */
+StatusCode xAODTestReadCInfo::initialize()
+{
+  ATH_CHECK( m_cinfoKey.initialize() );
+  if (!m_writeKey.key().empty())
+    ATH_CHECK( m_writeKey.initialize() );
+  return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Algorithm event processing.
+ */
+StatusCode xAODTestReadCInfo::execute_r (const EventContext& ctx) const
+{
+  static const C::Accessor<int> anInt2 ("anInt2");
+  static const C::Accessor<int> anInt10 ("anInt10");
+  static const C::Accessor<int> dInt1 ("dInt1");
+  static const C::Accessor<unsigned int> dpInt1 ("dpInt1");
+  static const C::Accessor<std::vector<float> > dpvFloat ("dpvFloat");
+  static const C::Accessor<int> dInt100 ("dInt100");
+  static const C::Accessor<int> dInt150 ("dInt150");
+  static const C::Accessor<int> dInt200 ("dInt200");
+  static const C::Accessor<int> dInt250 ("dInt250");
+  static const C::Accessor<ElementLink<DMTest::CVec> > cEL ("cEL");
+
+  // Ordering of auxid is not reliable.  Sort by name.
+  const SG::AuxTypeRegistry& r = SG::AuxTypeRegistry::instance();
+  std::vector<std::string> names;
+
+  SG::ReadHandle<DMTest::C> cinfo (m_cinfoKey, ctx);
+
+  names.clear();
+  for (SG::auxid_t auxid : cinfo->getAuxIDs())
+    names.push_back (r.getName(auxid));
+  std::sort (names.begin(), names.end());
+  std::cout << "cinfo aux items: ";
+  for (const std::string& n : names)
+    std::cout << n << " ";
+  std::cout << "\n";
+
+  std::cout << "cinfo "
+            << " anInt1 " << cinfo->anInt()
+            << " aFloat: " << cinfo->aFloat()
+            << " anInt2: " << anInt2(*cinfo)
+            << " dInt1: " << dInt1(*cinfo)
+            << " cEL: " << cEL(*cinfo).dataID()
+            << "[" << cEL(*cinfo).index() << "]";
+  if (dInt100.isAvailable(*cinfo))
+    std::cout << " dInt100: " << dInt100(*cinfo);
+  if (dInt150.isAvailable(*cinfo))
+    std::cout << " dInt150: " << dInt150(*cinfo);
+  if (dInt200.isAvailable(*cinfo))
+    std::cout << " dInt200: " << dInt200(*cinfo);
+  if (dInt250.isAvailable(*cinfo))
+    std::cout << " dInt250: " << dInt250(*cinfo);
+  if (anInt10.isAvailable(*cinfo))
+    std::cout << " anInt10: " << anInt10(*cinfo);
+  std::cout << "\n";
+
+  if (!m_writeKey.key().empty()) {
+    auto cnew = std::make_unique<DMTest::C>();
+    auto info_store = std::make_unique<DMTest::CInfoAuxContainer>();
+    cnew->setStore (info_store.get());
+    *cnew = *cinfo;
+
+    SG::WriteHandle<DMTest::C> writevec (m_writeKey, ctx);
+    ATH_CHECK( writevec.record(std::move(cnew), std::move(info_store)) );
+  }
+
+  return StatusCode::SUCCESS;
+}
+
+
+} // namespace DMTest
+

Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.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/xAODTestReadCInfo.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Sep, 2017
+ * @brief Algorithm to test reading xAOD cinfo data.
+ */
+
+
+#ifndef DATAMODELTESTDATAREAD_XAODTESTREADCINFO_H
+#define DATAMODELTESTDATAREAD_XAODTESTREADCINFO_H
+
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "DataModelTestDataCommon/C.h"
+#include "DataModelTestDataCommon/CAuxContainer.h"
+
+
+namespace DMTest {
+
+
+/**
+ * @brief Algorithm to test reading xAOD data.
+ */
+class xAODTestReadCInfo
+  : public AthReentrantAlgorithm
+{
+public:
+  /**
+   * @brief Constructor.
+   * @param name The algorithm name.
+   * @param svc The service locator.
+   */
+  xAODTestReadCInfo (const std::string &name, ISvcLocator *pSvcLocator);
+  
+
+  /**
+   * @brief Algorithm initialization; called at the beginning of the job.
+   */
+  virtual StatusCode initialize();
+
+
+  /**
+   * @brief Algorithm event processing.
+   */
+  virtual StatusCode execute_r (const EventContext& ctx) const;
+
+
+private:
+  SG::ReadHandleKey<DMTest::C>  m_cinfoKey;
+  SG::WriteHandleKey<DMTest::C> m_writeKey;
+};
+
+
+} // namespace DMTest
+
+
+#endif // not DATAMODELTESTDATAREAD_XAODTESTREADCINFO_H