diff --git a/LumiBlock/LumiBlockComps/CMakeLists.txt b/LumiBlock/LumiBlockComps/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6578270449e8abff67760cff090aceff6d01cec6
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/CMakeLists.txt
@@ -0,0 +1,54 @@
+################################################################################
+# Package: LumiBlockComps
+################################################################################
+
+# Declare the package name:
+atlas_subdir( LumiBlockComps )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/AthenaBaseComps
+ Control/AthenaKernel
+ Control/StoreGate
+ Database/AthenaPOOL/AthenaPoolKernel
+ Database/CoolLumiUtilities
+ Event/xAOD/xAODLuminosity
+ GaudiKernel
+ LumiBlock/LumiCalc
+ PRIVATE
+ DataQuality/GoodRunsLists
+ Database/AthenaPOOL/AthenaPoolUtilities
+ Database/AthenaPOOL/DBDataModel
+ Database/CoraCool
+ Event/EventInfo )
+
+# External dependencies:
+find_package( COOL COMPONENTS CoolKernel )
+find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( LumiBlockCompsLib
+ src/*.cxx
+ Root/*.cxx
+ PUBLIC_HEADERS LumiBlockComps
+ INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel xAODLuminosity GaudiKernel StoreGateLib SGtests CoolLumiUtilitiesLib LumiBlockCoolQuery GoodRunsListsLib
+ PRIVATE_LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} AthenaPoolUtilities DBDataModel EventInfo )
+
+atlas_add_component( LumiBlockComps
+ src/components/*.cxx
+ INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests CoolLumiUtilitiesLib xAODLuminosity GaudiKernel LumiBlockCoolQuery GoodRunsListsLib AthenaPoolUtilities DBDataModel EventInfo LumiBlockCompsLib )
+
+atlas_add_dictionary( LumiBlockCompsDict
+ LumiBlockComps/LumiBlockCompsDict.h
+ LumiBlockComps/selection.xml
+ INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests CoolLumiUtilitiesLib xAODLuminosity GaudiKernel LumiBlockCoolQuery GoodRunsListsLib AthenaPoolUtilities DBDataModel EventInfo LumiBlockCompsLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+
diff --git a/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMetaDataTool.h b/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMetaDataTool.h
index 720bbdc682cc8e93f61a278fb7dd139180a6f5c7..193704b6736daf0646bd66e62e4040874a4fe8d4 100644
--- a/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMetaDataTool.h
+++ b/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMetaDataTool.h
@@ -27,8 +27,8 @@ class ILumiBlockMetaDataTool : virtual public IAlgTool {
/// Gaudi boilerplate
static const InterfaceID& interfaceID() {
- static const InterfaceID _ILumiBlockMetaDataTool( "ILumiBlockMetaDataTool", 1, 0 );
- return _ILumiBlockMetaDataTool;
+ static const InterfaceID ILumiBlockMetaDataTool( "ILumiBlockMetaDataTool", 1, 0 );
+ return ILumiBlockMetaDataTool;
}
/// get grl collection
diff --git a/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMuTool.h b/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMuTool.h
index 0a11ce3b8f50543eb7c649feee15f6bf02d4aff4..bcdd5f53438a113341e65132c9d79e5b659b466c 100644
--- a/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMuTool.h
+++ b/LumiBlock/LumiBlockComps/LumiBlockComps/ILumiBlockMuTool.h
@@ -20,8 +20,8 @@ class ILumiBlockMuTool: virtual public IAlgTool {
// Gaudi Boilerplate
static const InterfaceID& interfaceID() {
- static const InterfaceID _ILumiBlockMuTool( "ILumiBlockMuTool", 1, 0);
- return _ILumiBlockMuTool;
+ static const InterfaceID ILumiBlockMuTool( "ILumiBlockMuTool", 1, 0);
+ return ILumiBlockMuTool;
}
// Standard tool methods
diff --git a/LumiBlock/LumiBlockComps/LumiBlockComps/ILuminosityTool.h b/LumiBlock/LumiBlockComps/LumiBlockComps/ILuminosityTool.h
index 0276da703b5ca9b4aa3d11b0afb162dc62277fb5..de82c0a9fd33928997fc9ee9c479a148157f15c1 100644
--- a/LumiBlock/LumiBlockComps/LumiBlockComps/ILuminosityTool.h
+++ b/LumiBlock/LumiBlockComps/LumiBlockComps/ILuminosityTool.h
@@ -21,8 +21,8 @@ class ILuminosityTool: virtual public IAlgTool {
// Gaudi Boilerplate
static const InterfaceID& interfaceID() {
- static const InterfaceID _ILuminosityTool( "ILuminosityTool", 1, 0);
- return _ILuminosityTool;
+ static const InterfaceID ILuminosityTool( "ILuminosityTool", 1, 0);
+ return ILuminosityTool;
}
// Standard tool methods
diff --git a/LumiBlock/LumiBlockComps/LumiBlockComps/ITrigLivefractionTool.h b/LumiBlock/LumiBlockComps/LumiBlockComps/ITrigLivefractionTool.h
index 9a30f0f1f0338137855044273e7877d3ddae6b29..6aa1d8ecfd1752e856fe7ab6ce2378dbbc96e905 100644
--- a/LumiBlock/LumiBlockComps/LumiBlockComps/ITrigLivefractionTool.h
+++ b/LumiBlock/LumiBlockComps/LumiBlockComps/ITrigLivefractionTool.h
@@ -21,8 +21,8 @@ class ITrigLivefractionTool: virtual public IAlgTool {
// Gaudi Boilerplate
static const InterfaceID& interfaceID() {
- static const InterfaceID _ITrigLivefractionTool( "ITrigLivefractionTool", 1, 0);
- return _ITrigLivefractionTool;
+ static const InterfaceID ITrigLivefractionTool( "ITrigLivefractionTool", 1, 0);
+ return ITrigLivefractionTool;
}
// Standard tool methods
diff --git a/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h b/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h
index 6410dabb389c40077ce16888f3f4df93e97c27f4..23842155cd33e33a8cba6f16122aefd943c29a66 100644
--- a/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h
+++ b/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h
@@ -62,7 +62,7 @@ public:
StatusCode calcLumi();
// retrieve the details of the calculation as a TTree table
- TTree * getLumiTree(){ return LumiTree; }
+ TTree * getLumiTree(){ return m_LumiTree; }
StatusCode stop();
@@ -85,7 +85,7 @@ private:
// StoreGateSvc* p_inputstore; // input metadata store
// StoreGateSvc* p_metadatastore; // metadata store
- ITHistSvc * tHistSvc;
+ ITHistSvc * m_tHistSvc;
// Configurable Properties
StringArrayProperty m_triggers;
@@ -109,7 +109,7 @@ private:
LumiCalculator * m_lumicalc;
// A TTree to bookkeep the calculation
- TTree * LumiTree;
+ TTree * m_LumiTree;
bool m_recordTTree;
// Bookkeep if file is partially read
diff --git a/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx b/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
index d508e5b1718c4034e8b5756b9b255aa158aa444d..16bf606005e5f17966f5d6882a44f08b4846bb92 100755
--- a/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
+++ b/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
@@ -5,7 +5,7 @@
/** Modified from @file ReadMeta.cxx
* @brief The LumiBlockMetaDataTool reads luminosity metadata from input files and transfers it to output files
* @author Marjorie Shapiro <mdshapiro@lbl.gov> based on work from Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: LumiBlockMetaDataTool.cxx 710869 2015-11-26 09:56:15Z will $
+ * $Id: LumiBlockMetaDataTool.cxx 716108 2015-12-29 03:49:11Z ssnyder $
**/
#include "LumiBlockComps/LumiBlockMetaDataTool.h"
@@ -399,33 +399,33 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
/*
if (m_storexmlfiles) {
if(piovComplete->size()>0) {
- TString _version("30"); // [0-10): ATLRunQuery, [10-20): ntuple production, [20-30): xml merging, [30-40): LumiCalc
- std::map<TString,TString> _metadata;
- _metadata["complete"]=TString("complete");
+ TString this_version("30"); // [0-10): ATLRunQuery, [10-20): ntuple production, [20-30): xml merging, [30-40): LumiCalc
+ std::map<TString,TString> metadata;
+ metadata["complete"]=TString("complete");
TString complete = m_converter->GetSuggestedName(*piovComplete);
TString subname = "complete"+complete;
TString filename = "LumiBlockMetaData_" + subname + ".xml";
- Root::TGoodRunsList* pgrl = m_converter->GetGRLObject(*piovComplete,_metadata,_version);
+ Root::TGoodRunsList* pgrl = m_converter->GetGRLObject(*piovComplete,metadata,this_version);
m_converter->CreateXMLFile(*pgrl,filename.Data());
}
if(piovUnfinished->size()>0) {
- TString _version("30"); // [0-10): ATLRunQuery, [10-20): ntuple production, [20-30): xml merging, [30-40): LumiCalc
- std::map<TString,TString> _metadata;
- _metadata["complete"]=TString("unfinished");
+ TString this_version("30"); // [0-10): ATLRunQuery, [10-20): ntuple production, [20-30): xml merging, [30-40): LumiCalc
+ std::map<TString,TString> metadata;
+ metadata["complete"]=TString("unfinished");
TString unfinished = m_converter->GetSuggestedName(*piovUnfinished);
TString subname = "unfinished"+unfinished;
TString filename = "LumiBlockMetaData_" + subname + ".xml";
- Root::TGoodRunsList* pgrl = m_converter->GetGRLObject(*piovUnfinished,_metadata,_version);
+ Root::TGoodRunsList* pgrl = m_converter->GetGRLObject(*piovUnfinished,metadata,this_version);
m_converter->CreateXMLFile(*pgrl,filename.Data());
}
if(piovSuspect->size()>0) {
- TString _version("30"); // [0-10): ATLRunQuery, [10-20): ntuple production, [20-30): xml merging, [30-40): LumiCalc
- std::map<TString,TString> _metadata;
- _metadata["suspect"]=TString("suspect");
+ TString this_version("30"); // [0-10): ATLRunQuery, [10-20): ntuple production, [20-30): xml merging, [30-40): LumiCalc
+ std::map<TString,TString> metadata;
+ metadata["suspect"]=TString("suspect");
TString suspect = m_converter->GetSuggestedName(*piovSuspect);
TString subname = "suspect"+suspect;
TString filename = "LumiBlockMetaData_" + subname + ".xml";
- Root::TGoodRunsList* pgrl = m_converter->GetGRLObject(*piovSuspect,_metadata,_version);
+ Root::TGoodRunsList* pgrl = m_converter->GetGRLObject(*piovSuspect,metadata,this_version);
m_converter->CreateXMLFile(*pgrl,filename.Data());
}
@@ -437,7 +437,7 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
}
const TString
-LumiBlockMetaDataTool::getGRLString( const TString& grlname ) const
+LumiBlockMetaDataTool::getGRLString( const TString& /*grlname*/ ) const
{
/*
std::vector< Root::TGoodRunsList >::const_iterator itr = m_grlcollection->find( grlname );
diff --git a/LumiBlock/LumiBlockComps/cmt/requirements b/LumiBlock/LumiBlockComps/cmt/requirements
index a2420fac78a5f61d9ababab04f792ca9bf5ef3b2..265b144e924ad6d8098dbcdb6833d4d5034e34cc 100644
--- a/LumiBlock/LumiBlockComps/cmt/requirements
+++ b/LumiBlock/LumiBlockComps/cmt/requirements
@@ -20,14 +20,14 @@ use_ifndef pplist="XAOD_ANALYSIS" pkg="LumiBlock/LumiCalc"
use_ifndef pplist="XAOD_ANALYSIS" pkg="Database/CoolLumiUtilities"
use xAODLuminosity xAODLuminosity-* Event/xAOD
#use LumiBlockData LumiBlockData-* LumiBlock
-use_ifndef pplist="XAOD_ANALYSIS" pkg="LumiBlock/LumiBlockData"
+#use_ifndef pplist="XAOD_ANALYSIS" pkg="LumiBlock/LumiBlockData"
private
use AtlasCOOL AtlasCOOL-* External
use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
use CoraCool CoraCool-* Database -no_auto_imports
#use CoolConvUtilities CoolConvUtilities-* Database -no_auto_imports
-use_ifndef pplist="XAOD_ANALYSIS" pkg="Database/CoolConvUtilities"
+#use_ifndef pplist="XAOD_ANALYSIS" pkg="Database/CoolConvUtilities"
use DBDataModel DBDataModel-* Database/AthenaPOOL
use EventInfo EventInfo-* Event
use GoodRunsLists GoodRunsLists-* DataQuality
diff --git a/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx b/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx
index 538a10c7627c18f0950aa7486bb2ec50ab9050d5..a64f8f97629b389f383471269d1944ba2ddacf53 100644
--- a/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx
+++ b/LumiBlock/LumiBlockComps/src/LumiCalcSvc.cxx
@@ -51,7 +51,7 @@ LumiCalcSvc::LumiCalcSvc(const std::string& name,
// p_metadatastore(0),
m_pMetaDataStore ("StoreGateSvc/MetaDataStore", name),
m_pInputStore ("StoreGateSvc/InputMetaDataStore", name),
- tHistSvc(0),
+ m_tHistSvc(0),
m_sourcedb("COOLONL_TRIGGER/OFLP200"),
m_parlumiestfolder("/TRIGGER/LUMI/LBLEST"),
m_parlumilvl1folder("/TRIGGER/LUMI/LVL1COUNTERS"),
@@ -82,7 +82,7 @@ LumiCalcSvc::LumiCalcSvc(const std::string& name,
m_lumicalc = new LumiCalculator();
- LumiTree = NULL;
+ m_LumiTree = NULL;
}
//===========================================================================
@@ -132,21 +132,21 @@ StatusCode LumiCalcSvc::initialize(){
/// Initialize histogram service
- sc = service("THistSvc", tHistSvc);
+ sc = service("THistSvc", m_tHistSvc);
if (!sc.isSuccess()) {
log << MSG::ERROR << "Unable to retrieve pointer to THistSvc!" << endreq;
return(sc);
}
/// Create TTree
- LumiTree = new TTree("LumiMetaData","LumiMetaData");
- sc=tHistSvc->regTree("/AANT/Lumi",LumiTree);
+ m_LumiTree = new TTree("LumiMetaData","LumiMetaData");
+ sc=m_tHistSvc->regTree("/AANT/Lumi",m_LumiTree);
if(!sc.isSuccess()){
log << MSG::ERROR << "Cannot register TTree" << endreq;
return(sc);
}
- m_lumicalc->setTree(LumiTree);
+ m_lumicalc->setTree(m_LumiTree);
return sc;
@@ -184,9 +184,9 @@ StatusCode LumiCalcSvc::doDbQuery(StoreGateSvc_t sg) {
MsgStream log(msgSvc(), name());
StatusCode status = StatusCode::SUCCESS;
- doRecordTree(true);// record history to LumiTree TTree
+ doRecordTree(true);// record history to m_LumiTree TTree
StoreGateSvc_t store = sg;
- LumiTree=m_lumicalc->getTree();
+ m_LumiTree=m_lumicalc->getTree();
if (!m_triggers.value().empty() && !m_lbcnames.value().empty()) {
// collect trigger names
@@ -307,7 +307,7 @@ StatusCode LumiCalcSvc::stop(){
//===========================================================================
void LumiCalcSvc::printTree(){
- if(LumiTree != NULL)LumiTree->Scan("*");
+ if(m_LumiTree != NULL)m_LumiTree->Scan("*");
}