Commit 19157d64 authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (xAODTrigger-00-00-47)

	* xAODTrigger-00-00-47
	* fix RoiDescriptorStorageAuxInfo

2015-11-23 sutt < sutt @ cern.ch >
	* xAODTrigger-00-00-46
	* add RoiDescriptorStore
parent e46a4dc6
################################################################################
# Package: xAODTrigger
################################################################################
# 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 )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# 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} )
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 )
//
// @file RoiDescriptorStoreAuxInfo_v1.cxx
//
//
// @author M.Sutton
//
// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo_v1.cxx, v0.0 Wed 11 Nov 2015 14:51:11 CET sutt $
// Local include(s):
#include "xAODTrigger/versions/RoiDescriptorStoreAuxInfo_v1.h"
namespace xAOD {
RoiDescriptorStoreAuxInfo_v1::RoiDescriptorStoreAuxInfo_v1()
: AuxInfoBase() {
AUX_VARIABLE( serialised );
}
} // namespace xAOD
//
// @file RoiDescriptorStore_v1.cxx
//
//
// @author M.Sutton
//
// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStore_v1.cxx, v0.0 Wed 11 Nov 2015 14:51:11 CET sutt $
// xAOD include
#include "xAODCore/AuxStoreAccessorMacros.h"
// Local include
#include "xAODTrigger/versions/RoiDescriptorStore_v1.h"
namespace xAOD {
RoiDescriptorStore_v1::RoiDescriptorStore_v1()
: SG::AuxElement() {
}
AUXSTORE_OBJECT_SETTER_AND_GETTER( RoiDescriptorStore_v1,
std::vector< std::vector<uint32_t> >,
serialised, setSerialised )
} // namespace xAOD
......@@ -24,3 +24,6 @@
#include "xAODTrigger/TriggerMenuAuxContainer.h"
#include "xAODTrigger/TrigPassBitsContainer.h"
#include "xAODTrigger/TrigPassBitsAuxContainer.h"
#include "xAODTrigger/RoiDescriptorStore.h"
#include "xAODTrigger/RoiDescriptorStoreAuxInfo.h"
// emacs: this is -*- c++ -*-
//
// @file IRoiDecsriptorStorage.h
//
// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
#ifndef XAODTRIGGER_ROIDESCRIPTORSTORE_H
#define XAODTRIGGER_ROIDESCRIPTORSTORE_H
// Local include(s):
#include "xAODTrigger/versions/RoiDescriptorStore_v1.h"
namespace xAOD {
/// Define the latest version of the serialised RoiDescriptor storage
typedef RoiDescriptorStore_v1 RoiDescriptorStore;
}
// Set up a CLID for the type:
#include "xAODCore/CLASS_DEF.h"
CLASS_DEF( xAOD::RoiDescriptorStore , 165659280 , 1 )
#endif // XAODTRIGGER_ROIDESCRIPTORSTORE_H
// emacs: this is -*- c++ -*-
//
// @file IRoiDecsriptorStorageAuxInfo.h
//
// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
#ifndef XAODTRIGGER_ROIDESCRIPTORSTOREAUXINFO_H
#define XAODTRIGGER_ROIDESCRIPTORSTOREAUXINFO_H
#include "xAODTrigger/versions/RoiDescriptorStoreAuxInfo_v1.h"
namespace xAOD {
/// Define the latest version of the serialised RoiDescriptor collection
/// auxiliary store
typedef RoiDescriptorStoreAuxInfo_v1 RoiDescriptorStoreAuxInfo;
}
// Set up a CLID for the type:
#include "xAODCore/CLASS_DEF.h"
CLASS_DEF( xAOD::RoiDescriptorStoreAuxInfo , 72816317 , 1 )
#endif // XAODTRIGGER_ROIDESCRIPTORSTOREAUXINFO_H
<!-- $Id: selection.xml 703368 2015-10-27 08:45:13Z krasznaa $ -->
<!-- $Id: selection.xml 710006 2015-11-23 21:01:29Z sutt $ -->
<lcgdict>
<!-- The byte stream auxiliary container, v1: -->
......@@ -105,6 +105,12 @@
<class name="xAOD::TrigCompositeAuxContainer_v1"
id="171EB8B8-A777-47D9-94A9-33B2482E2AAF" />
<!-- RoiDescriptorStore_v1 dictionaries: -->
<class name="xAOD::RoiDescriptorStore_v1"
id="882822c8-906a-11e5-87f4-02163e010d8c" />
<class name="xAOD::RoiDescriptorStoreAuxInfo_v1"
id="8aa7eae2-906a-11e5-a100-02163e010d8c" />
<!-- Extra types used by TrigComposite: -->
<class name="std::vector<std::vector<std::string> >" />
......
// emacs: this is -*- c++ -*-
//
// @file IRoiDecsriptorStorageAuxInfo_v1.h
//
// Class holding the data handled by RoiDescriptorStore_v1
// This is the auxiliary class holding the serialised RoiDescriptor
// information in xAOD files.
// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStoreAuxInfo_v1.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
#ifndef XAODTRIGGER_VERSIONS_ROIDESCRIPTORSTOREAUXINFO_V1_H
#define XAODTRIGGER_VERSIONS_ROIDESCRIPTORSTOREAUXINFO_V1_H
#include <stdint.h>
#include <vector>
// xAOD include
#include "xAODCore/AuxInfoBase.h"
namespace xAOD {
class RoiDescriptorStoreAuxInfo_v1 : public AuxInfoBase {
public:
/// Default constructor
RoiDescriptorStoreAuxInfo_v1();
private:
std::vector< std::vector<uint32_t> > serialised;
}; // class RoiDescriptorStoreAuxInfo_v1
} // namespace xAOD
// Declare the inheritance of the type:
#include "xAODCore/BaseInfo.h"
SG_BASE( xAOD::RoiDescriptorStoreAuxInfo_v1, xAOD::AuxInfoBase );
#endif // XAODTRIGGER_VERSIONS_ROIDESCRIPTORSTOREAUXINFO_V1_H
// emacs: this is -*- c++ -*-
//
// @file IRoiDecsriptorStorage_v1.h
//
// Interface to the raw serialised IRoiDescriptor information
// This interface is used to store the RoiDescriptor information
// in the xAOD and should only be used directly by experts,
// to deserialise to a collection of RoiDescriptors
// regular users should only ever access the IRoiDescriptors
// through the TrigDecisionTool
//
// Copyright (C) 2015 M.Sutton (sutt@cern.ch)
//
// $Id: RoiDescriptorStore_v1.h v0.0 Wed 11 Nov 2015 14:36:15 CET sutt $
#ifndef XAODTRIGGER_VERSIONS_ROIDESCRIPTORSTORE_V1_H
#define XAODTRIGGER_VERSIONS_ROIDESCRIPTORSTORE_V1_H
#include <stdint.h>
#include <vector>
// EDM include(s):
#include "AthContainers/AuxElement.h"
namespace xAOD {
class RoiDescriptorStore_v1 : public SG::AuxElement {
public:
/// Default constructor
RoiDescriptorStore_v1();
/// expose the navigation information (in serialised form)
const std::vector< std::vector<uint32_t> >& serialised() const;
/// sets the serialized form of the navigation from the argument
void setSerialised( const std::vector< std::vector<uint32_t> >& value );
}; // class RoiDescriptorStore_v1
} // namespace xAOD
// Declare the inheritance of the type:
#include "xAODCore/BaseInfo.h"
SG_BASE( xAOD::RoiDescriptorStore_v1, SG::AuxElement );
#endif // XAODTRIGGER_VERSIONS_ROIDESCRIPTORSTORE_V1_H
......@@ -4,7 +4,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: xAODTriggerDict.h 702738 2015-10-23 16:00:51Z krasznaa $
// $Id: xAODTriggerDict.h 710006 2015-11-23 21:01:29Z sutt $
#ifndef XAODTRIGGER_XAODTRIGGERDICT_H
#define XAODTRIGGER_XAODTRIGGERDICT_H
......@@ -69,6 +69,9 @@
#include "xAODTrigger/versions/TrigPassBitsContainer_v1.h"
#include "xAODTrigger/versions/TrigPassBitsAuxContainer_v1.h"
#include "xAODTrigger/versions/RoiDescriptorStore_v1.h"
#include "xAODTrigger/versions/RoiDescriptorStoreAuxInfo_v1.h"
namespace{
struct GCCXML_DUMMY_INSTANTIATION_XAODTRIGGER {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment