From 44338eb3c94fa1f310a3fc0c753dda49e3a28455 Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 16:57:35 +0200
Subject: [PATCH] 'CMakeLists.txt' (xAODBTagging-00-00-31)
* Tagging xAODBTagging-00-00-31.
* Comply with ATLAS naming conventions.
---
Event/xAOD/xAODBTagging/CMakeLists.txt | 35 ++++++++++++++++++++
Event/xAOD/xAODBTagging/Root/BTagging_v1.cxx | 26 +++++++--------
2 files changed, 48 insertions(+), 13 deletions(-)
create mode 100644 Event/xAOD/xAODBTagging/CMakeLists.txt
diff --git a/Event/xAOD/xAODBTagging/CMakeLists.txt b/Event/xAOD/xAODBTagging/CMakeLists.txt
new file mode 100644
index 00000000000..2fca4f13c24
--- /dev/null
+++ b/Event/xAOD/xAODBTagging/CMakeLists.txt
@@ -0,0 +1,35 @@
+################################################################################
+# Package: xAODBTagging
+################################################################################
+
+# Declare the package name:
+atlas_subdir( xAODBTagging )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/AthContainers
+ Control/SGTools
+ Event/xAOD/xAODBase
+ Event/xAOD/xAODCore
+ Event/xAOD/xAODTracking
+ PRIVATE
+ Control/AthLinks )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( xAODBTagging
+ Root/*.cxx
+ PUBLIC_HEADERS xAODBTagging
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES AthContainers SGTools xAODBase xAODCore xAODTracking
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks )
+
+atlas_add_dictionary( xAODBTaggingDict
+ xAODBTagging/xAODBTaggingDict.h
+ xAODBTagging/selection.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers SGTools xAODBase xAODCore xAODTracking AthLinks xAODBTagging
+ EXTRA_FILES Root/dict/*.cxx )
+
diff --git a/Event/xAOD/xAODBTagging/Root/BTagging_v1.cxx b/Event/xAOD/xAODBTagging/Root/BTagging_v1.cxx
index 6a22abcacd5..9aeedb9db27 100644
--- a/Event/xAOD/xAODBTagging/Root/BTagging_v1.cxx
+++ b/Event/xAOD/xAODBTagging/Root/BTagging_v1.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: BTagging_v1.cxx 605682 2014-07-09 16:31:37Z vacavant $
+// $Id: BTagging_v1.cxx 713466 2015-12-08 21:46:29Z ssnyder $
// EDM include(s):
#include "xAODCore/AuxStoreAccessorMacros.h"
@@ -530,9 +530,9 @@ namespace xAOD {
/////////////////////////////////////////////////////////////////////////////
- static std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::TPELVec_t> > m_DynTPELVec;
- static std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::VxELVec_t> > m_DynVxELVec;
- static std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::BTagVxELVec_t> > m_DynBTagVxELVec;
+ static std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::TPELVec_t> > DynTPELVec;
+ static std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::VxELVec_t> > DynVxELVec;
+ static std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::BTagVxELVec_t> > DynBTagVxELVec;
void BTagging_v1::toPersistent() {
@@ -571,9 +571,9 @@ namespace xAOD {
}
}
- std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::TPELVec_t> >::iterator dyniter = m_DynTPELVec.begin();
+ std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::TPELVec_t> >::iterator dyniter = DynTPELVec.begin();
- for(; dyniter != m_DynTPELVec.end(); ++dyniter){
+ for(; dyniter != DynTPELVec.end(); ++dyniter){
if( dyniter->second.isAvailableWritable( *this ) ) {
itr = dyniter->second( *this ).begin();
@@ -589,9 +589,9 @@ namespace xAOD {
VxELVec_t::iterator vxitr;
VxELVec_t::iterator vxend;
- std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::VxELVec_t> >::iterator dynvxiter = m_DynVxELVec.begin();
+ std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::VxELVec_t> >::iterator dynvxiter = DynVxELVec.begin();
- for(; dynvxiter != m_DynVxELVec.end(); ++dynvxiter){
+ for(; dynvxiter != DynVxELVec.end(); ++dynvxiter){
if( dynvxiter->second.isAvailableWritable( *this ) ) {
vxitr = dynvxiter->second( *this ).begin();
@@ -606,9 +606,9 @@ namespace xAOD {
BTagVxELVec_t::iterator btagvxitr;
BTagVxELVec_t::iterator btagvxend;
- std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::BTagVxELVec_t> >::iterator dynbtagvxiter = m_DynBTagVxELVec.begin();
+ std::map<std::string, SG::AuxElement::Accessor<BTagging_v1::BTagVxELVec_t> >::iterator dynbtagvxiter = DynBTagVxELVec.begin();
- for(; dynbtagvxiter != m_DynBTagVxELVec.end(); ++dynbtagvxiter){
+ for(; dynbtagvxiter != DynBTagVxELVec.end(); ++dynbtagvxiter){
if( dynbtagvxiter->second.isAvailableWritable( *this ) ) {
btagvxitr = dynbtagvxiter->second( *this ).begin();
@@ -631,7 +631,7 @@ namespace xAOD {
std::string varname = taggername+ "_" + variablename;
Accessor< TPELVec_t > acc( varname );
- m_DynTPELVec.insert(std::make_pair(varname,acc));
+ DynTPELVec.insert(std::make_pair(varname,acc));
return;
}
@@ -640,7 +640,7 @@ namespace xAOD {
std::string varname = taggername+ "_" + variablename;
Accessor< VxELVec_t > acc( varname );
- m_DynVxELVec.insert(std::make_pair(varname,acc));
+ DynVxELVec.insert(std::make_pair(varname,acc));
return;
}
@@ -650,7 +650,7 @@ namespace xAOD {
std::string varname = taggername+ "_" + variablename;
Accessor< BTagVxELVec_t > acc( varname );
- m_DynBTagVxELVec.insert(std::make_pair(varname,acc));
+ DynBTagVxELVec.insert(std::make_pair(varname,acc));
return;
}
--
GitLab