diff --git a/Event/xAOD/xAODCaloEvent/CMakeLists.txt b/Event/xAOD/xAODCaloEvent/CMakeLists.txt
index f9beaafa5ca44feb1da23c3795dc84d7534c30ed..a3ed2e94ce8b85e31e8ee5d302115f82f18967be 100644
--- a/Event/xAOD/xAODCaloEvent/CMakeLists.txt
+++ b/Event/xAOD/xAODCaloEvent/CMakeLists.txt
@@ -1,3 +1,4 @@
+# $Id: CMakeLists.txt 744492 2016-05-03 14:20:44Z krasznaa $
################################################################################
# Package: xAODCaloEvent
################################################################################
@@ -5,36 +6,42 @@
# Declare the package name:
atlas_subdir( xAODCaloEvent )
+# Extra dependencies, based on what environment we're in:
+if( NOT XAOD_ANALYSIS )
+ set( extra_deps Calorimeter/CaloEvent )
+ set( extra_libs CaloEvent )
+endif()
+
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Control/AthContainers
- Control/CxxUtils
- DetectorDescription/GeoPrimitives
- Event/xAOD/xAODBase
- Event/xAOD/xAODCore
- PRIVATE
- Control/AthLinks )
+atlas_depends_on_subdirs(
+ PUBLIC
+ Calorimeter/CaloGeoHelpers
+ Control/AthContainers
+ Control/CxxUtils
+ DetectorDescription/GeoPrimitives
+ Event/xAOD/xAODBase
+ Event/xAOD/xAODCore
+ Control/AthLinks
+ ${extra_deps} )
# External dependencies:
find_package( Eigen )
-find_package( ROOT COMPONENTS Physics Core Tree MathCore Hist RIO pthread )
+
+# Extra source(s), based on what environment we are in:
+if( NOT XAOD_ANALYSIS )
+ set( extra_sources src/*.cxx )
+endif()
# Component(s) in the package:
atlas_add_library( xAODCaloEvent
- Root/*.cxx
- src/*.cxx
- PUBLIC_HEADERS xAODCaloEvent
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers AthContainers CxxUtils GeoPrimitives xAODBase xAODCore
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks )
+ xAODCaloEvent/*.h xAODCaloEvent/versions/*.h Root/*.cxx ${extra_sources}
+ PUBLIC_HEADERS xAODCaloEvent
+ INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} CaloGeoHelpers AthContainers
+ CxxUtils GeoPrimitives xAODBase xAODCore AthLinks ${extra_libs} )
atlas_add_dictionary( xAODCaloEventDict
- xAODCaloEvent/xAODCaloEventDict.h
- xAODCaloEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers AthContainers CxxUtils GeoPrimitives xAODBase xAODCore AthLinks xAODCaloEvent
- EXTRA_FILES Root/dict/*.cxx )
-
+ xAODCaloEvent/xAODCaloEventDict.h
+ xAODCaloEvent/selection.xml
+ LINK_LIBRARIES xAODCaloEvent
+ EXTRA_FILES Root/dict/*.cxx )
diff --git a/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx b/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx
index 370bb5309fdda0e02666e45f30d208802196b7ef..c3129d851d512bee536535e040f427718a7f595c 100644
--- a/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx
+++ b/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: CaloCluster_v1.cxx 741209 2016-04-19 02:25:46Z ssnyder $
+// $Id: CaloCluster_v1.cxx 744492 2016-05-03 14:20:44Z krasznaa $
// System include(s):
#include <cmath>
@@ -14,6 +14,7 @@
// EDM include(s):
#include "CaloGeoHelpers/CaloPhiRange.h"
#include "xAODCore/AuxStoreAccessorMacros.h"
+#include "AthLinks/ElementLink.h"
// Local include(s):
#include "xAODCaloEvent/versions/CaloCluster_v1.h"
@@ -994,8 +995,6 @@ namespace xAOD {
return;
}
-
-
const CaloCluster_v1* CaloCluster_v1::getSisterCluster() const {
static Accessor< ElementLink< xAOD::CaloClusterContainer_v1 > > accSisterCluster("SisterCluster");
if (!accSisterCluster.isAvailable(*this)) return 0;
@@ -1005,7 +1004,8 @@ namespace xAOD {
else
return 0;
}
-
+
+#if !(defined(SIMULATIONBASE) || defined(XAOD_ANALYSIS))
bool CaloCluster_v1::setSisterCluster(const std::string& sisterSgKey, const unsigned sisterIndex,
IProxyDictWithPool* sg /*nullptr*/) {
@@ -1014,5 +1014,6 @@ namespace xAOD {
accSisterCluster(*this)=link;
return true;
}
+#endif
} // namespace xAOD
diff --git a/Event/xAOD/xAODCaloEvent/cmt/requirements b/Event/xAOD/xAODCaloEvent/cmt/requirements
index 8d3167036f062910524bb58c87ce7ad19ffe67b8..8bb006b950ca8c34aacdeaefcb4344eaf9a17106 100644
--- a/Event/xAOD/xAODCaloEvent/cmt/requirements
+++ b/Event/xAOD/xAODCaloEvent/cmt/requirements
@@ -42,5 +42,4 @@ apply_pattern lcgdict dict=xAODCaloEvent selectionfile=selection.xml \
#macro cppdebugflags '$(cppdebugflags_s)'
#macro_remove componentshr_linkopts "-Wl,-s"
-
apply_pattern do_genCLIDDB library=xAODCaloEvent
diff --git a/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h
index aed4a8cc72b5ab9d722d2dd0d4d385e64cbc106a..22133130f6cc63c735e42e0007504a6168767f2b 100644
--- a/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h
+++ b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h
@@ -4,7 +4,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: CaloCluster_v1.h 732844 2016-03-30 07:50:29Z wlampl $
+// $Id: CaloCluster_v1.h 749805 2016-05-26 08:03:45Z wlampl $
#ifndef XAODCALOEVENT_VERSIONS_CALOCLUSTER_V1_H
#define XAODCALOEVENT_VERSIONS_CALOCLUSTER_V1_H
@@ -44,8 +44,8 @@ namespace xAOD {
/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
/// @author Walter Lampl <Walter.Lampl@cern.ch>
///
- /// $Revision: 732844 $
- /// $Date: 2016-03-30 09:50:29 +0200 (Wed, 30 Mar 2016) $
+ /// $Revision: 749805 $
+ /// $Date: 2016-05-26 10:03:45 +0200 (Thu, 26 May 2016) $
///
class CaloCluster_v1 : public IParticle {
friend class ::CaloClusterChangeSignalState;
@@ -80,6 +80,8 @@ namespace xAOD {
Topo_633 = 12,
// transient cluster for AODCellContainer
SW_7_11 = 13,
+ //New (2016) egamma cluster
+ SuperCluster=14,
CSize_Unknown = 99
};
@@ -519,9 +521,11 @@ namespace xAOD {
/// Get a pointer to a 'sister' cluster (eg the non-calibrated counterpart)
const CaloCluster_v1* getSisterCluster() const;
-
+
+#if !(defined(SIMULATIONBASE) || defined(XAOD_ANALYSIS))
/// Set a pointer to a 'sister' cluster (eg the non-calibrated counterpart)
bool setSisterCluster(const std::string& sisterSgKey, const unsigned sisterIndex, IProxyDictWithPool* sg= nullptr);
+#endif
//For debugging only...
//std::vector<std::pair<std::string,float> > getAllMoments();