Adding a collection proxy for xAOD::TrigPassBitsContainer (xAODTrigger-00-00-52)

	* Added a collection proxy for xAOD::TrigPassBitsContainer. The
	  lack of which produced some "semi-corrupt" files unfortunately.
	* Tagging as xAODTrigger-00-00-52

2016-05-03 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Taught the package how to build itself in standalone
	  mode with CMake.
	* Tagging as xAODTrigger-00-00-51


Former-commit-id: 49b0fd6d061856a931bb14628539d0922eba0940

Event/xAOD/xAODTrigger/CMakeLists.txt

+# $Id: CMakeLists.txt 744561 2016-05-03 16:08:19Z krasznaa $
 ################################################################################
 # Package: xAODTrigger
 ################################################################################
@@ -5,29 +6,30 @@
 # Declare the package name:
 atlas_subdir( xAODTrigger )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthContainers
-                          Control/AthContainersInterfaces
-                          Control/AthLinks
-                          Control/AthenaKernel
-                          Event/xAOD/xAODCore )
+# Extra dependencies, based on what environment we're in:
+if( NOT XAOD_STANDALONE )
+   set( extra_deps Control/AthenaKernel )
+   set( extra_libs AthenaKernel )
+endif()
 
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+# Declare the package's dependencies:
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthContainers
+   Control/AthContainersInterfaces
+   Control/AthLinks
+   Event/xAOD/xAODCore
+   ${extra_deps} )
 
 # Component(s) in the package:
 atlas_add_library( xAODTrigger
-                   Root/*.cxx
-                   PUBLIC_HEADERS xAODTrigger
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthContainers AthLinks AthenaKernel xAODCore
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+   xAODTrigger/*.h xAODTrigger/versions/*.h xAODTrigger/versions/*.icc
+   Root/*.cxx
+   PUBLIC_HEADERS xAODTrigger
+   LINK_LIBRARIES AthContainers AthLinks xAODCore ${extra_libs} )
 
 atlas_add_dictionary( xAODTriggerDict
-                      xAODTrigger/xAODTriggerDict.h
-                      xAODTrigger/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks AthenaKernel xAODCore xAODTrigger
-                      EXTRA_FILES Root/dict/*.cxx )
-
+   xAODTrigger/xAODTriggerDict.h
+   xAODTrigger/selection.xml
+   LINK_LIBRARIES xAODTrigger
+   EXTRA_FILES Root/dict/*.cxx )

Event/xAOD/xAODTrigger/Root/dict/ContainerProxies.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: ContainerProxies.cxx 635056 2014-12-10 15:35:39Z watsona $
+// $Id: ContainerProxies.cxx 755776 2016-06-17 13:45:30Z krasznaa $
 
 // EDM include(s):
 #include "xAODCore/AddDVProxy.h"
@@ -17,8 +17,8 @@
 #include "xAODTrigger/versions/MuonRoIContainer_v1.h"
 
 #include "xAODTrigger/versions/TrigCompositeContainer_v1.h"
-
 #include "xAODTrigger/versions/BunchConfContainer_v1.h"
+#include "xAODTrigger/versions/TrigPassBitsContainer_v1.h"
 
 // Set up the collection proxies:
 ADD_NS_DV_PROXY( xAOD, TriggerMenuContainer_v1 );
@@ -30,5 +30,5 @@ ADD_NS_DV_PROXY( xAOD, JetRoIContainer_v2 );
 ADD_NS_DV_PROXY( xAOD, MuonRoIContainer_v1 );
 
 ADD_NS_DV_PROXY( xAOD, TrigCompositeContainer_v1 );
-
 ADD_NS_DV_PROXY( xAOD, BunchConfContainer_v1 );
+ADD_NS_DV_PROXY( xAOD, TrigPassBitsContainer_v1 );

Event/xAOD/xAODTrigger/cmt/requirements

 package xAODTrigger
-# $Id: requirements 683359 2015-07-16 09:24:36Z will $
+# $Id: requirements 744561 2016-05-03 16:08:19Z krasznaa $
 
 author Lukas Heinrich <Lukas.Heinrich@cern.ch>
 author Gordon Watts <gwatts@uw.edu>
@@ -29,3 +29,4 @@ apply_pattern lcgdict dict=xAODTrigger selectionfile=selection.xml \
                       extralibfiles=../Root/dict/*.cxx
 
 apply_pattern do_genCLIDDB library=xAODTrigger
+