From 48ab223a32c4d2561eca63ba99e48e2b5bed9b52 Mon Sep 17 00:00:00 2001 From: Peter Van Gemmeren <peter.van.gemmeren@cern.ch> Date: Tue, 5 Apr 2016 17:54:47 +0200 Subject: [PATCH] Get Placement from Athena (AthenaDBTestRec-00-08-02) 2016-04-05 Peter van Gemmeren <gemmeren@anl.gov> * tagging AthenaDBTestRec-00-08-02 * Get Placement from Athena (PersistentDataModel) 2016-03-14 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> * Removed the executable flag from all of the files that don't need it. * Tweaked the requirements file a bit to make the cmt2cmake.py script interpret it correctly. * Tagging as AthenaDBTestRec-00-08-01 --- .../AthenaDBTestRec/AthenaDBTestRecDataDict.h | 0 .../AthenaDBTestRec/AthenaDBTestRec/DetStoreDump.h | 0 .../AthenaDBTestRec/TestCoolRecFolder.h | 0 .../AthenaDBTestRec/TestCoolRecPoolData.h | 0 .../AthenaDBTestRec/TestCoolRecPoolDataColl.h | 0 .../AthenaDBTestRec/TestCoolRecRead.h | 0 .../AthenaDBTestRec/AthenaDBTestRec/selection.xml | 0 .../DatabaseTest/AthenaDBTestRec/cmt/requirements | 2 +- .../AthenaDBTestRec/config/ATLR_CalibStream_1.txt | 0 .../AthenaDBTestRec/config/MiniCDC_1.txt | 0 .../AthenaDBTestRec/config/MiniCDC_1_nodcs.txt | 0 .../AthenaDBTestRec/config/MiniCDC_2.txt | 0 .../AthenaDBTestRec/config/MiniCDC_3.txt | 0 .../AthenaDBTestRec/config/dcs_1_100_10c.txt | 0 .../AthenaDBTestRec/config/dcs_1_100_1c.txt | 0 .../AthenaDBTestRec/config/lar_calib.txt | 0 .../AthenaDBTestRec/config/mdt_calib.txt | 0 .../AthenaDBTestRec/config/mdt_calib2.txt | 0 .../AthenaDBTestRec/config/poolfile_test.txt | 0 .../DatabaseTest/AthenaDBTestRec/config/refc1301.txt | 0 .../DatabaseTest/AthenaDBTestRec/config/refc2001.txt | 0 .../DatabaseTest/AthenaDBTestRec/config/test128.txt | 0 .../DatabaseTest/AthenaDBTestRec/config/ti0c1301.txt | 0 .../DatabaseTest/AthenaDBTestRec/doc/mainpage.h | 0 .../AthenaDBTestRec/share/DetStoreDump_jobOptions.py | 0 .../AthenaDBTestRec/share/ReadRefDBExample.py | 0 .../AthenaDBTestRec/share/Read_refcond1.py | 0 .../AthenaDBTestRec/share/TestCoolRecExample.py | 0 .../DatabaseTest/AthenaDBTestRec/src/DBConnection.h | 0 .../DatabaseTest/AthenaDBTestRec/src/FolderInfo.h | 12 ++++++------ .../AthenaDBTestRec/src/TestCoolRecWriter.h | 0 .../AthenaDBTestRec/src/app/DBConnection.cxx | 0 .../AthenaDBTestRec/src/app/FolderInfo.cxx | 0 .../AthenaDBTestRec/src/app/TestCoolRecWriter.cxx | 10 +++++----- .../src/components/AthenaDBTestRec_entries.cxx | 0 .../src/components/AthenaDBTestRec_load.cxx | 0 .../AthenaDBTestRec/src/lib/DetStoreDump.cxx | 0 .../AthenaDBTestRec/src/lib/TestCoolRecFolder.cxx | 0 .../AthenaDBTestRec/src/lib/TestCoolRecPoolData.cxx | 0 .../AthenaDBTestRec/src/lib/TestCoolRecRead.cxx | 0 .../test/AthenaDBTestRec_TestConfig.xml | 0 41 files changed, 12 insertions(+), 12 deletions(-) mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/AthenaDBTestRecDataDict.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/DetStoreDump.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecFolder.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecRead.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/selection.xml mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/ATLR_CalibStream_1.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1_nodcs.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_2.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_3.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_10c.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_1c.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/lar_calib.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib2.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/poolfile_test.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc1301.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc2001.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/test128.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/config/ti0c1301.txt mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/share/DetStoreDump_jobOptions.py mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/share/Read_refcond1.py mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/DBConnection.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/TestCoolRecWriter.h mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/DBConnection.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/FolderInfo.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/DetStoreDump.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecFolder.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecPoolData.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecRead.cxx mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/test/AthenaDBTestRec_TestConfig.xml diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/AthenaDBTestRecDataDict.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/AthenaDBTestRecDataDict.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/DetStoreDump.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/DetStoreDump.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecFolder.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecFolder.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecRead.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecRead.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/selection.xml b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/selection.xml old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements b/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements old mode 100755 new mode 100644 index a7288cb9b9f4..1956dd63e16b --- a/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements +++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements @@ -42,7 +42,7 @@ apply_pattern poolcnv multChanTypes=" TestCoolRecPoolDataColl " files="-s=${Athe macro_append AthenaDBTestRecPoolCnv_dependencies " AthenaDBTestRecDataDict" -application TestCoolRecWriter "-s=app *.cxx" +application TestCoolRecWriter -s=app *.cxx macro_append TestCoolRecWriter_dependencies " AthenaDBTestRecLib" apply_pattern declare_joboptions files="*.py" diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ATLR_CalibStream_1.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ATLR_CalibStream_1.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1_nodcs.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_1_nodcs.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_2.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_2.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_3.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/MiniCDC_3.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_10c.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_10c.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_1c.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/dcs_1_100_1c.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/lar_calib.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/lar_calib.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib2.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/mdt_calib2.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/poolfile_test.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/poolfile_test.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc1301.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc1301.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc2001.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/refc2001.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/test128.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/test128.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ti0c1301.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/config/ti0c1301.txt old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/doc/mainpage.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/DetStoreDump_jobOptions.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/DetStoreDump_jobOptions.py old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/Read_refcond1.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/Read_refcond1.py old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/DBConnection.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/DBConnection.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h old mode 100755 new mode 100644 index bc2890613e46..4df38013b749 --- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h +++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/FolderInfo.h @@ -11,7 +11,7 @@ #include "DBConnection.h" #include "CoolKernel/IFolder.h" #include "CoolKernel/RecordSpecification.h" -#include "PersistencySvc/Placement.h" +#include "PersistentDataModel/Placement.h" class FolderInfo { public: @@ -52,10 +52,10 @@ class FolderInfo { int size() const; int period() const; const std::string tag() const; - pool::Placement* poolplace() const; + Placement* poolplace() const; // const set function (on mutable datamember) - void setpoolplace(pool::Placement* const poolplace) const; + void setpoolplace(Placement* const poolplace) const; void printSpec(const cool::IRecordSpecification& catrspec) const; @@ -74,7 +74,7 @@ class FolderInfo { std::string m_tag; bool m_paytable; - mutable pool::Placement* m_poolplace; + mutable Placement* m_poolplace; }; @@ -89,8 +89,8 @@ inline int FolderInfo::size() const {return m_size;} inline int FolderInfo::period() const {return m_period;} inline const std::string FolderInfo::tag() const {return m_tag;} -inline pool::Placement* FolderInfo::poolplace() const {return m_poolplace;} -inline void FolderInfo::setpoolplace(pool::Placement* const poolplace) const { +inline Placement* FolderInfo::poolplace() const {return m_poolplace;} +inline void FolderInfo::setpoolplace(Placement* const poolplace) const { m_poolplace=poolplace; } // helper functions diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/TestCoolRecWriter.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/TestCoolRecWriter.h old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/DBConnection.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/DBConnection.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/FolderInfo.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/FolderInfo.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx old mode 100755 new mode 100644 index 4660c6ef8ec3..f98e8aa31d66 --- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx +++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/app/TestCoolRecWriter.cxx @@ -14,12 +14,12 @@ #include <sstream> //POOL includes for POOL object write +#include "PersistentDataModel/Placement.h" #include "PersistentDataModel/Token.h" #include "PersistencySvc/ISession.h" #include "PersistencySvc/IPersistencySvcFactory.h" #include "PersistencySvc/IPersistencySvc.h" #include "PersistencySvc/DatabaseConnectionPolicy.h" -#include "PersistencySvc/Placement.h" #include "PersistencySvc/ITransaction.h" #include "StorageSvc/DbType.h" #include "StorageSvc/DbReflex.h" @@ -199,7 +199,7 @@ int TestCoolRecWriter::fillDB() { m_nrun=1; std::cout << "Writing single IOV for all runs" << std::endl; } - pool::Placement* placement=0; + Placement* placement=0; for (int irun=m_run0; irun<m_run0+m_nrun; ++irun) { std::cout << "Fill database for run " << irun << @@ -243,14 +243,14 @@ int TestCoolRecWriter::fillDB() { if (placement==0 || (m_poolmode & 1)) { std::cout << "Setup POOL for folder " << folderi->name() << std::endl; - placement=new pool::Placement; + placement=new Placement; std::ostringstream sfile; sfile << m_poolstem; if (m_poolmode & 1) sfile << fseq; if (m_poolmode & 2) sfile << "_run" << irun; sfile << ".root"; std::cout << "Setup new POOL file: " << sfile.str() << std::endl; - placement->setDatabase(sfile.str(),pool::DatabaseSpecification::PFN); + placement->setFileName(sfile.str()); placement->setTechnology(pool::ROOTTREE_StorageType.type()); placement->setContainerName("POOLContainer_TestCoolRecPoolData"); } @@ -375,7 +375,7 @@ int TestCoolRecWriter::fillDB() { const FolderInfo* folderi=*ifold; if (m_usepool && folderi->poolplace()!=0 && (m_poolmode &2)) { if ((m_poolmode & 1) || first) { - pool::Placement* placement=folderi->poolplace(); + Placement* placement=folderi->poolplace(); delete placement; folderi->setpoolplace(0); } else { diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/DetStoreDump.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/DetStoreDump.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecFolder.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecFolder.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecPoolData.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecPoolData.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecRead.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/lib/TestCoolRecRead.cxx old mode 100755 new mode 100644 diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/test/AthenaDBTestRec_TestConfig.xml b/AtlasTest/DatabaseTest/AthenaDBTestRec/test/AthenaDBTestRec_TestConfig.xml old mode 100755 new mode 100644 -- GitLab